diff options
222 files changed, 8184 insertions, 1960 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index d4810d412b1d..08376b7e7e0e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -130,6 +130,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Common Public License 1.0"; }; + efl10 = spdx { + spdxId = "EFL-1.0"; + fullName = "Eiffel Forum License v1.0"; + }; + + efl20 = spdx { + spdxId = "EFL-2.0"; + fullName = "Eiffel Forum License v2.0"; + }; + epl10 = spdx { spdxId = "EPL-1.0"; fullName = "Eclipse Public License 1.0"; @@ -287,6 +297,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "MIT License"; }; + mpl10 = spdx { + spdxId = "MPL-1.0"; + fullName = "Mozilla Public License 1.0"; + }; + mpl11 = spdx { spdxId = "MPL-1.1"; fullName = "Mozilla Public License 1.1"; diff --git a/nixos/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix index 86a3df5da21d..d44f01a49590 100644 --- a/nixos/modules/hardware/cpu/amd-microcode.nix +++ b/nixos/modules/hardware/cpu/amd-microcode.nix @@ -22,8 +22,7 @@ with lib; ###### implementation config = mkIf config.hardware.cpu.amd.updateMicrocode { - hardware.firmware = [ "${pkgs.amdUcode}/lib/firmware" ]; - boot.kernelModules = [ "microcode" ]; + boot.initrd.prepend = [ "${pkgs.microcodeAmd}/amd-ucode.img" ]; }; } diff --git a/nixos/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix index 800c391b293a..89ae4f45806c 100644 --- a/nixos/modules/hardware/cpu/intel-microcode.nix +++ b/nixos/modules/hardware/cpu/intel-microcode.nix @@ -22,8 +22,7 @@ with lib; ###### implementation config = mkIf config.hardware.cpu.intel.updateMicrocode { - hardware.firmware = [ "${pkgs.microcodeIntel}/lib/firmware" ]; - boot.kernelModules = [ "microcode" ]; + boot.initrd.prepend = [ "${pkgs.microcodeIntel}/intel-ucode.img" ]; }; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index eec2f1bb6f68..b03107610fe4 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -211,6 +211,7 @@ unifi = 183; uptimed = 184; zope2 = 185; + ripple-data-api = 186; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -399,6 +400,7 @@ #unifi = 183; # unused #uptimed = 184; # unused #zope2 = 185; # unused + #ripple-data-api = 186; #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 71915a0d3eb7..cca1c1a73d39 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -201,6 +201,7 @@ ./services/misc/phd.nix ./services/misc/redmine.nix ./services/misc/rippled.nix + ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix ./services/misc/svnserve.nix diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix new file mode 100644 index 000000000000..6e5ac7ab00bd --- /dev/null +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -0,0 +1,168 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.rippleDataApi; + + deployment_env_config = builtins.toJSON { + production = { + port = toString cfg.port; + maxSockets = 150; + batchSize = 100; + startIndex = 32570; + rippleds = cfg.rippleds; + redis = { + enable = cfg.redis.enable; + host = cfg.redis.host; + port = cfg.redis.port; + options.auth_pass = null; + }; + }; + }; + + db_config = builtins.toJSON { + production = { + username = optional (cfg.couchdb.pass != "") cfg.couchdb.user; + password = optional (cfg.couchdb.pass != "") cfg.couchdb.pass; + host = cfg.couchdb.host; + port = cfg.couchdb.port; + database = cfg.couchdb.db; + protocol = "http"; + }; + }; + +in { + options = { + services.rippleDataApi = { + enable = mkEnableOption "Whether to enable ripple data api."; + + port = mkOption { + description = "Ripple data api port"; + default = 5993; + type = types.int; + }; + + redis = { + enable = mkOption { + description = "Whether to enable caching of ripple data to redis."; + default = true; + type = types.bool; + }; + + host = mkOption { + description = "Ripple data api redis host."; + default = "localhost"; + type = types.str; + }; + + port = mkOption { + description = "Ripple data api redis port."; + default = 5984; + type = types.int; + }; + }; + + couchdb = { + host = mkOption { + description = "Ripple data api couchdb host."; + default = "localhost"; + type = types.str; + }; + + port = mkOption { + description = "Ripple data api couchdb port."; + default = 5984; + type = types.int; + }; + + db = mkOption { + description = "Ripple data api couchdb database."; + default = "rippled"; + type = types.str; + }; + + user = mkOption { + description = "Ripple data api couchdb username."; + default = "rippled"; + type = types.str; + }; + + pass = mkOption { + description = "Ripple data api couchdb password."; + default = ""; + type = types.str; + }; + + create = mkOption { + description = "Whether to create couchdb database needed by ripple data api."; + type = types.bool; + default = true; + }; + }; + + rippleds = mkOption { + description = "List of rippleds to be used by ripple data api."; + default = [ + "http://s_east.ripple.com:51234" + "http://s_west.ripple.com:51234" + ]; + type = types.listOf types.str; + }; + }; + }; + + config = mkIf (cfg.enable) { + services.couchdb.enable = mkDefault true; + services.couchdb.bindAddress = mkDefault "0.0.0.0"; + services.redis.enable = mkDefault true; + + systemd.services.ripple-data-api = { + after = [ "couchdb.service" "redis.service" "ripple-data-api-importer.service" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + NODE_ENV = "production"; + DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config; + DB_CONFIG = pkgs.writeText "db.config.json" db_config; + }; + + serviceConfig = { + ExecStart = "${pkgs.ripple-data-api}/bin/api"; + User = "ripple-data-api"; + }; + }; + + systemd.services.ripple-data-importer = { + after = [ "couchdb.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.curl ]; + + environment = { + NODE_ENV = "production"; + DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config; + DB_CONFIG = pkgs.writeText "db.config.json" db_config; + LOG_FILE = "/dev/null"; + }; + + serviceConfig = { + ExecStart = "${pkgs.ripple-data-api}/bin/importer live debug2"; + User = "ripple-data-api"; + }; + + preStart = mkMerge [ + (mkIf (cfg.couchdb.create) '' + HOST="http://${optionalString (cfg.couchdb.pass != "") "${cfg.couchdb.user}:${cfg.couchdb.pass}@"}${cfg.couchdb.host}:${toString cfg.couchdb.port}" + curl -X PUT $HOST/${cfg.couchdb.db} || true + '') + "${pkgs.ripple-data-api}/bin/update-views" + ]; + }; + + users.extraUsers = singleton + { name = "ripple-data-api"; + description = "Ripple data api user"; + uid = config.ids.uids.ripple-data-api; + }; + }; +} diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 16bebe03740a..2c3dfd2f460f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -205,7 +205,7 @@ let # The closure of the init script of boot stage 1 is what we put in # the initial RAM disk. initialRamdisk = pkgs.makeInitrd { - inherit (config.boot.initrd) compressor; + inherit (config.boot.initrd) compressor prepend; contents = [ { object = bootStage1; @@ -247,6 +247,14 @@ in ''; }; + boot.initrd.prepend = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + Other initrd files to prepend to the final initrd we are building. + ''; + }; + boot.initrd.checkJournalingFS = mkOption { default = true; type = types.bool; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index f853a8f6775c..6d9871a2f6f9 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -13,7 +13,7 @@ let makeUnit = name: unit: let - pathSafeName = lib.replaceChars ["@" "\\"] ["-" "-"] name; + pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name; in if unit.enable then pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; } diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 98985d2d2c57..ee5485071a35 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -7,6 +7,9 @@ in { imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; + # https://cloud.google.com/compute/docs/tutorials/building-images + networking.firewall.enable = mkDefault false; + system.build.googleComputeImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand "google-compute-image" @@ -95,6 +98,7 @@ in boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "virtio_scsi" ]; + boot.kernelModules = [ "virtio_pci" "virtio_net" ]; # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. boot.loader.grub.device = "/dev/sda"; @@ -108,6 +112,7 @@ in # at instance creation time. services.openssh.enable = true; services.openssh.permitRootLogin = "without-password"; + services.openssh.passwordAuthentication = mkDefault false; # Force getting the hostname from Google Compute. networking.hostName = mkDefault ""; @@ -178,5 +183,79 @@ in serviceConfig.RemainAfterExit = true; serviceConfig.StandardError = "journal+console"; serviceConfig.StandardOutput = "journal+console"; - }; + }; + + # Setings taken from https://cloud.google.com/compute/docs/tutorials/building-images#providedkernel + boot.kernel.sysctl = { + # enables syn flood protection + "net.ipv4.tcp_syncookies" = mkDefault "1"; + + # ignores source-routed packets + "net.ipv4.conf.all.accept_source_route" = mkDefault "0"; + + # ignores source-routed packets + "net.ipv4.conf.default.accept_source_route" = mkDefault "0"; + + # ignores ICMP redirects + "net.ipv4.conf.all.accept_redirects" = mkDefault "0"; + + # ignores ICMP redirects + "net.ipv4.conf.default.accept_redirects" = mkDefault "0"; + + # ignores ICMP redirects from non-GW hosts + "net.ipv4.conf.all.secure_redirects" = mkDefault "1"; + + # ignores ICMP redirects from non-GW hosts + "net.ipv4.conf.default.secure_redirects" = mkDefault "1"; + + # don't allow traffic between networks or act as a router + "net.ipv4.ip_forward" = mkDefault "0"; + + # don't allow traffic between networks or act as a router + "net.ipv4.conf.all.send_redirects" = mkDefault "0"; + + # don't allow traffic between networks or act as a router + "net.ipv4.conf.default.send_redirects" = mkDefault "0"; + + # reverse path filtering - IP spoofing protection + "net.ipv4.conf.all.rp_filter" = mkDefault "1"; + + # reverse path filtering - IP spoofing protection + "net.ipv4.conf.default.rp_filter" = mkDefault "1"; + + # ignores ICMP broadcasts to avoid participating in Smurf attacks + "net.ipv4.icmp_echo_ignore_broadcasts" = mkDefault "1"; + + # ignores bad ICMP errors + "net.ipv4.icmp_ignore_bogus_error_responses" = mkDefault "1"; + + # logs spoofed, source-routed, and redirect packets + "net.ipv4.conf.all.log_martians" = mkDefault "1"; + + # log spoofed, source-routed, and redirect packets + "net.ipv4.conf.default.log_martians" = mkDefault "1"; + + # implements RFC 1337 fix + "net.ipv4.tcp_rfc1337" = mkDefault "1"; + + # randomizes addresses of mmap base, heap, stack and VDSO page + "kernel.randomize_va_space" = mkDefault "2"; + + # provides protection from ToCToU races + "fs.protected_hardlinks" = mkDefault "1"; + + # provides protection from ToCToU races + "fs.protected_symlinks" = mkDefault "1"; + + # makes locating kernel addresses more difficult + "kernel.kptr_restrict" = mkDefault "1"; + + # set ptrace protections + "kernel.yama.ptrace_scope" = mkDefault "1"; + + # set perf only available to root + "kernel.perf_event_paranoid" = mkDefault "2"; + + }; + } diff --git a/nixos/release.nix b/nixos/release.nix index 1712c90ad33f..f84501d741a6 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -242,7 +242,7 @@ in rec { tests.blivet = callTest tests/blivet.nix {}; tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = callTest tests/chromium.nix {}; - #tests.cjdns = callTest tests/cjdns.nix {}; + tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 7bb3863c683f..45164234b1bd 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -3,15 +3,15 @@ let carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k"; carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52"; carolIp4 = "192.168.0.9"; - + basicConfig = { config, pkgs, ... }: { services.cjdns.enable = true; - + # Turning off DHCP isn't very realistic but makes # the sequence of address assignment less stochastic. networking.useDHCP = false; - + networking.interfaces.eth1.prefixLength = 24; # CJDNS output is incompatible with the XML log. systemd.services.cjdns.serviceConfig.StandardOutput = "null"; @@ -41,19 +41,18 @@ import ./make-test.nix { # Bob explicitly connects to Carol over UDPInterface. bob = { config, lib, nodes, ... }: - + let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in - + { imports = [ basicConfig ]; - + networking.interfaces.eth1.ipAddress = "192.168.0.2"; - + services.cjdns = { UDPInterface = { bind = "0.0.0.0:1024"; connectTo."192.168.0.1:1024}" = - { hostname = "carol.hype"; - password = carolPassword; + { password = carolPassword; publicKey = carolPubKey; }; }; @@ -75,7 +74,7 @@ import ./make-test.nix { ''; networking.interfaces.eth1.ipAddress = "192.168.0.1"; - + services.cjdns = { authorizedPasswords = [ carolPassword ]; ETHInterface.bind = "eth1"; @@ -106,13 +105,13 @@ import ./make-test.nix { my $carolIp6 = cjdnsIp $carol; # ping a few times each to let the routing table establish itself - + $alice->succeed("ping6 -c 4 $carolIp6"); - $bob->succeed("ping6 -c 4 carol.hype"); + $bob->succeed("ping6 -c 4 $carolIp6"); $carol->succeed("ping6 -c 4 $aliceIp6"); $carol->succeed("ping6 -c 4 $bobIp6"); - + $alice->succeed("ping6 -c 4 $bobIp6"); $bob->succeed("ping6 -c 4 $aliceIp6"); diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 3e5ee680c7a6..ba10f23582d7 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -31,8 +31,8 @@ import ./make-test.nix ({pkgs, ... }: { startAll; # Make sure that cups is up on both sides. - $server->waitForUnit("cupsd.service"); - $client->waitForUnit("cupsd.service"); + $server->waitForUnit("cups.service"); + $client->waitForUnit("cups.service"); $client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("curl --fail http://localhost:631/"); diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 8696b1c055d0..8e4c31302e26 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -2,11 +2,11 @@ , libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - name = "pavucontrol-2.0"; + name = "pavucontrol-3.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; - sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; + sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk"; }; preFixup = '' diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8f2e9e787b31..6048ff88c35a 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-15.2"; + name = "snd-15.4"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0v2r7a6363aai726cywi7ai0qlwdc20bqdprs5fmyz8sbmksbqzr"; + sha256 = "1dari02ind445h5hpb6dhi0kix1vmlk64lyxwv1zrqagw3ajmpwh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2a56e1095408..d66029199ce8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = if stdenv.system == "i686-linux" then "0.9.4.183.g644e24e.428" - else "0.9.11.27.g2b1a638.81"; + else "0.9.17.1.g9b85d43.7"; deps = [ alsaLib @@ -55,7 +55,7 @@ stdenv.mkDerivation { else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; - sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg"; + sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki"; } else throw "Spotify not supported on this platform."; @@ -90,8 +90,8 @@ stdenv.mkDerivation { ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so.0d ''} - # Work around Spotify trying to open libudev.so.0 (which we don't have) - ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.0 + # Work around Spotify trying to open libudev.so.1 (which we don't have) + ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1 mkdir -p $out/bin @@ -128,6 +128,6 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx ]; }; } diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index b2a2d8799791..ac4d4d83c7b8 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,15 +4,15 @@ }: let - ver_branch = "1.13"; - version = "1.13.1"; + ver_branch = "1.14"; + version = "1.14.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0xa23maq6phkfil8xx26viig2m99sbzcf1w7s56hns2qw6pycn79"; + sha256 = "0fkbzqncx34dhylrg5328fih7xywmsqj2p40smnx33nyf047jdgc"; }; buildInputs = [ diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index af5c11e69aef..83774206b5c7 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -57,6 +57,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; platforms = platforms.all; + # So that Exuberant ctags is preferred + priority = 1; + longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 61d508936b8b..9c4683b8c9e0 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -205,14 +205,14 @@ in }; clion = buildClion rec { - name = "clion-${version}"; + name = "clion-${build}"; version = "eap"; - build = "140.1740.3"; + build = "141.102.4"; description = "C/C++ IDE. New. Intelligent. Cross-platform."; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/${name}-${build}.tar.gz"; - sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y"; + url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; + sha256 = "0qjm8wxqn171wfd7yqf5ys1g4mwl0iyhlbry29jkgkikxp7h9dym"; }; }; @@ -242,13 +242,13 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.0"; - build = "135.1104"; + version = "7.0.4"; + build = "139.1231"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4"; + sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38"; }; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index caea8758d958..e7b96bd4b7dd 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,22 +1,37 @@ -{ stdenv, fetchurl, ncurses, gettext }: +{ stdenv, fetchurl +, ncurses +, gettext ? null +, enableNls ? true +, enableTiny ? false +}: -stdenv.mkDerivation (rec { - pname = "nano"; - version = "2.3.6"; +assert enableNls -> (gettext != null); - name = "${pname}-${version}"; +with stdenv.lib; +stdenv.mkDerivation rec { + name = "nano-${version}"; + version = "2.4.0"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534"; + sha256 = "1gbm9bcv4k55y01r5q8a8a9s3yrrgq3z5jxxiij3wl404r8gnxjh"; }; + buildInputs = [ ncurses ] ++ optional enableNls gettext; + configureFlags = '' + --sysconfdir=/etc + ${optionalString (!enableNls) "--disable-nls"} + ${optionalString enableTiny "--enable-tiny"} + ''; - buildInputs = [ ncurses gettext ]; - - configureFlags = "sysconfdir=/etc"; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/text.c --replace "__time_t" "time_t" + ''; meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ joachifm ]; + platforms = platforms.all; }; -}) +} diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh deleted file mode 100644 index 15706b0c37dd..000000000000 --- a/pkgs/applications/editors/nedit/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" - -installPhase() { - mkdir -p $out/bin - cp -p source/nedit source/nc $out/bin -} - -genericBuild diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index bd53f8d81d08..a4dfc4719dc4 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,22 +1,26 @@ -{stdenv, fetchurl, x11, motif, libXpm}: +{ stdenv, fetchurl, x11, motif, libXpm }: assert stdenv.isLinux; -stdenv.mkDerivation { - name = "nedit-5.5"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "nedit-5.6"; src = fetchurl { - url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2; - md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe"; + url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; + sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - patches = [./dynamic.patch]; - inherit motif; - buildInputs = [x11 motif libXpm]; + buildInputs = [ x11 motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; + NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; + + installPhase = '' + mkdir -p $out/bin + cp -p source/nedit source/nc $out/bin + ''; + meta = { homepage = http://www.nedit.org; }; diff --git a/pkgs/applications/editors/nedit/dynamic.patch b/pkgs/applications/editors/nedit/dynamic.patch deleted file mode 100644 index adb2cbc25927..000000000000 --- a/pkgs/applications/editors/nedit/dynamic.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux -*** nedit-5.5-orig/makefiles/Makefile.linux 2003-05-20 02:27:56.000000000 +0200 ---- nedit-5.5/makefiles/Makefile.linux 2005-12-03 00:42:23.000000000 +0100 -*************** -*** 17,27 **** - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common - ---- 17,27 ---- - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -lXm -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index c3ecbf0a60f5..fda51dc24019 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { mkdir dependencies/common/dictionaries for dict in $hunspellDicts; do - for i in $dict/share/hunspell/* + for i in "$dict/share/hunspell/"* do ln -sv $i dependencies/common/dictionaries/ done done diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/applications/editors/rstudio/r-location.patch new file mode 100644 index 000000000000..a1ec84a5475c --- /dev/null +++ b/pkgs/applications/editors/rstudio/r-location.patch @@ -0,0 +1,24 @@ +diff -ur rstudio-0.98.110-old/src/cpp/core/CMakeLists.txt rstudio-0.98.110-new/src/cpp/core/CMakeLists.txt +--- rstudio-0.98.110-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2013-04-28 10:02:14.000000000 -0400 ++++ rstudio-0.98.110-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2015-03-23 15:06:35.533400807 -0400 +@@ -84,9 +84,7 @@ + { + // define potential paths + std::vector<std::string> rScriptPaths; +- rScriptPaths.push_back("/usr/bin/R"); +- rScriptPaths.push_back("/usr/local/bin/R"); +- rScriptPaths.push_back("/opt/local/bin/R"); ++ rScriptPaths.push_back("@R@/bin/R"); + return scanForRScript(rScriptPaths, pErrMsg); + } + +@@ -220,8 +218,7 @@ + // scan in standard locations as a fallback + std::string scanErrMsg; + std::vector<std::string> rScriptPaths; +- rScriptPaths.push_back("/usr/local/bin/R"); +- rScriptPaths.push_back("/usr/bin/R"); ++ rScriptPaths.push_back("@R@/bin/R"); + FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg); + if (scriptPath.empty()) + { diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 8f27f5409975..4f14aade5a5d 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.410"; + version = "7.4.683"; src = fetchhg { - url = "https://vim.googlecode.com/hg/"; - rev = "v7-4-410"; - sha256 = "145llhj6gq2bh9b7p8xkxc388krrximq80b87f3cn4w4d4k9fhqp"; + url = "https://code.google.com/p/vim/"; + rev = "v7-4-663"; + sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 939b59b8d1cb..35e12e8a8c72 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,64 +1,83 @@ -{ lib -, stdenv -, fetchurl -, pkgconfig -, bzip2 -, fontconfig -, freetype -, ghostscript ? null -, libjpeg -, libpng -, libtiff -, libxml2 -, zlib -, libtool -, jasper -, libX11 -, tetex ? null -, librsvg ? null +{ stdenv, fetchurl, pkgconfig, libtool +, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null +, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null +, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null +, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null +, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null +, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null +, libxml2 ? null }: let - version = "6.9.0-0"; + version = "6.9.1-0"; arch = if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; + mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; + mkWith = mkFlag "with" "without"; + mkEnable = mkFlag "enable" "disable"; + + hasX11 = libX11 != null && libXext != null && libXt != null; + in +with stdenv.lib; stdenv.mkDerivation rec { name = "imagemagick-${version}"; src = fetchurl { url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"; - sha256 = "1dmrl5x63msdnxsf4cmhz5v4ard2z3jrgp2zhqlb27399j81qcqj"; + sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j"; }; enableParallelBuilding = true; - preConfigure = if tetex != null then - '' - export DVIDecodeDelegate=${tetex}/bin/dvips - '' else ""; - - configureFlags = - [ "--with-frozenpaths" ] - ++ [ "--with-gcc-arch=${arch}" ] - ++ lib.optional (librsvg != null) "--with-rsvg" - ++ lib.optionals (stdenv.system != "x86_64-darwin") - [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" - "--with-gslib" - ]; - - propagatedBuildInputs = - [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg - libtool jasper libX11 - ] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript; + configureFlags = [ + (mkEnable (libcl != null) "opencl") + (mkWith true "modules") + (mkWith true "gcc-arch=${arch}") + (mkEnable true "hdri") + (mkWith (perl != null) "perl") + (mkWith (jemalloc != null) "jemalloc") + (mkWith true "frozenpaths") + (mkWith (bzip2 != null) "bzlib") + (mkWith hasX11 "x") + (mkWith (zlib != null) "zlib") + (mkWith false "dps") + (mkWith (fftw != null) "fftw") + (mkWith (libfpx != null) "fpx") + (mkWith (djvulibre != null) "djvu") + (mkWith (fontconfig != null) "fontconfig") + (mkWith (freetype != null) "freetype") + (mkWith (ghostscript != null) "gslib") + (mkWith (graphviz != null) "gvc") + (mkWith (jbigkit != null) "jbig") + (mkWith (libjpeg != null) "jpeg") + (mkWith (lcms2 != null) "lcms2") + (mkWith false "lcms") + (mkWith (openjpeg != null) "openjp2") + (mkWith (liblqr1 != null) "lqr") + (mkWith (xz != null) "lzma") + (mkWith (openexr != null) "openexr") + (mkWith (pango != null) "pango") + (mkWith (libpng != null) "png") + (mkWith (librsvg != null) "rsvg") + (mkWith (libtiff != null) "tiff") + (mkWith (libwebp != null) "webp") + (mkWith (libxml2 != null) "xml") + ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" + ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; - buildInputs = [ tetex pkgconfig ]; + buildInputs = [ + pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw + libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg + lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp + libxml2 + ]; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; @@ -66,6 +85,6 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ the-kenny wkennington ]; }; } diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index d3caed5abe8e..45813bbdb204 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, libX11, imlib2, giflib, libexif }: stdenv.mkDerivation { - name = "sxiv-1.3-git"; + name = "sxiv-2015.03.25"; src = fetchgit { url = "https://github.com/muennich/sxiv.git"; - rev = "92e3b57816e999b46f8d0778984719227631e9a7"; - sha256 = "0jbswh0k1xq5hgrv1pyvk7lpwbbj66p7gjsdm8zh6ah324apjr2b"; + rev = "01ed483b50f506fcba928af43e2ca017897e7c77"; + sha256 = "18s64l3dvibqg9biznzy4mdkkn9qmmpqxpdx7ljx7c0832aqy94k"; }; postUnpack = '' diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 3a5cf4edc6f2..b0f89cc5ea03 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { + meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = with maintainers; [ urkud ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index 8b0ba581612e..e0bb591ac28a 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation { }; patches = [ ./robomongo.patch ]; - + + postPatch = '' + rm ./cmake/FindOpenSSL.cmake # remove outdated bundled CMake file + ''; + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ]; diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix new file mode 100644 index 000000000000..a162df9f33b2 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch +, sslSupport ? true +, imapSupport ? true +, headerCache ? true +, saslSupport ? true +, gpgmeSupport ? true +, gdbm ? null +, openssl ? null +, cyrus_sasl ? null +, gpgme ? null +}: + +assert headerCache -> gdbm != null; +assert sslSupport -> openssl != null; +assert saslSupport -> cyrus_sasl != null; +assert gpgmeSupport -> gpgme != null; + +let + version = "1.5.23.1-rc1"; +in +stdenv.mkDerivation rec { + name = "mutt-kz-${version}"; + + src = fetchurl { + url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz"; + sha256 = "1m4bnn8psyrx2wy8ribannmp5qf75lv1gz116plji2z37z015zny"; + }; + + buildInputs = with stdenv.lib; + [ ncurses which perl autoreconfHook autoconf automake notmuch] + ++ optional headerCache gdbm + ++ optional sslSupport openssl + ++ optional saslSupport cyrus_sasl + ++ optional gpgmeSupport gpgme; + +configureFlags = [ + "--with-mailpath=" "--enable-smtp" + + # This allows calls with "-d N", that output debug info into ~/.muttdebug* + "--enable-debug" + + "--enable-pop" "--enable-imap" + + "--enable-notmuch" + + # The next allows building mutt without having anything setgid + # set by the installer, and removing the need for the group 'mail' + # I set the value 'mailbox' because it is a default in the configure script + "--with-homespool=mailbox" + (if headerCache then "--enable-hcache" else "--disable-hcache") + (if sslSupport then "--with-ssl" else "--without-ssl") + (if imapSupport then "--enable-imap" else "--disable-imap") + (if saslSupport then "--with-sasl" else "--without-sasl") + (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") + ]; + + meta = with stdenv.lib; { + description = "A small but very powerful text-based mail client, forked to support notmuch"; + homepage = https://github.com/karelzak/mutt-kz/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 7e32a26abf18..3ff12c274d53 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ettercap-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "017398fiqcl2x1bjfnz97y6j8v5n83gbsniy73vbx21kmhh5pacg"; + sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; }; buildInputs = [ diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix new file mode 100644 index 000000000000..1c3e8e412f80 --- /dev/null +++ b/pkgs/applications/science/logic/abella/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, rsync, ocaml }: + +stdenv.mkDerivation rec { + name = "abella-${version}"; + version = "2.0.2"; + + src = fetchurl { + url = "http://abella-prover.org/distributions/${name}.tar.gz"; + sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c"; + }; + + buildInputs = [ rsync ocaml ]; + + installPhase = '' + mkdir -p $out/bin + rsync -av abella $out/bin/ + + mkdir -p $out/share/emacs/site-lisp/abella/ + rsync -av emacs/ $out/share/emacs/site-lisp/abella/ + + mkdir -p $out/share/abella/examples + rsync -av examples/ $out/share/abella/examples/ + ''; + + meta = { + description = "Interactive theorem prover"; + longDescription = '' + Abella is an interactive theorem prover based on lambda-tree syntax. + This means that Abella is well-suited for reasoning about the meta-theory + of programming languages and other logical systems which manipulate + objects with binding. + ''; + homepage = http://abella-prover.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ bcdarwin ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix new file mode 100644 index 000000000000..4d391379e819 --- /dev/null +++ b/pkgs/applications/science/logic/lean/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python +, gperftools, ninja }: + +stdenv.mkDerivation rec { + name = "lean-20150328"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean"; + rev = "1b15036dba469020d37f7d6b77b88974d8a36cb1"; + sha256 = "0w38g83gp7d3ybfiz9jpl2jz3ljad70bxmar0dnnv45wx42clg96"; + }; + + buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; + enableParallelBuilding = true; + + preConfigure = "cd src"; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + meta = { + description = "Automatic and interactive theorem prover"; + homepage = "http://leanprover.github.io"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index a213f6da37ed..2296a28444b4 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, python, unzip }: +{ stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { name = "z3-${version}"; version = "4.3.2"; - src = fetchurl { - url = "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx\?ProjectName\=z3\&changeSetId\=cee7dd39444c9060186df79c2a2c7f8845de415b"; - name = "${name}.zip"; - sha256 = "0hagy7xm0m52jd6vlrbizkj24mn6c49hkb3r5p66wilvp15ivpbn"; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "ac21ffebdf1512da2a77dc46c47bde87cc3850f3"; + sha256 = "1y86akhpy41wx3gx7r8gvf7xbax7dj36ikj6gqh5a7p6r6maz9ci"; }; - buildInputs = [ python unzip ]; + buildInputs = [ python ]; enableParallelBuilding = true; - # The zip file doesn't unpack a directory, just the code itself. - unpackPhase = "mkdir ${name} && cd ${name} && unzip $src"; - - configurePhase = '' - python scripts/mk_make.py --prefix=$out - cd build - ''; + configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; # z3's install phase is stupid because it tries to calculate the # python package store location itself, meaning it'll attempt to @@ -26,21 +22,19 @@ stdenv.mkDerivation rec { soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; installPhase = '' mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include - cp ../src/api/z3.h $out/include - cp ../src/api/z3_api.h $out/include - cp ../src/api/z3_v1.h $out/include - cp ../src/api/z3_macros.h $out/include - cp ../src/api/c++/z3++.h $out/include + cp ../src/api/z3*.h $out/include + cp ../src/api/c++/z3*.h $out/include cp z3 $out/bin cp libz3${soext} $out/lib cp libz3${soext} $out/lib/${python.libPrefix}/site-packages cp z3*.pyc $out/lib/${python.libPrefix}/site-packages + cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages ''; meta = { description = "A high-performance theorem prover and SMT solver"; - homepage = "http://z3.codeplex.com"; - license = stdenv.lib.licenses.msrla; + homepage = "http://github.com/Z3Prover/z3"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 8e68e455ef18..c291c0ce6e5b 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pcalc-${version}"; - version = "20120812"; + version = "20141224"; src = fetchgit { url = git://git.code.sf.net/p/pcalc/code; - rev = "db5c5d587d4d24ff6b23405a92eeaad4c0f99618"; - sha256 = "1bzmiz9rrss3xk0vzszbisjkph73zwgc0riqn9zdd2h1iv6dgq92"; + rev = "181d60d3c880da4344fef7138065943eb3b9255f"; + sha256 = "0n60m3p4kkqvvswjf50mnfaaacmzi1lss8vgy63mrgzwi9v6yb4l"; }; makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ]; diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix deleted file mode 100644 index d5f03a41f224..000000000000 --- a/pkgs/applications/version-management/darcs/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, curl, extensibleExceptions, filepath, hashedStorage -, haskeline, html, HTTP, mmap, mtl, network, networkUri, parsec -, random, regexCompat, tar, terminfo, text, utf8String, vector -, zlib -}: - -cabal.mkDerivation (self: { - pname = "darcs"; - version = "2.8.5"; - sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6"; - isLibrary = true; - isExecutable = true; - doCheck = false; - buildDepends = [ - extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network networkUri parsec random regexCompat tar terminfo - text utf8String vector zlib - ]; - extraLibraries = [ curl ]; - postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs - ''; - patchPhase = '' - sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' darcs.cabal - ''; - meta = { - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 299819a8a28f..1093bbe0d028 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,11 +1,15 @@ {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}: -stdenv.mkDerivation { - name = "fossil-1.30"; +stdenv.mkDerivation rec { + name = "fossil-1.32"; src = fetchurl { - url = http://www.fossil-scm.org/download/fossil-src-20150119112900.tar.gz; - sha256 = "1p4jxd67m2a5rl85hb9gl0vxcvvkxnj1hd8yjaci2qf115d9x5ip"; + urls = + [ + "https://www.fossil-scm.org/fossil/tarball/Fossil-6c40678e.tar.gz?uuid=6c40678e9114c41a50f73cc43f6f942ace0408ec" + ]; + name = "${name}.tar.gz"; + sha256 = "0f1rvqiy630z2q1q8r3kgdd0c6sxjx8c8pm46yabn238xvf3bfnr"; }; buildInputs = [ zlib openssl readline sqlite ]; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 383114f1c3cc..6cde64b30900 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "0.10.2"; + version = "0.11.2"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "13ac4rqmxc87ymh78ff8kbw1s252nbid71l0ircmj9kmh9jqwncl"; + sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if"; }; # cgit is tightly coupled with git and needs a git source tree to build. @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to # 1.9.2 (see the repository history) gitSrc = fetchurl { - url = "https://www.kernel.org/pub/software/scm/git/git-1.9.2.tar.xz"; - sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13"; + url = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz"; + sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 123bb65da8d8..65a9679576e0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.3.3"; + version = "2.3.4"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "11s6w6dsv9kfgpfa75sas4pi6spw75ph0b0b6b12xq37hl4l8ma7"; + sha256 = "15fv155skjy80j7sv7x4kxlj3m8i334bic4q2qmb6zvr04hjpslp"; }; patches = [ diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 4c82c96a7c13..c8973e4a6600 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tig-2.0.3"; + name = "tig-2.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "1i4nizachq0ncq0d8c87ly50zk51vgzb5a8amqscywdp1kc0zb7s"; - + sha256 = "1c1w6w39a1dwx4whrg0ga1mhrlz095hz875z7ajn6xgmhkv8fqih"; }; buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7b329750ea5e..69888e22a019 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.2.0"; + n = "qemu-2.2.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; }; buildInputs = diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index da5d22498523..42d8f35b076d 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -23,6 +23,7 @@ let inherit (builtins) head tail trace; in else if hasSuffixHack ".tar.Z" s then "tZ" else if hasSuffixHack ".tar.lzma" s then "tar.lzma" else if hasSuffixHack ".tar.xz" s then "tar.xz" + else if hasSuffixHack ".rar" s then "rar" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if hasSuffixHack "-cvs-export" s then "cvs-dir" else if hasSuffixHack "-git-export" s then "git-dir" @@ -213,6 +214,9 @@ let inherit (builtins) head tail trace; in " else if (archiveType s) == "tar.xz" then " xz -d -c <'${s}' | tar xv cd \"\$(xz -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" + " else if (archiveType s) == "rar" then " + unrar x '${s}' + cd \"$(unrar lb '${s}' | tail -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "zip" then " unzip '${s}' cd \"$( unzip -lqq '${s}' | tail -1 | diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index df43da58e3ec..f6826c837ca1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation { '' + optionalString cc.langGo or false '' - wrap ccgo ${./cc-wrapper.sh} $ccPath/gccgo + wrap gccgo ${./cc-wrapper.sh} $ccPath/gccgo '' + optionalString cc.langAda or false '' diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 0582ca553012..895160616b79 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,7 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor}: +{ stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor, prepend }: let inputsFun = ubootName : [perl cpio perlArchiveCpio ] @@ -41,5 +41,5 @@ stdenv.mkDerivation { nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot; }; - inherit compressor; + inherit compressor prepend; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 17b261f98407..08961a1b49c2 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -36,7 +36,10 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. mkdir -p $out -(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor > $out/initrd) +for PREP in $prepend; do + cat $PREP >> $out/initrd +done +(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor >> $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 7696632ef92b..532abd4e5871 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-4.002"; + name = "fira-4.004"; src = fetchurl { - url = http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip; - sha256 = "1vh4hx8ffmh2p7mxxbcp5zbcz8kzpzxaggdqnhj5i4vi329n5hfw"; + url = "http://www.carrois.com/downloads/fira_4_0/FiraFonts4004.zip"; + sha256 = "0mab1n4i8ayhzmpfm0dj07annghrfpnsfr2rhnwsyhkk5zxlh6v7"; }; buildInputs = [unzip]; phases = [ "unpackPhase" "installPhase" ]; + sourceRoot = "FiraFonts4004"; installPhase = '' mkdir -p $out/share/fonts/opentype diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix new file mode 100644 index 000000000000..eefb663f7221 --- /dev/null +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mplus-${version}"; + version = "TESTFLIGHT-059"; + + src = fetchurl { + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz"; + sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "M+ Outline Fonts"; + homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html; + license = licenses.mit; + maintainers = with maintainers; [ henrytill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index be65061c544c..bb57ebbfa875 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,4 +1,5 @@ {stdenv, fetchurl +, libtool, autoconf, automake , gmp, mpfr, libffi , noUnicode ? false, }: @@ -13,10 +14,10 @@ let sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid"; }; buildInputs = [ - libffi + libtool autoconf automake ]; propagatedBuildInputs = [ - gmp mpfr + libffi gmp mpfr ]; in stdenv.mkDerivation { @@ -25,8 +26,18 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + patches = [ ./libffi-prefix.patch ]; + preConfigure = '' + (cd src ; libtoolize -f) + (cd src ; autoheader -f) + (cd src ; aclocal) + (cd src ; automake --add-missing -c) + (cd src ; autoconf -f) + ''; configureFlags = [ "--enable-threads" + "--with-gmp-prefix=${gmp}" + "--with-libffi-prefix=${libffi}" ] ++ (stdenv.lib.optional (! noUnicode) diff --git a/pkgs/development/compilers/ecl/libffi-prefix.patch b/pkgs/development/compilers/ecl/libffi-prefix.patch new file mode 100644 index 000000000000..d02cc214f31f --- /dev/null +++ b/pkgs/development/compilers/ecl/libffi-prefix.patch @@ -0,0 +1,39 @@ +diff --git a/src/configure.in b/src/configure.in +index 434da49..642c66c 100644 +--- ecl-15.3.7.orig/src/configure.ac ++++ ecl-15.3.7/src/configure.ac +@@ -191,6 +191,11 @@ AC_ARG_WITH(dffi, + [(system|included|auto|no, default=AUTO if libffi available)]), + [enable_libffi=${withval}], [enable_libffi=auto]) + ++AC_ARG_WITH(libffi-prefix, ++ AS_HELP_STRING( [--with-libffi-prefix=path], ++ [prefix for system LIBFFI includes and libraries] ), ++ [LIBFFI_INCDIR="$withval/include"; LIBFFI_LIBDIR="$withval/lib"], []) ++ + AC_ARG_WITH(fpe, + AS_HELP_STRING( [--with-fpe], + [detect floating point exceptions] +@@ -368,6 +373,22 @@ else + INFOEXT=info + fi + ++dnl libffi ++ ++if test "x$LIBFFI_INCDIR" != "x"; then ++ LIBFFI_CPPFLAGS="-I$LIBFFI_INCDIR" ++fi ++if test "x$LIBFFI_LIBDIR" != "x"; then ++ LIBFFI_LDFLAGS="-L$LIBFFI_LIBDIR" ++ if test "$enable_rpath" = "yes"; then ++ if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then ++ LIBFFI_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBFFI_LIBDIR,"`" $LIBFFI_LDFLAGS" ++ fi ++ fi ++fi ++CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS" ++LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS" ++ + dnl ====================================================================== + dnl GNU multiprecision library + dnl diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix index 1595b7f336fe..1be771ac7054 100644 --- a/pkgs/development/compilers/gcc/3.4/default.nix +++ b/pkgs/development/compilers/gcc/3.4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { } "; - passthru = { inherit langC langCC langF77; }; + passthru = { inherit langC langCC langF77; isGNU = true; }; meta = { homepage = "http://gcc.gnu.org/"; diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 45040c2f3753..3db8ee5f3ea7 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -171,6 +171,8 @@ stdenv.mkDerivation ({ rm -Rf ghdl-* ''; + passthru.isGNU = true; + meta = { homepage = "http://ghdl.free.fr/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index c78de2265f3a..47c8c86a95d5 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; # ghdl does not build fine with parallel building # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173 diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 931c5c413dee..c4be4f266dd1 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -358,7 +358,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; enableParallelBuilding = !langAda; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 78666c8cdce3..0f65a89bd209 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -427,7 +427,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - langGo version; }; + langGo version; isGNU = true; }; enableParallelBuilding = false; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index ee7ca20ddf7f..d8157673fbc3 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 2364fe1d5b9f..f6beaf3a0067 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index b3371eb920b1..a1cdd6171eee 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -116,5 +116,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 9e61be7b47f4..c28359af16fa 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - broken = stdenv.isDarwin; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is not supported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 09d89b80f34b..d39c4b921ba0 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.20150316"; + version = "7.10.1"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; - sha256 = "0cqazqf90rsp2nl7pk46gki7lln9jks0h166i0bd1qsp5gc1xv13"; + url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz"; + sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj"; }; buildInputs = [ ghc perl ]; diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 778b47afde78..651cf200a8d0 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - broken = stdenv.isDarwin; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 4bf7d6d35319..2b8d403701f6 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -124,5 +124,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index c4000fc86c25..5497b35ec1db 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -38,15 +38,11 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - meta = with stdenv.lib; { + meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; - inherit (ghc.meta) license; - # Filter old "i686-darwin" platform which is unsupported these days. - platforms = filter (x: elem x platforms.all) ghc.meta.platforms; - # Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>. - hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix index aeaa476df12b..316730fe3ba0 100644 --- a/pkgs/development/compilers/llvm/3.3/clang.nix +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation { sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; }; - passthru = { cc = stdenv.cc.cc; }; + passthru = { + isClang = true; + cc = stdenv.cc.cc; + gcc = gccReal; + }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 612e63eafd49..cd060e3a65d9 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -34,7 +34,13 @@ stdenv.mkDerivation { ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ''; - passthru.cc = stdenv.cc.cc; + passthru = { + isClang = true; + cc = stdenv.cc.cc; + # GCC_INSTALL_PREFIX points here, so just use it even though it may not + # actually be a gcc + gcc = stdenv.cc.cc; + }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 93e0056fb92d..2398b0c59ac5 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -39,7 +39,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + passthru = { + isClang = true; + } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index 2216dad3ef8e..7be535ada1e5 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -40,7 +40,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + passthru = { + isClang = true; + } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix new file mode 100644 index 000000000000..2a34a5dc50b1 --- /dev/null +++ b/pkgs/development/compilers/mkcl/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, gmp }: + +stdenv.mkDerivation rec { + v = "1.1.9"; + name = "mkcl-${v}"; + + src = fetchgit { + url = "https://github.com/jcbeaudoin/mkcl.git"; + rev = "86768cc1dfc2cc9caa1fe9696584bb25ea6c1429"; + sha256 = "0ja7vyp5rjidb2a1gah35jqzqn6zjkikz5sd966p0f0wh26l6n03"; + }; + + propagatedBuildInputs = [ gmp ]; + + configureFlags = [ + "GMP_CFLAGS=-I${gmp}/include" + "GMP_LDFLAGS=-L${gmp}/lib" + ]; + + meta = { + description = "ANSI Common Lisp Implementation"; + homepage = https://common-lisp.net/project/mkcl/; + license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 55b7ff36f8fa..d7bcabd0a781 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -37,8 +37,7 @@ let url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2"; }; -in -stdenv.mkDerivation { + openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; srcs = [jdk8 langtools hotspot corba jdk jaxws jaxp nashorn]; outputs = [ "out" "jre" ]; @@ -138,5 +137,6 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.cocreature ]; platforms = stdenv.lib.platforms.linux; }; - -} + + passthru.home = "${openjdk8}/lib/openjdk"; +}; in openjdk8 diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index e6a418c18956..1c1b5d53cee9 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ffd2e209999a..51cd53476ff9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -7,8 +7,8 @@ self: super: { # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; - Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; }); + Cabal_1_22_2_0 = dontCheck super.Cabal_1_22_2_0; + cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_2_0; }); # Break infinite recursions. digest = super.digest.override { inherit (pkgs) zlib; }; @@ -107,6 +107,7 @@ self: super: { deepseq-magic = dontHaddock super.deepseq-magic; diagrams = dontHaddock super.diagrams; either = dontHaddock super.either; + feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 gl = dontHaddock super.gl; groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; @@ -181,7 +182,7 @@ self: super: { lushtags = markBrokenVersion "0.0.1" super.lushtags; # https://github.com/haskell/bytestring/issues/41 - bytestring_0_10_4_1 = dontCheck super.bytestring_0_10_4_1; + bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0; # https://github.com/zmthy/http-media/issues/6 http-media = dontCheck super.http-media; @@ -253,6 +254,7 @@ self: super: { amqp-conduit = dontCheck super.amqp-conduit; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw + directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; # https://github.com/haskell/directory/issues/24 hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); @@ -300,6 +302,7 @@ self: super: { cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw + CLI = dontCheck super.CLI; # Upstream has no issue tracker. cjk = dontCheck super.cjk; command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw conduit-connection = dontCheck super.conduit-connection; @@ -428,7 +431,7 @@ self: super: { snappy = dontCheck super.snappy; # Needs llvm to compile. - bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm_34; + bytestring-arbitrary = addBuildTool super.bytestring-arbitrary self.llvm; # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; @@ -482,11 +485,6 @@ self: super: { # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44 liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; }); - # LLVM 3.5 breaks GHC: https://ghc.haskell.org/trac/ghc/ticket/9142. - GlomeVec = super.GlomeVec.override { llvm = pkgs.llvm_34; }; # https://github.com/jimsnow/glome/issues/2 - gloss-raster = super.gloss-raster.override { llvm = pkgs.llvm_34; }; - repa-examples = super.repa-examples.override { llvm = pkgs.llvm_34; }; - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 @@ -580,15 +578,6 @@ self: super: { hmidi = markBrokenVersion "0.2.1.0" super.hmidi; padKONTROL = markBroken super.padKONTROL; - # https://github.com/lambdabot/lambdabot/issues/105 - lambdabot-core = markBroken super.lambdabot-core; - lambdabot-haskell-plugins = markBroken super.lambdabot-haskell-plugins; - lambdabot-irc-plugins = markBroken super.lambdabot-irc-plugins; - lambdabot-misc-plugins = markBroken super.lambdabot-misc-plugins; - lambdabot-novelty-plugins = markBroken super.lambdabot-novelty-plugins; - lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins; - lambdabot-social-plugins = markBroken super.lambdabot-social-plugins; - # Upstream provides no issue tracker and no contact details. vivid = markBroken super.vivid; @@ -637,6 +626,32 @@ self: super: { hydrogen-syntax = markBroken super.hydrogen-syntax; hydrogen-cli = dontDistribute super.hydrogen-cli; + # https://github.com/meteficha/Hipmunk/issues/8 + Hipmunk = markBroken super.Hipmunk; + HipmunkPlayground = dontDistribute super.HipmunkPlayground; + + # https://github.com/prowdsponsor/esqueleto/issues/93 + esqueleto = dontCheck super.esqueleto; + + # https://github.com/anchor/ceilometer-common/issues/16 + ceilometer-common = dontCheck super.ceilometer-common; + + # https://github.com/fumieval/audiovisual/issues/1 + audiovisual = markBroken super.audiovisual; + + # https://github.com/cdupont/Nomyx/issues/85 + Nomyx-Core = markBroken super.Nomyx-Core; + Nomyx-Web = dontDistribute super.Nomyx-Web; + Nomyx = dontDistribute super.Nomyx; + + # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 + stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); + + # https://github.com/GaloisInc/cryptol/issues/197 + cryptol = overrideCabal super.cryptol (drv: { + postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; + }); + } // { # Not on Hackage. @@ -645,8 +660,8 @@ self: super: { version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "a8eaadbe6529cabd5088b8ae24fb325fc85a50c1"; - sha256 = "08q6c6g6syf4qgmgmicq8gf3fmp2cvy9mm6wm0vi7wjll3i2dns1"; + rev = "d131b2b2db1bc37a10bbc40c3adea3f006633a5e"; + sha256 = "0s92mdkgjqkqby6b1lrxs5dh9ja49sj5jpdc56g5v8g03h3g9m0a"; deepClone = true; }; isLibrary = false; diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index cccf5833c8a5..2a5213d4e121 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # LLVM is not supported on this GHC; use the latest one. + inherit (pkgs) llvmPackages; + # Disable GHC 6.12.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 36afb31ffcd5..27c4b642c4b7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.0.x core libraries. array = null; base = null; @@ -35,7 +38,7 @@ self: super: { binary = self.binary_0_7_4_0; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_0; + deepseq = self.deepseq_1_4_1_1; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; 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 df44501aadd2..6855a9b13a85 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_35; + # Disable GHC 7.10.x core libraries. array = null; base = null; @@ -86,13 +89,29 @@ self: super: { barecheck = doJailbreak super.barecheck; cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); + syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { + url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; + sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br"; + }); + + wl-pprint = overrideCabal super.wl-pprint (drv: { + patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; + }); + + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { + patchPhase = '' + sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs + sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs + ''; + }); + # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # 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"; - sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w"; + sha256 = "0idf12b2wd6chyvsgdcfl5kzx67crvgs1cqklx5say3426j57g4q"; }); foldl = appendPatch super.foldl (pkgs.fetchpatch { url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; @@ -105,7 +124,7 @@ self: super: { }); stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; - sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g"; + sha256 = "1j2a327m3bjl8k4dipc52nlh2ilg94gdcj9hdmdq62yh2drslvgx"; }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; @@ -125,10 +144,4 @@ self: super: { sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq"; stripLen = 1; }); - - # https://github.com/batterseapower/ansi-wl-pprint/issues/13 - ansi-wl-pprint = appendPatch super.ansi-wl-pprint (pkgs.fetchpatch { - url = "https://github.com/hvr/ansi-wl-pprint/commit/7e489ea6b546899074b1cdccf37d2e49ab313098.patch"; - sha256 = "0j20cwbph1wg82gfad5a6gfc5gy42cf4vz514jrpfg8d9qvyfhlj"; - }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 23e939853afc..8428af7ca6e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.2.x core libraries. array = null; base = null; @@ -32,7 +35,7 @@ self: super: { unix = null; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_0; + deepseq = self.deepseq_1_4_1_1; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; @@ -40,7 +43,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 0188be27a65f..fd4109fad72e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.4.x core libraries. array = null; base = null; @@ -37,7 +40,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 827ea9895e6a..d853e9265ba4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.6.x core libraries. array = null; base = null; @@ -36,11 +39,11 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # haskeline and terminfo are not core libraries for this compiler. - haskeline = self.haskeline_0_7_2_0; + haskeline = self.haskeline_0_7_2_1; terminfo = self.terminfo_0_4_0_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -67,30 +70,4 @@ self: super: { contravariant = addBuildDepend super.contravariant self.tagged; reflection = dontHaddock (addBuildDepend super.reflection self.tagged); -} // { - - # Not on Hackage. - cryptol = self.mkDerivation rec { - pname = "cryptol"; - version = "2.1.0"; - src = pkgs.fetchFromGitHub { - owner = "GaloisInc"; - repo = "cryptol"; - rev = "v${version}"; - sha256 = "00bmad3qc7h47j26xp7hbrlb0qv0f7k9spxgsc1f6lsmpgq9axr3"; - }; - isLibrary = true; - isExecutable = true; - buildDepends = with self; [ - ansi-terminal array async base containers deepseq directory - executable-path filepath GraphSCC haskeline monadLib mtl old-time - presburger pretty process QuickCheck random smtLib syb text - tf-random transformers utf8-string - ]; - buildTools = with self; [ alex happy Cabal_1_22_1_1 ]; - patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; - description = "Cryptol: The Language of Cryptography"; - license = pkgs.stdenv.lib.licenses.bsd3; - }; - } 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 96447d9d90bb..e53ea6fc4c88 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.8.x core libraries. array = null; base = null; @@ -45,7 +48,7 @@ self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; - haskeline = self.haskeline_0_7_2_0; + haskeline = self.haskeline_0_7_2_1; mtl = super.mtl_2_2_1; })) (drv: { jailbreak = true; # idris is scared of lens 4.7 @@ -53,7 +56,7 @@ self: super: { }); # warning: "Module ‘Control.Monad.Error’ is deprecated" # Depends on time == 0.1.5, which we don't have. - HStringTemplate_0_8_1 = dontDistribute super.HStringTemplate_0_8_1; + HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3; # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 4c4065e8889a..47b450afc4ea 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + # Disable GHC 7.11.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 000a0647bef1..9ae45e9425b4 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # LLVM is not supported on this GHC; use the latest one. + inherit (pkgs) llvmPackages; + # This is the list of packages that are built into a booted ghcjs installation # It can be generated with the command: # nix-shell '<nixpkgs>' -A pkgs.haskellPackages_ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'" diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 973ff83c42df..673855227b88 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -54,7 +54,10 @@ let inherit mkDerivation callPackage; - ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { packages = pkgs self; }; + ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { + inherit (self) llvmPackages; + packages = pkgs self; + }; ghc = ghc // { withPackages = self.ghcWithPackages; }; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index faf1ce4046e2..3e9f82db359f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -3,7 +3,7 @@ }: { pname -, version +, version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } , buildDepends ? [] @@ -43,9 +43,10 @@ , preFixup ? "", postFixup ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -}: +} @ args: assert pkgconfigDepends != [] -> pkgconfig != null; +assert editedCabalFile != null -> revision != null; let @@ -53,8 +54,9 @@ let concatStringsSep enableFeature optionalAttrs; newCabalFile = fetchurl { - url = "http://hackage.haskell.org/package/${pname}-${version}/${pname}.cabal"; + url = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; sha256 = editedCabalFile; + name = "${pname}-${version}-r${revision}.cabal"; }; defaultSetupHs = builtins.toFile "Setup.hs" '' @@ -110,6 +112,8 @@ in stdenv.mkDerivation ({ name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; + pos = builtins.unsafeGetAttrPos "pname" args; + prePhases = ["setupCompilerEnvironmentPhase"]; preConfigurePhases = ["compileBuildDriverPhase"]; preInstallPhases = ["haddockPhase"]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d39ea7b700fe..9fa2b6bc12c1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -394,6 +394,7 @@ self: { mkDerivation { pname = "AES"; version = "0.2.9"; + revision = "1"; sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc"; editedCabalFile = "9e51c1b1687fe35ccd0f2983e861b5b0441399803ff76b192530984724a68d6f"; buildDepends = [ @@ -416,12 +417,12 @@ self: { }) {}; "ALUT" = callPackage - ({ mkDerivation, base, freealut, OpenAL, OpenGL }: + ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }: mkDerivation { pname = "ALUT"; - version = "2.3.0.2"; - sha256 = "02kfyb4g7sfjfzqlddxqbjffrj4a0gfrzkisdpbj2lw67j1gq5dp"; - buildDepends = [ base OpenAL OpenGL ]; + version = "2.4.0.0"; + sha256 = "0g8rzzk54y8d567dvj32bq0h409ag0am196kkirsjd6f58vgjp0g"; + buildDepends = [ base OpenAL StateVar transformers ]; extraLibraries = [ freealut ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; @@ -1021,6 +1022,7 @@ self: { mkDerivation { pname = "Baggins"; version = "1.0"; + revision = "1"; sha256 = "0mgxq8zqyfmwkvn91y91c2vjhrni3br0vgiih2ynlafnas1ji0bc"; editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098"; buildDepends = [ base cairo containers mtl ]; @@ -1417,6 +1419,7 @@ self: { mkDerivation { pname = "BlastHTTP"; version = "1.0.1"; + revision = "2"; sha256 = "1qxf2lqsbwmfqkzabx8qpavf3da4lq3j1v1rdsv42gl27lqhbayi"; editedCabalFile = "e182e8cb8b1fdcff3f5cd8ba3e46f371f98ac55a3d2738061a6ab78aba52b308"; buildDepends = [ @@ -1457,6 +1460,7 @@ self: { mkDerivation { pname = "BlogLiterately"; version = "0.7.1.7"; + revision = "3"; sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90"; editedCabalFile = "04eff5dba1e60fa191970db5aa7c08f4c95dbc5f425cdea79037c5ee5823074c"; isLibrary = true; @@ -1480,6 +1484,7 @@ self: { mkDerivation { pname = "BlogLiterately-diagrams"; version = "0.1.4.3"; + revision = "1"; sha256 = "0p65nyslcvf4qzgrwsi59xil8i5sgh1xfyz431lf4f00nsqb0s2h"; editedCabalFile = "a9b96a72609bba1d29f628c22171dfb4e49e4c2ed7a8b3f5c2caf1127dff403d"; isLibrary = true; @@ -2038,23 +2043,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Cabal_1_22_1_1" = callPackage + "Cabal_1_22_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, extensible-exceptions, filepath, HUnit - , pretty, process, QuickCheck, regex-posix, test-framework - , test-framework-hunit, test-framework-quickcheck2, time, unix + , old-time, pretty, process, QuickCheck, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix }: mkDerivation { pname = "Cabal"; - version = "1.22.1.1"; - sha256 = "1m9yyan2f6l2r00f0sibikcj2kdrk313r5lhr20dyiyw2dlm33iy"; + version = "1.22.2.0"; + sha256 = "0q46wx1nvpi0cjbs9fw0kwmbyclkkvv5zp7dcssbdl3sqg216k6z"; buildDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix ]; testDepends = [ base bytestring containers directory extensible-exceptions filepath - HUnit process QuickCheck regex-posix test-framework + HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP"; @@ -2508,14 +2514,17 @@ self: { "ConcurrentUtils" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , network, parallel, process + , crypto-random, cryptohash, network, parallel, process + , reexport-crypto-random, RSA, securemem, tagged }: mkDerivation { pname = "ConcurrentUtils"; - version = "0.4.1.0"; - sha256 = "05a5v9g95by4v05zxvjma8hvn5rrvwz0c3r8q0iqqchglljs39xr"; + version = "0.4.2.0"; + sha256 = "1bxw8jrniczwc0pprva7zp6kzzrp5cj05r19j024fbgfw6vq9xz4"; buildDepends = [ - array base binary bytestring containers network parallel process + array base binary bytestring containers crypto-random cryptohash + network parallel process reexport-crypto-random RSA securemem + tagged ]; homepage = "http://alkalisoftware.net"; description = "Concurrent utilities"; @@ -3298,9 +3307,8 @@ self: { ({ mkDerivation, array, base, pretty }: mkDerivation { pname = "Diff"; - version = "0.3.0"; - sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98"; - editedCabalFile = "f016d6dd8604572ffa07922b2790658b0b869290c5eaf210018bca921e943d47"; + version = "0.3.1"; + sha256 = "10saybbmd3qa4k11g0nqjfja7c87vi540y53j59778y0hhvykfif"; buildDepends = [ array base pretty ]; description = "O(ND) diff algorithm in haskell"; license = stdenv.lib.licenses.bsd3; @@ -3834,6 +3842,7 @@ self: { mkDerivation { pname = "EitherT"; version = "0.2.0"; + revision = "1"; sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw"; editedCabalFile = "a1c6f78c9a4379af0738a6d4dee5d1781099c5c56acb0b39c45ad23b256e8c6e"; buildDepends = [ @@ -4116,6 +4125,7 @@ self: { mkDerivation { pname = "Euterpea"; version = "1.0.0"; + revision = "1"; sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds"; editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd"; buildDepends = [ @@ -4883,13 +4893,15 @@ self: { "GLUT" = callPackage ({ mkDerivation, array, base, containers, freeglut, libICE, libSM - , libXi, libXmu, mesa, OpenGL, OpenGLRaw + , libXi, libXmu, mesa, OpenGL, OpenGLRaw, StateVar, transformers }: mkDerivation { pname = "GLUT"; - version = "2.6.0.1"; - sha256 = "1bapwhhvc1mijq2macnwx79qbqsa6xg3882q58zfx7s3mqm3qycs"; - buildDepends = [ array base containers OpenGL OpenGLRaw ]; + version = "2.7.0.0"; + sha256 = "02y565fdfsl7pwl1wmyk5dma9ipc3l0yz7kwcgkvbzvqajhdg13d"; + buildDepends = [ + array base containers OpenGL OpenGLRaw StateVar transformers + ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; @@ -4912,6 +4924,7 @@ self: { linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; + jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -5224,6 +5237,7 @@ self: { mkDerivation { pname = "Glob"; version = "0.7.5"; + revision = "1"; sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0"; editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b"; buildDepends = [ @@ -5258,7 +5272,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; license = "GPL"; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "GlomeView" = callPackage ({ mkDerivation, base, deepseq, GlomeTrace, GlomeVec, monad-par @@ -5495,6 +5509,7 @@ self: { mkDerivation { pname = "Grow"; version = "1.1.0.3"; + revision = "3"; sha256 = "1vc4ln5fzvcv68qlanyw8mc6qchnjn1kj9rpz661n8ia1x8gkb3l"; editedCabalFile = "e599aab8eefc612bbf1dbae0b60308305a9d3009dda186b228e4e8aeeda1f36a"; buildDepends = [ @@ -6662,6 +6677,7 @@ self: { mkDerivation { pname = "HROOT"; version = "0.8"; + revision = "1"; sha256 = "0q6n5j1hzl8fk6a0ziqjzfi1515shqzqxx0argbvnhw85vjajvqf"; editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917"; buildDepends = [ @@ -6890,6 +6906,7 @@ self: { mkDerivation { pname = "HStringTemplate"; version = "0.7.3"; + revision = "2"; sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8"; editedCabalFile = "f3b42ea4e5c29507d6d186ccd34c83425d2e16a55ca3af95fd8bb1a71e3f54cb"; buildDepends = [ @@ -6901,20 +6918,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "HStringTemplate_0_8_1" = callPackage + "HStringTemplate_0_8_3" = callPackage ({ mkDerivation, array, base, blaze-builder, bytestring, containers - , deepseq, directory, filepath, mtl, parsec, pretty, syb - , template-haskell, text, time, void + , deepseq, directory, filepath, mtl, old-locale, parsec, pretty + , syb, template-haskell, text, time, void }: mkDerivation { pname = "HStringTemplate"; - version = "0.8.1"; - sha256 = "1ccdr1ihlm6m5nb04wkqhksj77hhghag47zkxbmdc1d1qf5z5vzy"; + version = "0.8.3"; + sha256 = "064x4d9vhzln1c8ka3saqdz6a8skn3xbhaxrf3rjwqgmjg4v3mk3"; buildDepends = [ array base blaze-builder bytestring containers deepseq directory - filepath mtl parsec pretty syb template-haskell text time void + filepath mtl old-locale parsec pretty syb template-haskell text + time void ]; - jailbreak = true; description = "StringTemplate implementation in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -6958,8 +6975,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.12.2.3"; - sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm"; + version = "0.12.2.4"; + sha256 = "0f538wqihj8i1ys3aciz7n1asxvg73bm9zg0p8qazzx9ghpcgy6m"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -7234,8 +7251,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.16.0.0"; - sha256 = "16b3aaaahsy153dfii2lc1672kkm6i9mch5hmyf9229b17hhh5pa"; + version = "3.16.1.0"; + sha256 = "0nnrfqgb0ndi1j3nrbj1alv4cq49prxsv3z5jk84qh6ny6hxm486"; buildDepends = [ base bytestring containers matrix parsec QuickCheck text transformers wl-pprint-extras @@ -8224,6 +8241,7 @@ self: { mkDerivation { pname = "Hsmtlib"; version = "2.8.8.8"; + revision = "1"; sha256 = "1zb5s5rwcqc90c3zv332k44p7l13ngp9nqci8qalnlbxbypx3hab"; editedCabalFile = "01f30561cce8648a656f075ba1e1f8c23144e7f10c6377a7949881dc513f8a89"; buildDepends = [ @@ -9324,6 +9342,7 @@ self: { mkDerivation { pname = "ListLike"; version = "4.1.1"; + revision = "1"; sha256 = "00xap58zfcwndjnmciff8d65pgb7j08pa9gmpk4cqi50vmphaf5i"; editedCabalFile = "390eff2095f519c59ac828108509047f29313ca894bc3355e6d79e943a035b50"; buildDepends = [ @@ -10510,8 +10529,8 @@ self: { }: mkDerivation { pname = "Nomyx"; - version = "0.7.5"; - sha256 = "1vnq19yh1sr39zch76fxangslx12zsv5w7p6nq48cbz8jix0ypxp"; + version = "0.7.6"; + sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -10535,8 +10554,8 @@ self: { }: mkDerivation { pname = "Nomyx-Core"; - version = "0.7.5"; - sha256 = "0kd8rl0i7d4kbhnsakiqk0zmz956f12hccmql8fgnnww4fmf36zs"; + version = "0.7.6"; + sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq"; buildDepends = [ acid-state aeson base blaze-html blaze-markup bytestring data-lens data-lens-fd data-lens-template DebugTraceHelpers deepseq directory @@ -10558,8 +10577,8 @@ self: { }: mkDerivation { pname = "Nomyx-Language"; - version = "0.7.5"; - sha256 = "11480ggfphwdyakhch1i8fr3cqhdmx32jg5nj5pc43sk3bpq2dwk"; + version = "0.7.6"; + sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9"; buildDepends = [ base Boolean containers data-lens data-lens-fd data-lens-template DebugTraceHelpers ghc mtl old-locale random safe time @@ -10598,8 +10617,8 @@ self: { }: mkDerivation { pname = "Nomyx-Web"; - version = "0.7.5"; - sha256 = "161b87ysa9fh40r1z9cp1mzyrs5ws3d97bsrnqwgcaz4rhnjzyvb"; + version = "0.7.6"; + sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7"; buildDepends = [ base blaze-html blaze-markup bytestring data-lens data-lens-fd fb filepath happstack-authenticate happstack-server hscolour mtl @@ -10916,12 +10935,14 @@ self: { }) {}; "OpenAL" = callPackage - ({ mkDerivation, base, openal, OpenGL }: + ({ mkDerivation, base, ObjectName, openal, OpenGL, StateVar + , transformers + }: mkDerivation { pname = "OpenAL"; - version = "1.6.0.1"; - sha256 = "0m29p6mm87lbx1507n9w4ara4l1xva8j42xjp0771ngx4sbphn2y"; - buildDepends = [ base OpenGL ]; + version = "1.7.0.0"; + sha256 = "111r78zx39nyfnpq2pmy440bi4ymr6i2difwfaislvmjq43plhjw"; + buildDepends = [ base ObjectName OpenGL StateVar transformers ]; extraLibraries = [ openal ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; @@ -10972,14 +10993,17 @@ self: { }) {}; "OpenGL" = callPackage - ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, OpenGLRaw - , text + ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, ObjectName + , OpenGLRaw, StateVar, text, transformers }: mkDerivation { pname = "OpenGL"; - version = "2.11.1.0"; - sha256 = "0fsk5jrap27rzv70q2257jwyrwr4g5qbv7kzi0fblydf7m1nq8hp"; - buildDepends = [ base bytestring GLURaw OpenGLRaw text ]; + version = "2.12.0.0"; + sha256 = "0f5s6b1mv3hm6xnansv0jsxahn8acc8nmr9754fx5b44bn1s6iqy"; + buildDepends = [ + base bytestring GLURaw ObjectName OpenGLRaw StateVar text + transformers + ]; extraLibraries = [ libX11 mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; @@ -11138,6 +11162,7 @@ self: { mkDerivation { pname = "PBKDF2"; version = "0.3.1.5"; + revision = "1"; sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62"; editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e"; buildDepends = [ base binary bytestring Crypto random ]; @@ -11875,6 +11900,7 @@ self: { mkDerivation { pname = "QuickCheck"; version = "1.2.0.1"; + revision = "2"; sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9"; buildDepends = [ base random ]; @@ -11922,8 +11948,8 @@ self: { ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { pname = "QuickCheck-GenT"; - version = "0.1.3"; - sha256 = "16zxmq0y8ayq9dgmgyfdm3fnjjhv452cymfam1zjmaabrayllkpp"; + version = "0.1.4"; + sha256 = "07zsp1praq0g6mcpfli9r1dwhfgj2cl5a2dljm6cdc8nsjl6dz7x"; buildDepends = [ base mtl QuickCheck random ]; jailbreak = true; homepage = "https://github.com/nikita-volkov/QuickCheck-GenT"; @@ -12908,6 +12934,7 @@ self: { mkDerivation { pname = "SafeSemaphore"; version = "0.10.1"; + revision = "1"; sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91"; editedCabalFile = "1b168ec8de4b3958df15b33ba9ab60d8a651d9dd4ea36891d4c31ae81e7ec1cc"; buildDepends = [ base containers stm ]; @@ -13399,6 +13426,7 @@ self: { mkDerivation { pname = "SpacePrivateers"; version = "0.1.0.0"; + revision = "1"; sha256 = "0gj709knv4lvz34900jigb1hiq35acbbl86iwa5yszibm8f0drkh"; editedCabalFile = "b59d607892ad860616cef196c83ff54388204102eae597acf88467a2f54764bf"; isLibrary = false; @@ -13988,6 +14016,7 @@ self: { mkDerivation { pname = "Thrift"; version = "0.6.0.1"; + revision = "1"; sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv"; editedCabalFile = "56a8ab041685777391702f1475e5c2a3462b36765bd53de2e21e1f55aa5999d9"; buildDepends = [ base binary bytestring ghc-prim HTTP network ]; @@ -14067,6 +14096,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Titim" = callPackage + ({ mkDerivation, base, containers, matrix, random }: + mkDerivation { + pname = "Titim"; + version = "0.2.3"; + sha256 = "1s8zvb38r9pxh55d5206lijprc6xsqnr0j670sdjrw7n8gyn7vav"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base containers matrix random ]; + description = "Game for Lounge Marmelade"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Top" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -14575,6 +14617,7 @@ self: { mkDerivation { pname = "ViennaRNAParser"; version = "1.0.1"; + revision = "2"; sha256 = "0j4vcbbw0f1khrqna33b1dfs4fadfk53arsj8ndjzcwp0za58ji0"; editedCabalFile = "312de9a09fbd46cd8785a4761d369ddd022b2589096b857cafa0b4ee610426e0"; buildDepends = [ base parsec ]; @@ -15053,6 +15096,7 @@ self: { mkDerivation { pname = "X11-extras"; version = "0.4"; + revision = "1"; sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a"; editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c"; buildDepends = [ base X11 ]; @@ -15198,6 +15242,7 @@ self: { mkDerivation { pname = "XSaiga"; version = "1.0.0.0"; + revision = "3"; sha256 = "0smf0ym26kv0fa34plnsndxp5hflc7w6g0wbkg6n4cy9bz4sgd4z"; editedCabalFile = "a152097b5010d51d0192d2c1748dce912a050f3f705f5a4b86ffa7a2f726488f"; isLibrary = true; @@ -15593,7 +15638,9 @@ self: { mkDerivation { pname = "abeson"; version = "0.1.0.1"; + revision = "1"; sha256 = "1g258gfk7sk8hsd4nixah0vj69rwphvv6aywsvdldm8pbw51sy1c"; + editedCabalFile = "fc1839c19327f8fb9b36d2aa6dd133e3d391696183b3292894f9f7e1ca188727"; buildDepends = [ aeson base base64-bytestring bson bytestring data-default-class scientific text time unordered-containers uuid vector @@ -15708,6 +15755,7 @@ self: { mkDerivation { pname = "accelerate"; version = "0.15.0.0"; + revision = "2"; sha256 = "1hi3zm1swm9fank9w98009pwcgccw6w2j2ilb970sbxyb0xf8nps"; editedCabalFile = "98cea47c7fdb595a54cb06751fe54eb800059e5a2b1f9699a65d4e845b55cd4c"; buildDepends = [ @@ -15768,6 +15816,7 @@ self: { mkDerivation { pname = "accelerate-cuda"; version = "0.15.0.0"; + revision = "2"; sha256 = "1z8nfciwxm2f2vaddnhan5gi9i1l7qa9h9fsngmdh8d6wabxxidy"; editedCabalFile = "5ed199c4c1d360ed3eaee24df7016462ed1fb1313ff47d6828be546eec8708fc"; buildDepends = [ @@ -15808,6 +15857,7 @@ self: { mkDerivation { pname = "accelerate-examples"; version = "0.15.0.0"; + revision = "1"; sha256 = "1jfwb0ryb8idfjc1gccb1h67hl730qn455k5z5wna8aikfscy7rq"; editedCabalFile = "2cf8a02096ae9902b9336ce9d0665b3233abb20381d0cb4585efc53357d795cc"; isLibrary = false; @@ -15825,6 +15875,7 @@ self: { mkDerivation { pname = "accelerate-fft"; version = "0.15.0.0"; + revision = "1"; sha256 = "0nxlw8z7bnr29vp24qbbwwmq9rj2q6jqqkmm46pp8dp582y4yk6v"; editedCabalFile = "c23b93ae20f528782aeb10b528fa2a7847cce5c1aa9db546f3b000d7f05f53ca"; buildDepends = [ accelerate accelerate-cuda base cuda cufft ]; @@ -15900,6 +15951,7 @@ self: { mkDerivation { pname = "accelerate-io"; version = "0.15.0.0"; + revision = "1"; sha256 = "00p8jmxsgywhx30nd44pl6hdcr076y2s6z2fsam6sgrmgr0qx936"; editedCabalFile = "5c3f8f7ebc03117652646329743ea251d281f72d81454e55538c27e87e8c0ecc"; buildDepends = [ @@ -16651,6 +16703,7 @@ self: { mkDerivation { pname = "aeson"; version = "0.7.0.6"; + revision = "1"; sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001"; buildDepends = [ @@ -17327,6 +17380,7 @@ self: { mkDerivation { pname = "algebra"; version = "4.2"; + revision = "1"; sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs"; editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210"; buildDepends = [ @@ -17807,19 +17861,18 @@ self: { ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, cryptohash, cryptohash-conduit, exceptions , http-conduit, lens, mmorph, monad-control, mtl, resourcet, retry - , text, time, transformers, transformers-base + , text, time, transformers, transformers-base, transformers-compat }: mkDerivation { pname = "amazonka"; - version = "0.3.2"; - sha256 = "1vyy8gsj31zxjnphzw1y3ylxdzxsgxx034a0s6i1g8vpqpf59n8a"; + version = "0.3.3.1"; + sha256 = "13lblmqpnd6anc6d6wv1xiqy0c2b8bnq9gh8df0xpbch756qfa4w"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph monad-control mtl resourcet retry text time transformers - transformers-base + transformers-base transformers-compat ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; @@ -17829,8 +17882,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.2"; - sha256 = "11rx798qdqqk67djrfaknw3z7z5gf2m0ahi0nh4icgfljv8hzcda"; + version = "0.3.3"; + sha256 = "1jn5phz20xki1zprszp8y0l3wlbdxs23iq7d8rvgdnlp4wx1q4vj"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -17842,8 +17895,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.2"; - sha256 = "0bbymf4cmlfp812nyk9y648hg8d2j57kf31g46w2a0rg4157rwqh"; + version = "0.3.3"; + sha256 = "1dbf6aabxss5fnbnwpldg5a87qda4vcrazmbnhhgil30pcgcjbld"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -17855,8 +17908,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.2"; - sha256 = "1lcl16j4wk19gf3i4jhh85jx4gx3lhacfd4yzrp54ycsgy689y7p"; + version = "0.3.3"; + sha256 = "16i1p7j70rxw4b5hmdjzjrk302zqyfgbgvc49dq0ag5hc4351b71"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -17868,8 +17921,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.2"; - sha256 = "0ss8raa4dvzz55x23kb7lrfgjkr0hrp7k6khbjpwp7ff2kk9yvwb"; + version = "0.3.3"; + sha256 = "0sp3z01jwm9jnalq8yy9vxvjwzwvqj0vzb7syms60ii3hclc30ka"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -17881,8 +17934,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.2"; - sha256 = "06as3a91061wy6wxd5ci37aisgghfm1w4k40id8b65yh8i0xwjd9"; + version = "0.3.3"; + sha256 = "0z1zvk37kds3wlhvd6036g63lvc37axnam9fv646s183xhfrmns8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -17894,8 +17947,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.2"; - sha256 = "1zyf8w88r5827i2l1x29kanqhmq8glgx01739g7hlya5hd30lv4y"; + version = "0.3.3"; + sha256 = "104qj5cc3ka8ixr1hh4asmfar31rd6k04w4g72c5xzy6l11vzp7j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -17907,8 +17960,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.2"; - sha256 = "1a3zj57nik0ffayq99y0pn8aqsvhdsi3fc4ynfkn9x0yxhgxx0kz"; + version = "0.3.3"; + sha256 = "00caawzj1jjbhxrd53hzqnw66a20r31gvlv19xps3jr49bhrjs15"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -17920,8 +17973,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.2"; - sha256 = "1l6rz3zvnsfym54bs2s1njrpf9rj1s7rdhli5d2yacj7kabb1hlz"; + version = "0.3.3"; + sha256 = "10044nfmdj1isf8wq0si5nn44c0ya16s1kir65c4g2cisarj0vr0"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -17932,8 +17985,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.2"; - sha256 = "1yr0xp1camsw7qapnp5w9jlrg8zy275n3izhl5i8z1wc5wln229d"; + version = "0.3.3"; + sha256 = "0fm8zwdsywhgxnpqi9s5jnasfknjiix15wmfx8in1d6kf52sgy5n"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -17945,8 +17998,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.2"; - sha256 = "038n7290q9a1hsk0k832q3a782x053jfmh1j6ydk8c245q807544"; + version = "0.3.3"; + sha256 = "1chbakfpiz5ix3z7hi50c25dc71s6dxkxap1b6z28fqyigd8ycn6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -17958,8 +18011,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.2"; - sha256 = "094j0m4kjijz6ihr7q4jklnb8gmyrqgk1bxw1z94xqb3s60fwy9c"; + version = "0.3.3"; + sha256 = "1kfnkh5x5s9smg5f82na4kkvc1ljadnc9041zk4nk4vsch41wg5j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -17971,8 +18024,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.2"; - sha256 = "1z9p672zwiihaj83wv1wpvqj70m9795pay44qps4as1xcb1skwc4"; + version = "0.3.3"; + sha256 = "138i4b53x82j9agdlbbq90al6397zns2732igadfa3yydy0m9w0v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -17984,8 +18037,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.2"; - sha256 = "0ha6adx6m27dmh6dxyha7kk344190hd151rp1lcihchhsnr283hk"; + version = "0.3.3"; + sha256 = "04gvg50przsxagrj7zvbidyf0xx3iqhh23sbzbpfl6ljczig9qmk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -17997,26 +18050,26 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, bytestring, case-insensitive , conduit, conduit-extra, cryptohash, data-default-class, hashable - , http-client, http-types, lens, mmorph, mtl, nats, resourcet - , scientific, semigroups, tagged, tasty, tasty-hunit - , template-haskell, text, time, transformers, unordered-containers - , vector, xml-conduit + , http-client, http-types, lens, mmorph, mtl, nats, old-locale + , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit + , template-haskell, text, time, transformers, transformers-compat + , unordered-containers, vector, xml-conduit }: mkDerivation { pname = "amazonka-core"; - version = "0.3.2"; - sha256 = "0byp43084jinc8pabplcmjr1spkx5gy666rwpl7xxmzcqlacdjzi"; + version = "0.3.3"; + sha256 = "1mglm6w0pmbhvvgzw5ylv0k97f9cx9nk8yq3akp499bn8nxf70i3"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra cryptohash data-default-class hashable http-client http-types lens - mmorph mtl nats resourcet scientific semigroups tagged text time - transformers unordered-containers vector xml-conduit + mmorph mtl nats old-locale resourcet scientific semigroups tagged + text time transformers transformers-compat unordered-containers + vector xml-conduit ]; testDepends = [ aeson base tasty tasty-hunit template-haskell text ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Core functionality and data types for Amazonka libraries"; license = "unknown"; @@ -18026,8 +18079,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.2"; - sha256 = "0hxgzdbv8fc0rl00afny3j1ka2fib98bamjphfdrjkb6ic37a2mx"; + version = "0.3.3"; + sha256 = "1r4k349yy7zi6jas9llxvig6jbqlq2b1nwgy1d40zr4hgjxx9zhk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -18039,8 +18092,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.2"; - sha256 = "1nby1qs901k8xc3ykpvi1097b92bcd5c9l3d0sx7dci6i4hnbqlf"; + version = "0.3.3"; + sha256 = "068b60p7gka5azfk181z4n6sdlz5mmnn88x1kcpj3ld290sq264i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -18052,8 +18105,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.2"; - sha256 = "08034a5nwcja147rkc0bsgmcj33xv1w6cvz7fpyi4jwip1ffngr9"; + version = "0.3.3"; + sha256 = "0hiksl517yc07dbkm72ms6rr07hwkr7g3390v8xqgv1bqg33cwls"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -18065,8 +18118,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.2"; - sha256 = "1x5xqlk0gh9ac2721j444nzz98q749mvkwhdgb476hi6lmc7g9gn"; + version = "0.3.3"; + sha256 = "18gsf2hwa3vii1g80rxw8b6j4cj513sglf6i4jpf6l96ncs1zavy"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -18078,8 +18131,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.2"; - sha256 = "02w1zxcs7sz5xgdpr3iq5yd1d3w15rkjnkcqyxhkbgwcv6w4c2zc"; + version = "0.3.3"; + sha256 = "0ssdhcdsjysxxzfa0r40jpf9s6x5gwds1lyr462zkai1nc63f8f3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18090,8 +18143,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.2"; - sha256 = "1a743l0hr7mb337xw3ql7mg4256w0w5c2vss12al9kzpnrgi2lh3"; + version = "0.3.3"; + sha256 = "19zdxmisp3bh2lfx0a7ivghpciwgdmbmj4iah2fgwxbc01p0srbm"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -18103,8 +18156,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.2"; - sha256 = "16g5v9y3y9wdxiw5cw3z8i4b67y1acvz74d1qdk7by1s2smb4dkf"; + version = "0.3.3"; + sha256 = "09awjlp1yay1arpw5yavz879v40hxsy5pij8ky4fnvwdclsxx0qs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -18116,8 +18169,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.2"; - sha256 = "1mymjy2dq4dz1r7yllgxdpbyddg7x7pvaarl395dffrapgqkh0n2"; + version = "0.3.3"; + sha256 = "06nq2zz2yc1wsgx8m9cb0filb9wfmcj4xh0ipk4jzlnhnl2izir2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -18129,8 +18182,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.2"; - sha256 = "0jxa9c8y9i1rffxfb2wrpb1fv6niplj2mwwc591k74c99ynjwj6i"; + version = "0.3.3"; + sha256 = "1rdzcxj6ccpqprmq6jdqyv1frmcwd8n21slx70bvqmls208nydf7"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18142,8 +18195,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.2"; - sha256 = "1n6q77riz31xqk5qywiqs75avwdni1d9x9955jgs8s1phk48654c"; + version = "0.3.3"; + sha256 = "1fpppmsg4bdabczcbhcar7kjxkv0c2j8nqjckfimj57bbxslxjdx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18155,8 +18208,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.2"; - sha256 = "1cphxr7a60z18zh543nva7v18zh05r4iircfbgifj98w33gvcvqd"; + version = "0.3.3"; + sha256 = "11dli63wj57yya7yzc8fh06yvcrqhpf9w2wzb08si30xkbzx3jw1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18167,8 +18220,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.2"; - sha256 = "1v869rmqbihn1314nd1ryqpgrwfxicnjh7i41zbn5hq60c4xkn4z"; + version = "0.3.3"; + sha256 = "0hpaj7d9lkfb589qr9nrvf3c7plqml9v1b7kgckx5x7abjva102h"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18180,8 +18233,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.2"; - sha256 = "03bzizq6mchxk79gqnp8v4avw4alyccd51ks3wl2ljgq0ywl41xs"; + version = "0.3.3"; + sha256 = "1fkgz9w3dkvmkyprvadbhwzc0928zib7k09dfvwdb6h1phhl9w6f"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18193,8 +18246,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.2"; - sha256 = "16gqc9d9s3fz2qs1l4b4wjylsyl2p7ncyfibadkp8an6bfdylx31"; + version = "0.3.3"; + sha256 = "08x1wyqf6kibvkrg4dcsz638x7fnl4z23nninvcmrcivfqcjy27a"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18206,8 +18259,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.2"; - sha256 = "10xjddl0mwpkcgz9ydy0lvmwpg3d3hb7kliqsqvfwlqgslhvhs18"; + version = "0.3.3"; + sha256 = "13hllhcvn2annqhq0dxcv1rvlhzj161xjhnz8vwazcsmpv2wb6pk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18218,8 +18271,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.2"; - sha256 = "0i4cy5x7br58lmzndx4x8mj81xkwx50nf1r8cszbjwjpml6fc2pz"; + version = "0.3.3"; + sha256 = "0a11riyrs6xx0207p4nkmxvc0y11ndrl6k3rgz2jdvv7g1j31fym"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18231,8 +18284,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.2"; - sha256 = "0xgj4r8zj0f2wmmpr63p3dlgfvgr5lmd43ngn5ignkmha6m6lcys"; + version = "0.3.3"; + sha256 = "03hk0s9l93vksifgy5bdb52mn2v38732c047bgmqfzf48iic2i48"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18244,8 +18297,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.2"; - sha256 = "0p73yn82pd0i1wi98vfy9kndf1ax0c3wza30nj6dra5xl4jnl73p"; + version = "0.3.3"; + sha256 = "1h291g4wx2v50whjn4c9h64gvv1j2pn6pyzs7l7765nm3rdmb7cr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18257,8 +18310,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.2"; - sha256 = "0w75vc1khlncfx82mcbpp41c8svjm7yy7si0p5rqi6cvx0an1k2v"; + version = "0.3.3"; + sha256 = "1wivm4ad6p8f5wip7d9cdwk557vy5dnakg62i5bsvi2l05wxh5zr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18270,8 +18323,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.2"; - sha256 = "0gsfgkcdprqanjfgcw4lj77b4fvhlq47h636kh87yvjg70migyrx"; + version = "0.3.3"; + sha256 = "0095idbqw6gs6h6pm0amzf6yhqr801pnlad914yac3xk80iywh9i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18283,8 +18336,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.2"; - sha256 = "0kzhn1mdk79a8vn0kj5jk5w0vfywh89bf5khjv08m3qwwdyb0mnw"; + version = "0.3.3"; + sha256 = "1np4x5lj9a8qgikiwbq2xchh2ngifmhd01lrbpzy44glda0gpxnc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -18296,8 +18349,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.2"; - sha256 = "0ws7dy9bnv7qx43mx6s1lkj4z1r3v7b0pph6kl3s5q60s1f9qr64"; + version = "0.3.3"; + sha256 = "0qhdxklj2ilsgmk0cy5bdiyvdgmi9npwxfjbb8ngbg9mavdcs0rh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -18309,8 +18362,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.2"; - sha256 = "1im0lzgxzxxpb6dmigp9vcwwk79bs9m9y3lhcjn7bcspql426c7a"; + version = "0.3.3"; + sha256 = "163aqpaxv2pfbfmz3mjw7dzcsjxjfiy36vqk2hsgavbmsgy7d4wq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -18322,8 +18375,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.2"; - sha256 = "0l9v7kagssnzg1f4w63q4dza5gyxlm3v6hrjcspdlaxw695vn7j8"; + version = "0.3.3"; + sha256 = "18qjpn29hyc9lqky6d0kwi3i4kanzvii45csw2fvjlmcchb1mfhs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -18335,8 +18388,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.2"; - sha256 = "1crlyx87j5iw7dvjngnrqqhkx24f0zd48l2cz37ldqymrsfn7kqb"; + version = "0.3.3"; + sha256 = "14321x8chggq5fc12z7v5z8aic4p0r3fb8lrk595nwqybnamqg19"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -18348,8 +18401,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.2"; - sha256 = "1mr2ra4857j4n4lpf5zlrqxmvf5adk6l0ycbwah4cypd3ki7b7l6"; + version = "0.3.3"; + sha256 = "030a0vx6py0m0gwplzjzkl3z7iq8n8s1f0knpw6da5xa8sy2na6v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -18361,8 +18414,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.2"; - sha256 = "0hb35i65j2zl6v1y3drd2kacg5ahvl14isx1f8b7a1k48l90qccn"; + version = "0.3.3"; + sha256 = "0sk8kbb06v52gq0jxhrz0dzdv4kfhn2g0f5kvcpa3vrpvca0jnyk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -18373,8 +18426,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.2"; - sha256 = "08c74hniznflx7xvlk41r2aym1h3xal68lbr2r0qlmh846pfyiqa"; + version = "0.3.3"; + sha256 = "1fzr4c81xqblag8gd3sj6nc029b2klblxall2wm29ggv8j70n48b"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -18386,8 +18439,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.2"; - sha256 = "0sq6ws9qyga1giiv2pkfgfaigni5k33mzq3k1psliwjxscxcjknw"; + version = "0.3.3"; + sha256 = "0lzpzvz1k00w1q5ahh76gvhhh7jyk3450ylhbrgjd8gw81k3klnj"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -18399,8 +18452,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.2"; - sha256 = "1j3vwpjmmlv3c4n4jrgj2vvvcirky1ja7grv5ax790i5p0ll0iw8"; + version = "0.3.3"; + sha256 = "05v8m84gvwdqyalvck8lfn7x525kkah6f87bwd0mrci9vqdi55hc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -18412,8 +18465,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.2"; - sha256 = "18yh9saqjfcn8cjprjqiybgkvxq6hc8q8b6njsh61s6ycdnh0yx8"; + version = "0.3.3"; + sha256 = "1lrxr7dlbkv7x7hcdvf0ly3d4aj0i4j94yksd2x3jp5w33811hjx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -18689,8 +18742,8 @@ self: { ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; - version = "0.6.7.1"; - sha256 = "1by11bg1bd7z18hqgayk0w76hy5n63kmdl14gainlvfgr9jw506r"; + version = "0.6.7.2"; + sha256 = "0x0pv7hq4q2n103pzzxghmgzmd3b5cwpnmkdbpzry222890w8ph1"; isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base ]; @@ -18995,8 +19048,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.2"; - sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal"; + version = "1.4.3"; + sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19009,7 +19062,6 @@ self: { base bytestring http-types HUnit mtl tasty tasty-hunit tasty-quickcheck wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; @@ -19024,7 +19076,9 @@ self: { mkDerivation { pname = "apiary-authenticate"; version = "1.4.0"; + revision = "1"; sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; + editedCabalFile = "724a8cbf0f2e57cd497b54de4401acda2877437053f13164dd23ba7b6c7d119b"; buildDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types @@ -19043,7 +19097,9 @@ self: { mkDerivation { pname = "apiary-clientsession"; version = "1.4.0"; + revision = "1"; sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; + editedCabalFile = "ac724d51a8bd867838bccb788a0db76f97cfe19b052d1247e38ba001561e4bfd"; buildDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -19060,7 +19116,9 @@ self: { mkDerivation { pname = "apiary-cookie"; version = "1.4.0"; + revision = "1"; sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; + editedCabalFile = "50b9adcb346e7233cb73eef7e7d00902a7b43454ab998f76923582bada569e32"; buildDepends = [ apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing @@ -19076,7 +19134,9 @@ self: { mkDerivation { pname = "apiary-eventsource"; version = "1.4.0"; + revision = "1"; sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; + editedCabalFile = "368e1b555b07ff026b4753cab0364d0f70a4e2536166f756bde35f8ce9fb9ae6"; buildDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -19091,7 +19151,9 @@ self: { mkDerivation { pname = "apiary-helics"; version = "1.4.0"; + revision = "1"; sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a"; + editedCabalFile = "80ce4b1a9dd5c7a30099392219d0077b9281b9ceeabbb01843f12754df0b0827"; buildDepends = [ apiary base bytestring data-default-class helics helics-wai monad-control text transformers types-compat vault wai @@ -19110,7 +19172,9 @@ self: { mkDerivation { pname = "apiary-logger"; version = "1.4.0"; + revision = "1"; sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; + editedCabalFile = "cb2677faabb41ccf7a4990179990f55c14d5bcd517591ccd086b84c68362c93c"; buildDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base @@ -19129,7 +19193,9 @@ self: { mkDerivation { pname = "apiary-memcached"; version = "1.4.0"; + revision = "1"; sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby"; + editedCabalFile = "7a332392add31b3f5ef9fcc2e69069de3a23bdbfdcfeececc47d2832ec767c29"; buildDepends = [ apiary base bytestring data-default-class memcached-binary monad-control text transformers types-compat @@ -19147,7 +19213,9 @@ self: { mkDerivation { pname = "apiary-mongoDB"; version = "1.4.0"; + revision = "1"; sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; + editedCabalFile = "e2578f19108129ed47946fa7369c86203610d5b447a6a7a8f1af5f2537d55a4b"; buildDepends = [ apiary base bson data-default-class lifted-base monad-control mongoDB resource-pool text time transformers types-compat @@ -19165,7 +19233,9 @@ self: { mkDerivation { pname = "apiary-persistent"; version = "1.4.0"; + revision = "1"; sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; + editedCabalFile = "23a9ba31cd7fab41378b61a82e5ad92d04b6f3a32e32edca3217f5f824c13736"; buildDepends = [ apiary apiary-logger base monad-control monad-logger persistent resource-pool resourcet transformers transformers-base types-compat @@ -19184,7 +19254,9 @@ self: { mkDerivation { pname = "apiary-purescript"; version = "1.4.0"; + revision = "1"; sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz"; + editedCabalFile = "9f716a5d9173c31c6472a4bf7decc34523bdc761540d440f5d0ad4f9521bf98c"; buildDepends = [ apiary base bytestring data-default-class filepath Glob parsec purescript text transformers types-compat unordered-containers @@ -19199,7 +19271,9 @@ self: { mkDerivation { pname = "apiary-session"; version = "1.4.0"; + revision = "1"; sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; + editedCabalFile = "8e4a0b590972ea4e1ab1252696b7339038c4d7206ae44d1f1397a67cdde077dd"; buildDepends = [ apiary base types-compat wai web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; @@ -19213,7 +19287,9 @@ self: { mkDerivation { pname = "apiary-websockets"; version = "1.4.0"; + revision = "1"; sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; + editedCabalFile = "5162825445fc14b48d11a0a1f63d67e8d66a8c5aaeaf1e117a1f2302474d7581"; buildDepends = [ apiary base wai-websockets web-routing websockets ]; @@ -19733,6 +19809,7 @@ self: { mkDerivation { pname = "arithmoi"; version = "0.4.1.1"; + revision = "2"; sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; buildDepends = [ @@ -19917,6 +19994,7 @@ self: { mkDerivation { pname = "arxiv"; version = "0.0.1"; + revision = "1"; sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh"; editedCabalFile = "746311e6003440248df63acd19e428cbdbf5c95cdd3ee0993d2c89c7b2ceada7"; buildDepends = [ base parsec split tagsoup ]; @@ -19960,8 +20038,8 @@ self: { }: mkDerivation { pname = "ascii-progress"; - version = "0.2.1.1"; - sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck"; + version = "0.2.1.2"; + sha256 = "0lnxph4zdhkhp2w4rvx85xdwy8lnnm81apvkrddbwfr405j4nf1w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19973,7 +20051,7 @@ self: { ]; homepage = "https://github.com/yamadapc/haskell-ascii-progress"; description = "A simple progress bar for the console"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.mit; }) {}; "ascii-vector-avc" = callPackage @@ -20068,6 +20146,7 @@ self: { mkDerivation { pname = "asn1-data"; version = "0.7.1"; + revision = "1"; sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r"; editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f"; isLibrary = true; @@ -20326,8 +20405,8 @@ self: { }: mkDerivation { pname = "async-pool"; - version = "0.8.0"; - sha256 = "13c3b8ggry476hp83bq0450j5y9990flq62jj6mjpjapyn1w283z"; + version = "0.9.0"; + sha256 = "10952y60ivkx78skf7ds0dv8gp6bf3v47lays928vnpb8m5cr0rh"; buildDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -20504,6 +20583,7 @@ self: { mkDerivation { pname = "atomic-primops"; version = "0.7"; + revision = "1"; sha256 = "1gd2m7qnyww3dv5vcajh9j5chcwlkfsqgpi299q2x4n9xrp0d50g"; editedCabalFile = "99594a0f7b2fd268f7f68e460218c22bda9da07c559fb5ead6d3c508f01d9cff"; buildDepends = [ base ghc-prim primitive ]; @@ -20545,17 +20625,17 @@ self: { "atomic-write" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , temporary, text, unix + , temporary, text, unix-compat }: mkDerivation { pname = "atomic-write"; - version = "0.2.0.0"; - sha256 = "0kga6zwgpsz3zc3yq12a815ywwyqd18czzmi8ra7vrgfn5l2bcb0"; + version = "0.2.0.3"; + sha256 = "0hs157shwaqhqbd063wmfb8amkf2kppg7k4j0lhfflq1gzjbsprm"; buildDepends = [ - base bytestring directory filepath temporary text unix + base bytestring directory filepath temporary text unix-compat ]; testDepends = [ - base bytestring directory filepath hspec temporary text unix + base bytestring directory filepath hspec temporary text unix-compat ]; description = "Atomically write to a file"; license = stdenv.lib.licenses.mit; @@ -20798,6 +20878,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "audiovisual" = callPackage + ({ mkDerivation, base, boundingboxes, colors, deepseq, directory + , filepath, free, freetype2, hashable, JuicyPixels + , JuicyPixels-util, lens, linear, mtl, objective, random + , template-haskell, transformers, vector, void, WAVE + }: + mkDerivation { + pname = "audiovisual"; + version = "0.0"; + sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h"; + buildDepends = [ + base boundingboxes colors deepseq directory filepath free freetype2 + hashable JuicyPixels JuicyPixels-util lens linear mtl objective + random template-haskell transformers vector void WAVE + ]; + homepage = "https://github.com/fumieval/audiovisual"; + description = "A battery-included audiovisual framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "augeas" = callPackage ({ mkDerivation, augeas, base, bytestring, directory, HUnit, unix }: @@ -20906,8 +21006,8 @@ self: { }: mkDerivation { pname = "authenticate-oauth"; - version = "1.5.1"; - sha256 = "1swqrqz3idc6zghwsx3yd1rpphgi74r5yp31rkvcik6dwzrgdn1f"; + version = "1.5.1.1"; + sha256 = "02y35yd4zmpy36yba2nzbvijhfw0wvijkiqmh7h9qjpbqvmib7zb"; buildDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -20952,15 +21052,15 @@ self: { "auto" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , profunctors, random, semigroups, transformers + , MonadRandom, profunctors, random, semigroups, transformers }: mkDerivation { pname = "auto"; - version = "0.2.0.4"; - sha256 = "1a2sz8snlxc7jgqs33vgczi1k4m4ssixq5xxgzclv0sz050cigh9"; + version = "0.2.0.6"; + sha256 = "1k0nzhkn32jypf1yqjqadmqwq9ckyax23lmvwzz110fx657j1nhi"; buildDepends = [ - base bytestring cereal containers deepseq profunctors random - semigroups transformers + base bytestring cereal containers deepseq MonadRandom profunctors + random semigroups transformers ]; jailbreak = true; homepage = "https://github.com/mstksg/auto"; @@ -21053,6 +21153,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avers" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, containers, cryptohash, inflections, influxdb + , MonadRandom, mtl, network, resource-pool, rethinkdb-client-driver + , scrypt, stm, template-haskell, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "avers"; + version = "0.0.2"; + sha256 = "1wbsxr15jqq6fn158qglpzhx98ybgba8xxahlqjmi845iq3qys63"; + buildDepends = [ + aeson attoparsec base base16-bytestring bytestring containers + cryptohash inflections influxdb MonadRandom mtl network + resource-pool rethinkdb-client-driver scrypt stm template-haskell + text time unordered-containers vector + ]; + description = "empty"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "avl-static" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -21137,8 +21258,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.11.2"; - sha256 = "15qn5fwaqzf6mqs6bahcddqhnhgbjbprw321yf2g68qq2h6dzqzi"; + version = "0.11.3"; + sha256 = "02p3dn380qj8wg6alm7yqw4svwwkw9ln9rjd6shbk4jz8gsaka8l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21259,8 +21380,8 @@ self: { }: mkDerivation { pname = "aws-general"; - version = "0.2.0"; - sha256 = "1cizkj7f8l57g95drhgnaylv0yzp7mblwh92z2syfqfkvg5m5fwa"; + version = "0.2.1"; + sha256 = "11wfg657za7mbr7fkgwhv4nag2m6j245rj3rldy2fj4s0vhpi6l3"; buildDepends = [ aeson attoparsec base base16-bytestring blaze-builder byteable bytestring case-insensitive cryptohash hashable http-types @@ -21286,8 +21407,8 @@ self: { }: mkDerivation { pname = "aws-kinesis"; - version = "0.1.3"; - sha256 = "0ka5hqrin7hhr1vavl1ky35gnhil2r6ajbxdl11dbdnhm11sllvq"; + version = "0.1.4"; + sha256 = "0k0p7ivs6z6zqm45yjhlwcmrhqz83a66fi2f6i6p1a5r7c107dji"; buildDepends = [ aeson aws aws-general base base64-bytestring blaze-builder bytestring conduit conduit-extra http-conduit http-types parsers @@ -21313,8 +21434,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.3.0.1"; - sha256 = "020vv9aaqfxpgrpviy0y6i0448rypr7rg5cvzbmn46n96jyww12w"; + version = "0.3.0.2"; + sha256 = "0p1544yq9cs9qz9za2gcsdvd8wkq66sa0kzzv3i2c6xjbqy0wpgr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21651,8 +21772,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.4.0"; - sha256 = "0cwx7irpzbl1g3wi4fcdjrkv2968517gljyvc9w8vm6f81wr2xcb"; + version = "0.4.1"; + sha256 = "1zylnxh6r6sbk6fyx3b5hh6msajrrr07nsb4hwqlh07n1zzavw7j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22025,7 +22146,9 @@ self: { mkDerivation { pname = "barrier"; version = "0.1.0"; + revision = "1"; sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z"; + editedCabalFile = "2f75bd296d54424250895888d24eaec14bbdb35b355306306b6f8632052473bc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22243,6 +22366,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basic-lens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "basic-lens"; + version = "0.0.0"; + revision = "1"; + sha256 = "0qgd2066vgsrzglcmw1jd7lcrpxvrzch7bnyyfxzddwxj148mvnj"; + editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170"; + buildDepends = [ base ]; + description = "Basic lens type and functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basic-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, hashable , lifted-base, ReadArgs, safe, system-filepath, text, transformers @@ -23453,6 +23589,7 @@ self: { mkDerivation { pname = "bindings-codec2"; version = "0.1.1.0"; + revision = "1"; sha256 = "0mpb79djfqi0had6rx20jsgahdfv23bnp0i25lbxv8vg72m3wdnn"; editedCabalFile = "48e69a5b497247c96ab7a6ed3ff818bef596c712249819e63a84c4667ef5d0b1"; isLibrary = true; @@ -23613,6 +23750,7 @@ self: { mkDerivation { pname = "bindings-hamlib"; version = "0.1.0.0"; + revision = "1"; sha256 = "1na9v5s5lqdnnj031zmqg3xfpsvy80gzr7qg0f3gsyyniww72xlz"; editedCabalFile = "1eea9735be1dd9f54d91406fbf56da41b8d68a3760ada5e4fc4caf0658c997c9"; isLibrary = true; @@ -24220,18 +24358,17 @@ self: { }) {}; "bit-vector" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-quickcheck2, vector + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck + , tasty-th, vector }: mkDerivation { pname = "bit-vector"; - version = "0.1.0"; - sha256 = "1z2gk5wbl865p893hz77jkg7lyl6698va5r33fi7w1vv8656s14n"; + version = "0.2.0"; + sha256 = "1h3hm1akbj2qzl3df877hfgz3fanhvrj6czxvjbpcalpf3d6h5z1"; buildDepends = [ base vector ]; testDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 vector + base QuickCheck tasty tasty-quickcheck tasty-th vector ]; - jailbreak = true; homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24819,15 +24956,14 @@ self: { }: mkDerivation { pname = "blaze-html"; - version = "0.8.0.0"; - sha256 = "05afa3g9fbr0hnw8x794d7s8vzr0il9lkc2w67ks7hli78wl1y5b"; + version = "0.8.0.2"; + sha256 = "1h3z857kqj9h87zyi84pck2rnykfk7i4amlh0vkv5wws5zn9xs74"; buildDepends = [ base blaze-builder blaze-markup bytestring text ]; testDepends = [ base blaze-builder blaze-markup bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24887,14 +25023,13 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.7.0.0"; - sha256 = "0ifjf6n7hzcc11g3lhwdmzxs2qa3va7snn5m7i948gbffpkkr3pp"; + version = "0.7.0.2"; + sha256 = "0p3jsl7ng3fapvbp431cm1bckdwjgc1kmijyvxlgxn1l90l8l1p4"; buildDepends = [ base blaze-builder bytestring text ]; testDepends = [ base blaze-builder bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25138,19 +25273,22 @@ self: { }) {}; "blunt" = callPackage - ({ mkDerivation, array, base, bytestring, containers - , haskell-src-exts, http-types, transformers, wai, warp + ({ mkDerivation, aeson, array, base, bytestring, clay, containers + , haskell-src-exts, http-types, jmacro, lucid, pointful, text + , transformers, wai, warp, wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.7"; - sha256 = "01hm0349qzam2ygsdhcg55kgzh6gk22m6hrjb6lk5gqsn6xsdf4w"; + version = "0.0.13"; + sha256 = "1mawchdfywhs7gqfy1p91drfc4l31c2m2v8nkma5bg9i5zb81kyr"; isLibrary = true; isExecutable = true; buildDepends = [ - array base bytestring containers haskell-src-exts http-types - transformers wai warp + aeson array base bytestring clay containers haskell-src-exts + http-types jmacro lucid pointful text transformers wai warp + wl-pprint-text ]; + homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; license = stdenv.lib.licenses.mit; }) {}; @@ -25331,6 +25469,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "borel" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bimap, cassava + , ceilometer-common, chevalier-common, configurator, containers + , either, errors, hslogger, hspec, lens, lens-properties, marquise + , mtl, multiset, network, network-uri, pipes, pipes-concurrency + , pipes-safe, QuickCheck, text, time, transformers + , unordered-containers, vaultaire-common, vector, zeromq4-haskell + }: + mkDerivation { + pname = "borel"; + version = "0.18.0"; + sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453"; + buildDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers errors hslogger lens + marquise mtl multiset network network-uri pipes pipes-concurrency + pipes-safe text time transformers unordered-containers + vaultaire-common vector zeromq4-haskell + ]; + testDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers either errors hslogger + hspec lens lens-properties marquise mtl multiset network + network-uri pipes pipes-concurrency pipes-safe QuickCheck text time + transformers unordered-containers vaultaire-common vector + zeromq4-haskell + ]; + homepage = "https://github.com/anchor/borel-core"; + description = "Metering System for OpenStack metrics provided by Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bot" = callPackage ({ mkDerivation, arrows, base, Stream }: mkDerivation { @@ -25945,8 +26115,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.4.7"; - sha256 = "1fc8y2incvci9ib9gkbr03shjj8fwxsb5q34phwycmqiaq3j5c88"; + version = "0.4.8"; + sha256 = "0ra4hvym5f4w8hy7p11apb5n0pdsq5iv56wab513dhb75562ipcq"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -25958,7 +26128,7 @@ self: { hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework test-framework-hunit text ]; - description = "Draw pretty sequence diagrams of D-Bus traffic"; + description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -26035,6 +26205,7 @@ self: { mkDerivation { pname = "bytes"; version = "0.15"; + revision = "1"; sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6"; editedCabalFile = "94dc3ad697fbfd70c7cf77a2e0c9bf4307a0f396012738537b931fc3b4e58386"; buildDepends = [ @@ -26047,16 +26218,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_4_1" = callPackage + "bytestring_0_10_6_0" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "bytestring"; - version = "0.10.4.1"; - sha256 = "1zldh1pifmyrn7m3di6xz9kw9jfm0syr2fpqh1lwfics9il4cjdg"; - editedCabalFile = "4f35a46a32774b82712c560de811bf76ef4e9a8302fe67f2e00129c4b5eface3"; + version = "0.10.6.0"; + sha256 = "0xw924djdbs15r4dh2zyn209b0ji94si4ywliagjbg41gdmrl6r7"; buildDepends = [ base deepseq ghc-prim integer-gmp ]; testDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -26098,6 +26268,7 @@ self: { mkDerivation { pname = "bytestring-class"; version = "0.0.0.1"; + revision = "1"; sha256 = "1z65br00rplhniaw9fg3phpxwf13acgycn5hnhyjfcyr962xp03x"; editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417"; buildDepends = [ base bytestring utf8-string ]; @@ -26254,8 +26425,8 @@ self: { }: mkDerivation { pname = "bytestring-read"; - version = "0.2.0"; - sha256 = "08622w2n7aphnv5wyisd5bz7r4nbyb1f86f4g1yia0r3x687sp5a"; + version = "0.2.1"; + sha256 = "1g0i5ibk399kjdw8vmmv33bjw74z941hnj33fp0ch2by7z9fhgnn"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; homepage = "https://github.com/philopon/bytestring-read"; @@ -26278,6 +26449,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bytestring-short" = callPackage + ({ mkDerivation, base, bytestring, deepseq, QuickCheck }: + mkDerivation { + pname = "bytestring-short"; + version = "0.0.1.0"; + sha256 = "034c63hw49sy4mg6xarf61d4f3shafj66v4sqky04sin460s28wv"; + buildDepends = [ base bytestring deepseq ]; + testDepends = [ base bytestring QuickCheck ]; + jailbreak = true; + description = "Backport copy of ShortByteString"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring-show" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , integer-gmp @@ -26644,8 +26828,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.24.3"; - sha256 = "0vhsdnjhrh2i78ncn7jmqszr0zha1ib1ja2xxsamgnz0zps0aiwx"; + version = "4.24.6"; + sha256 = "0v7l8pnh8gqcxbqy02635il0di21i82g8p97lydkfvjsj4c1w8sv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26716,6 +26900,7 @@ self: { mkDerivation { pname = "cabal-file-th"; version = "0.2.3"; + revision = "1"; sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8"; editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e"; buildDepends = [ base Cabal directory template-haskell ]; @@ -26785,9 +26970,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.22.0.1"; - sha256 = "1j0h1m963kimkk07aag57bgalscly0mhcwgzm7zzxymzsbssibw7"; - editedCabalFile = "85c5296e1b0aff3717c9ce62e98a8b9b6d5509e55f76cd80ae7179269c46592c"; + version = "1.22.2.0"; + sha256 = "1nvamsklmxc77mivi02li5rijiliajl4x620pwchzgb0iyl2xg15"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -27619,24 +27803,25 @@ self: { }) {}; "call" = callPackage - ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors - , containers, control-bool, deepseq, directory, filepath, free - , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens - , linear, mtl, objective, OpenGL, OpenGLRaw, random - , template-haskell, text, transformers, vector, WAVE + ({ mkDerivation, audiovisual, base, bindings-portaudio + , boundingboxes, colors, containers, control-bool, deepseq + , directory, filepath, free, freetype2, GLFW-b, hashable + , JuicyPixels, JuicyPixels-util, lens, linear, mtl, objective + , OpenGL, OpenGLRaw, random, reflection, template-haskell, text + , transformers, vector, WAVE }: mkDerivation { pname = "call"; - version = "0.1.4.2"; - sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g"; + version = "0.2"; + sha256 = "1hbzrhhx0cjgpxiq3200n38pl2m2y727zfmgfdfs45l1hqbvrldp"; isLibrary = true; isExecutable = true; buildDepends = [ - base bindings-portaudio boundingboxes colors containers + audiovisual base bindings-portaudio boundingboxes colors containers control-bool deepseq directory filepath free freetype2 GLFW-b hashable JuicyPixels JuicyPixels-util lens linear mtl objective - OpenGL OpenGLRaw random template-haskell text transformers vector - WAVE + OpenGL OpenGLRaw random reflection template-haskell text + transformers vector WAVE ]; jailbreak = true; homepage = "https://github.com/fumieval/call"; @@ -27856,18 +28041,18 @@ self: { "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck - , quickpull, random, time, transformers + , random, tasty, tasty-quickcheck, tasty-th, time, transformers }: mkDerivation { pname = "cartel"; - version = "0.14.2.2"; - sha256 = "0ikf0jhiaqagd4ycq9szs4vy7yq7ai31yzcj8f0a6i3j6j4cr8nx"; + version = "0.14.2.4"; + sha256 = "14xsvy0s4bz8lfbiwys90iz3bvcd5f6np2pspz3p6camzfl2xdyp"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath time transformers ]; testDepends = [ - base directory filepath multiarg QuickCheck quickpull random time - transformers + base directory filepath multiarg QuickCheck random tasty + tasty-quickcheck tasty-th time transformers ]; homepage = "http://www.github.com/massysett/cartel"; description = "Specify Cabal files in Haskell"; @@ -27881,8 +28066,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.8"; - sha256 = "131r3l1psacb3mps02mqc4vjdghn2w5jwz2j6khr7w6bk13qlpj0"; + version = "2.3.0.0"; + sha256 = "0znzn73c6cc7jyj460djlhzydkw9jqxhjm62kiz5pv2j7bvpv7aw"; buildDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear vector vector-binary-instances @@ -27916,8 +28101,8 @@ self: { ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }: mkDerivation { pname = "casadi-bindings-core"; - version = "2.2.0.2"; - sha256 = "1cpz8jzmcn5zx7bqm8920yrydhispgca8kijsq1zk5xnjasm5kva"; + version = "2.3.0.0"; + sha256 = "1n892agqknwjs2paszafp6b1xgiz8zfmlxqb2wm0d99487175lcv"; buildDepends = [ base casadi-bindings-internal vector ]; pkgconfigDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; @@ -27929,8 +28114,8 @@ self: { ({ mkDerivation, base, casadi, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.2.1"; - sha256 = "0sh7j11pgrnmvcrdvvvvld2k0kbvccmh67rmbravshgx95nx7dli"; + version = "0.1.3.0"; + sha256 = "1kazy8xppydbl6gkdn1y1gv2lz38sif6i92crkxb476xz0fvmf00"; buildDepends = [ base vector ]; pkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; @@ -28233,6 +28418,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "catamorphism" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "catamorphism"; + version = "0.3.0.0"; + sha256 = "1bjvnac5kyc70czx8vdld8whkgnygqz3i5yhfl315mall1xw7h1w"; + buildDepends = [ base template-haskell ]; + homepage = "http://github.com/frerich/catamorphism"; + description = "A package exposing a helper function for generating catamorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "catch-fd" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -28316,8 +28513,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.1.1.0"; - sha256 = "0avwd6mgn3g1avrwb85v4vp598x00v4566iqsxgp857cbrrh5096"; + version = "0.1.2.0"; + sha256 = "14ly2sfdk3gjxv2s4r9pfvaq4fdpz4xir4zglpjnqsik4bhwbk69"; buildDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -28325,7 +28522,7 @@ self: { ]; jailbreak = true; homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "An Haskell client for Cayley graph database"; + description = "A Haskell client for Cayley graph database"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28428,8 +28625,8 @@ self: { }: mkDerivation { pname = "ceilometer-common"; - version = "0.2.2"; - sha256 = "01lvjyl884i6qcfxr7xj42g5spn1fx3jgcq1g8zv0b5y9jwpj7lr"; + version = "0.2.3"; + sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps"; buildDepends = [ base bimap binary bytestring containers foldl lens pipes siphash template-haskell text vaultaire-common @@ -28440,7 +28637,7 @@ self: { text transformers vaultaire-common ]; homepage = "https://github.com/anchor/ceilometer-common"; - description = "Common Haskell types and encoding for ceilometer"; + description = "Common Haskell types and encoding for OpenStack Ceilometer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28600,6 +28797,7 @@ self: { mkDerivation { pname = "cf"; version = "0.1"; + revision = "1"; sha256 = "0wwq78b6d6hxaivyxw8rc9dsb0kq4aw0mkp8w0xmnfmz8biymlmg"; editedCabalFile = "6bd39af35810e6a40142d87fdd9fc91754fe85098a63a8087626bf9916bd3362"; buildDepends = [ base ]; @@ -28721,6 +28919,7 @@ self: { mkDerivation { pname = "cgi-utils"; version = "0.2.1"; + revision = "1"; sha256 = "0msljq31bz40hsrhhq9qhxrgmdlqq32l3ykcy4wviv8kmc3dic7p"; editedCabalFile = "df1cb1e658d9b79adde373fc31a1d7553a4803f8967c760abf233e75913ddd52"; buildDepends = [ base cgi containers mtl random ]; @@ -29094,8 +29293,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { pname = "checkers"; - version = "0.4.1"; - sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr"; + version = "0.4.2"; + sha256 = "0v2qvd0g0k2j3h07003wc2vkrknq6y3ld1qgh69j4r6049x9qhaj"; buildDepends = [ array base QuickCheck random ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; @@ -29154,6 +29353,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chevalier-common" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, cereal, locators + , mtl, network, network-uri, protobuf, text, unordered-containers + , vaultaire-common, zeromq4-haskell + }: + mkDerivation { + pname = "chevalier-common"; + version = "0.6.0"; + sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs"; + buildDepends = [ + base bifunctors bytestring cereal locators mtl network network-uri + protobuf text unordered-containers vaultaire-common zeromq4-haskell + ]; + description = "Query interface for Chevalier"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chp" = callPackage ({ mkDerivation, base, containers, deepseq, extensible-exceptions , pretty, stm @@ -29661,7 +29877,9 @@ self: { mkDerivation { pname = "clafer"; version = "0.3.9"; + revision = "1"; sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr"; + editedCabalFile = "7a77fc544dc4aab21ecf747c8d95acd0d94cf9d001824862f859682eca953d22"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29674,6 +29892,7 @@ self: { base containers data-stringmap directory filepath ghc HaXml HUnit lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th ]; + jailbreak = true; homepage = "http://clafer.org"; description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -29812,8 +30031,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.7"; - sha256 = "0mp8wly3h0kjkn3c6wq7v6sl79s9fmdmil70dj2xgmf82i02a9fr"; + version = "0.7.1"; + sha256 = "1hy1bx83faf0n3irp0g2136bmd9gvpd638ap8ifys6gdni25k3zv"; buildDepends = [ base data-default ghc-prim integer-gmp singletons template-haskell th-lift @@ -30211,6 +30430,7 @@ self: { mkDerivation { pname = "cld2"; version = "0.1.0.1"; + revision = "1"; sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd"; editedCabalFile = "60506ceb359329f803a733a06f9a6060a31cab7e86dd4a8e3fd843953cb4cfbd"; buildDepends = [ base bytestring text ]; @@ -30419,6 +30639,7 @@ self: { mkDerivation { pname = "clock"; version = "0.4.1.3"; + revision = "1"; sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d"; editedCabalFile = "653fd69fcb84f23fb93241604f83f686921593f7ded7c3bf61ce7cecf1f00440"; buildDepends = [ base ]; @@ -30614,8 +30835,8 @@ self: { }: mkDerivation { pname = "clustering"; - version = "0.1.1"; - sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + version = "0.1.2"; + sha256 = "0idmh6k6j4dmnaf8zsvw30lkwsgk5hqvp4hlzfd4j6d9ah2pwmfp"; buildDepends = [ base binary containers matrices mwc-random primitive vector ]; @@ -30729,6 +30950,7 @@ self: { mkDerivation { pname = "cmdargs"; version = "0.10.12"; + revision = "1"; sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy"; editedCabalFile = "e37c92e6337ccbacd95f77938a1d0459f52cdb1a51c920a96610793cf2b5e4dc"; isLibrary = true; @@ -30958,6 +31180,7 @@ self: { mkDerivation { pname = "codepad"; version = "0.1"; + revision = "1"; sha256 = "03jvbbv4cgrmk0ihz34shd1ydv5jhl1h1xiwqrln60622jlh8mr1"; editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a"; buildDepends = [ base curl mtl network tagsoup ]; @@ -31593,6 +31816,7 @@ self: { mkDerivation { pname = "compdata-automata"; version = "0.9"; + revision = "1"; sha256 = "1hlv6a4ywlnr86pzrlffqbg55mfkrkkxn2yir6a28bdirgi69fkf"; editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130"; buildDepends = [ base compdata containers projection ]; @@ -31608,6 +31832,7 @@ self: { mkDerivation { pname = "compdata-dags"; version = "0.1"; + revision = "1"; sha256 = "1ijr3lpl0g5l5xynnwwzj4rflgfgw1y2b4ldabbw5qlk4qa0gr5j"; editedCabalFile = "556bbb62f4b8b6d738a20775066342b4d911fed945729da5aea072fd5df65044"; buildDepends = [ @@ -31784,6 +32009,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compstrat" = callPackage + ({ mkDerivation, base, compdata, mtl, template-haskell + , th-expand-syns, transformers + }: + mkDerivation { + pname = "compstrat"; + version = "0.1.0.2"; + sha256 = "1jdxvyqkszwkry3vly65nh80519cpfw4ghzg1lsbnhyrbhvlchkg"; + buildDepends = [ + base compdata mtl template-haskell th-expand-syns transformers + ]; + description = "Strategy combinators for compositional data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "comptrans" = callPackage + ({ mkDerivation, base, compdata, containers, deepseq + , deepseq-generics, ghc-prim, lens, template-haskell + , th-expand-syns + }: + mkDerivation { + pname = "comptrans"; + version = "0.1.0.4"; + sha256 = "01yv0j405ninkvmfx7r4cwzvxdhcdivncds46086s1v0qmp2zag0"; + buildDepends = [ + base compdata containers deepseq deepseq-generics ghc-prim lens + template-haskell th-expand-syns + ]; + homepage = "https://github.com/jkoppel/comptrans"; + description = "Automatically converting ASTs into compositional data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "computational-algebra" = callPackage ({ mkDerivation, algebra, base, containers, equational-reasoning , heaps, lens, monad-loops, monomorphic, peggy, singletons @@ -32035,8 +32293,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, hashable }: mkDerivation { pname = "concurrent-supply"; - version = "0.1.7"; - sha256 = "0crg4rm5wibw9h6lmsi43d280xg1xr9xbgqr9s4inxq7x0yyn68c"; + version = "0.1.7.1"; + sha256 = "050d1k4hvjjyap3w8spcx57lagnh77z131jbgsndpc9mjx8r4l5y"; buildDepends = [ base ghc-prim hashable ]; testDepends = [ base containers ]; homepage = "http://github.com/ekmett/concurrent-supply/"; @@ -32180,6 +32438,69 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-audio" = callPackage + ({ mkDerivation, base, conduit, vector }: + mkDerivation { + pname = "conduit-audio"; + version = "0.1"; + sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb"; + buildDepends = [ base conduit vector ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "Combinators to efficiently slice and dice audio streams"; + license = "LGPL"; + }) {}; + + "conduit-audio-lame" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-audio, mp3lame + , resourcet, transformers, vector + }: + mkDerivation { + pname = "conduit-audio-lame"; + version = "0.1"; + sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w"; + buildDepends = [ + base bytestring conduit conduit-audio resourcet transformers vector + ]; + extraLibraries = [ mp3lame ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the LAME MP3 library"; + license = "LGPL"; + }) { mp3lame = null;}; + + "conduit-audio-samplerate" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, resourcet + , samplerate, transformers, vector + }: + mkDerivation { + pname = "conduit-audio-samplerate"; + version = "0.1"; + sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg"; + buildDepends = [ + base conduit conduit-audio resourcet transformers vector + ]; + extraLibraries = [ samplerate ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the libsamplerate resampling library"; + license = "LGPL"; + }) { samplerate = null;}; + + "conduit-audio-sndfile" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, hsndfile + , hsndfile-vector, resourcet, transformers + }: + mkDerivation { + pname = "conduit-audio-sndfile"; + version = "0.1"; + sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd"; + buildDepends = [ + base conduit conduit-audio hsndfile hsndfile-vector resourcet + transformers + ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the libsndfile audio file library"; + license = "LGPL"; + }) {}; + "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers @@ -32334,27 +32655,26 @@ self: { "configifier" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, containers, hspec, hspec-discover, mtl + , case-insensitive, containers, either, hspec, hspec-discover, mtl , pretty-show, QuickCheck, regex-easy, safe, scientific , string-conversions, text, unordered-containers, vector, yaml }: mkDerivation { pname = "configifier"; - version = "0.0.2"; - sha256 = "0k7gbkj9cz4rgicnllfh99i3d53qqwddysns0q3xwvvgv50ps8h3"; + version = "0.0.3"; + sha256 = "0l86i7rjbqrppfyfc3ypkal3q0rv8ldxp39hii076dwk7kgvjy1z"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring case-insensitive containers mtl pretty-show - regex-easy safe string-conversions text unordered-containers vector - yaml + aeson base bytestring case-insensitive containers either mtl + pretty-show regex-easy safe string-conversions text + unordered-containers vector yaml ]; testDepends = [ - aeson aeson-pretty base case-insensitive hspec hspec-discover + aeson aeson-pretty base case-insensitive hspec hspec-discover mtl pretty-show QuickCheck scientific string-conversions unordered-containers vector ]; - jailbreak = true; description = "parser for config files, shell variables, command line args"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -32666,6 +32986,7 @@ self: { mkDerivation { pname = "containers"; version = "0.4.2.1"; + revision = "2"; sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm"; editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8"; buildDepends = [ array base deepseq ]; @@ -32845,8 +33166,8 @@ self: { }: mkDerivation { pname = "contravariant"; - version = "1.3"; - sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r"; + version = "1.3.1"; + sha256 = "18zmjn2d4ig0sfbbdajjzmqd9fjcyb6gjf4xywimdjg6wv053cxw"; buildDepends = [ base semigroups StateVar transformers transformers-compat void ]; @@ -33336,6 +33657,7 @@ self: { mkDerivation { pname = "copr"; version = "1.1.1"; + revision = "1"; sha256 = "0zgg60ri8yvz96gk08wdfn0445wqszigh2p0964nr2zdnffq5rnw"; editedCabalFile = "ef9fb8be7d257feae9e4647de62d489860e2bd6510e34a35465cf5b763fa2425"; buildDepends = [ @@ -33672,6 +33994,7 @@ self: { mkDerivation { pname = "cprng-aes-effect"; version = "0.1.0.2"; + revision = "1"; sha256 = "0443h7jfpjvc6vmp3kfx0h6j2aynvgfznssz7lin9fmsxghlvsfb"; editedCabalFile = "b9752152bb1764da66976eaf18776b09dabf80eeb6f252bcee0da10fa0a1057e"; buildDepends = [ @@ -34431,6 +34754,7 @@ self: { mkDerivation { pname = "crypto-numbers"; version = "0.2.7"; + revision = "1"; sha256 = "19l9y5jzvqrqfam13xin9m9ca0s5ql86yv0cjn6dzkydx4byn2j2"; editedCabalFile = "2b493386b7605b70a67f751d6496e9feff8ef319a5294b122a3ff3895a8453ca"; buildDepends = [ @@ -34535,6 +34859,7 @@ self: { mkDerivation { pname = "crypto-random-effect"; version = "0.2.0.4.1"; + revision = "1"; sha256 = "1gj40r6i79jvsghyv4nqm3yrjlby9fkxxhzp0lkr5j1b9b3b2xwr"; editedCabalFile = "f217573816b1efe3fcc9b1dcbd6325015bc9a87872200547f56a80ec2b959c31"; buildDepends = [ @@ -34629,6 +34954,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptol" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, async, base + , containers, deepseq, directory, filepath, gitrev, GraphSCC, happy + , haskeline, heredoc, monadLib, old-time, presburger, pretty + , process, QuickCheck, random, sbv, smtLib, syb, template-haskell + , text, tf-random, transformers, utf8-string + }: + mkDerivation { + pname = "cryptol"; + version = "2.2.1"; + sha256 = "06dl3jkv0ygyb42p89hifrsmcg8jipyag01ibwj3gr6kxm443cg7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-terminal array async base containers deepseq directory + filepath gitrev GraphSCC haskeline heredoc monadLib old-time + presburger pretty process QuickCheck random sbv smtLib syb + template-haskell text tf-random transformers utf8-string + ]; + buildTools = [ alex happy ]; + homepage = "http://www.cryptol.net/"; + description = "Cryptol: The Language of Cryptography"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -34829,22 +35179,22 @@ self: { }) {}; "csv-conduit" = callPackage - ({ mkDerivation, array, attoparsec, attoparsec-conduit, base - , blaze-builder, bytestring, conduit, conduit-extra, containers - , data-default, directory, ghc-prim, HUnit, mmorph, monad-control - , mtl, primitive, resourcet, test-framework, test-framework-hunit - , text, transformers, unordered-containers, vector + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , ghc-prim, HUnit, mmorph, monad-control, mtl, primitive, resourcet + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "csv-conduit"; - version = "0.6.3"; - sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4"; + version = "0.6.6"; + sha256 = "12sxxv92qblsa63zdnl80a8yk01b4cvk9k6h58w82bvcy5m0aabk"; isLibrary = true; isExecutable = true; buildDepends = [ - array attoparsec attoparsec-conduit base blaze-builder bytestring - conduit conduit-extra containers data-default directory ghc-prim - mmorph monad-control mtl primitive resourcet text transformers + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default directory ghc-prim mmorph + monad-control mtl primitive resourcet text transformers unordered-containers vector ]; testDepends = [ @@ -35000,8 +35350,8 @@ self: { ({ mkDerivation, base, hmatrix, safe }: mkDerivation { pname = "cubicspline"; - version = "0.1"; - sha256 = "0z6gwg8h760jviq2v8m9b5w84f9qrkz3hd1vp5y183i0c2wa97ak"; + version = "0.1.1"; + sha256 = "0n4c80vjf8sh5wf1n0qp9z8v8z7mj7rfygjg5a02sz0s6l7q1i8s"; buildDepends = [ base hmatrix safe ]; description = "Natural cubic spline interpolation"; license = stdenv.lib.licenses.bsd3; @@ -35116,6 +35466,7 @@ self: { mkDerivation { pname = "curlhs"; version = "0.1.3"; + revision = "10"; sha256 = "0m8n19kyimxd9c7aazkw7gak7v1lik04m0y0izs3zanjlhqvnn3j"; editedCabalFile = "1ae61743cd2150bfb25b279dbf7e4b9d0c9a2339e04cdb7fcf5a0358d7b712e0"; buildDepends = [ base bytestring rtld time ]; @@ -35193,8 +35544,8 @@ self: { }: mkDerivation { pname = "cursedcsv"; - version = "0.1.1"; - sha256 = "1qcld5mg8vla6fb9biriyx3lldn69spq9halg46in6lg5qw45ycz"; + version = "0.1.2"; + sha256 = "045lfyhpwjgcdw3wxj2klq0aqn555f5r4w95fr06vsq5pxspnnvc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -36589,6 +36940,7 @@ self: { mkDerivation { pname = "data-reify"; version = "0.6"; + revision = "1"; sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7"; editedCabalFile = "60185d3fdb87fe62f297eb4473d58a7ccf93d1b6ee790a8b2faed79e1ac833c1"; isLibrary = true; @@ -37438,17 +37790,16 @@ self: { }) {}; "debian" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, bzlib - , containers, directory, either, exceptions, filepath, HaXml, HUnit - , ListLike, mtl, network, network-uri, old-locale, parsec, pretty - , prettyclass, process, process-extras, pureMD5, regex-compat - , regex-tdfa, template-haskell, text, time, unix, Unixutils - , utf8-string, zlib + ({ mkDerivation, base, bytestring, bzlib, containers, directory + , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl + , network, network-uri, old-locale, parsec, pretty, prettyclass + , process, process-extras, pureMD5, regex-compat, regex-tdfa + , template-haskell, text, time, unix, Unixutils, utf8-string, zlib }: mkDerivation { pname = "debian"; - version = "3.87.1"; - sha256 = "1g8l293gk06qjyfng70nzwzir7w27fajbkc1ck6b9w96rpcr3ipf"; + version = "3.87.2"; + sha256 = "135f0szbnn8xp5zzfmlqcpmsrswahgc4rlgviyznfx6c4j7hg519"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37459,7 +37810,7 @@ self: { utf8-string zlib ]; testDepends = [ - ansi-wl-pprint base HUnit parsec pretty prettyclass regex-tdfa text + base HUnit parsec pretty prettyclass regex-tdfa text ]; homepage = "https://github.com/ddssff/debian-haskell"; description = "Modules for working with the Debian package system"; @@ -37592,15 +37943,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deepseq_1_4_1_0" = callPackage - ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework + "deepseq_1_4_1_1" = callPackage + ({ mkDerivation, array, base, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.1.0"; - sha256 = "1azyq3vralgqi3sl61xhx0r7q7bwjfjhgk8jrjmziq55ymfkssna"; - buildDepends = [ array base ghc-prim ]; + version = "1.4.1.1"; + sha256 = "1gxk6bdqfplvq0lma2sjcxl8ibix5k60g71dncpvwsmc63mmi0ch"; + buildDepends = [ array base ]; testDepends = [ array base HUnit test-framework test-framework-hunit ]; @@ -37638,7 +37989,9 @@ self: { mkDerivation { pname = "deepseq-generics"; version = "0.1.1.2"; + revision = "1"; sha256 = "01pvigx8n9p8hwbzp2qiq6kzf7cxiam843jz2sjgliacmmp1v7l3"; + editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -37725,6 +38078,7 @@ self: { mkDerivation { pname = "definitive-filesystem"; version = "1.2"; + revision = "1"; sha256 = "0bc098igiqzbm25bjaxdxm4jq17kc8bgz1ab0pgm0h5jvy1bf8id"; editedCabalFile = "3a78d4d8aaa291ca95d889b62a979c4132bbe6f91073ab2bd9fdb0d55ed63121"; buildDepends = [ @@ -37748,6 +38102,7 @@ self: { mkDerivation { pname = "definitive-graphics"; version = "1.2"; + revision = "1"; sha256 = "0ah19j2al9l6pbin821rsicidmg3rd4cc74r8qw095773sa98zyr"; editedCabalFile = "a6d867ea8098390daff40c088c81f854ca054f9a0c8b097f9194be329416baed"; buildDepends = [ @@ -37789,6 +38144,7 @@ self: { mkDerivation { pname = "definitive-reactive"; version = "1.0"; + revision = "1"; sha256 = "0gk39602k5yjxxgpd725dnvqhlcnaqgds7g0c8v1h509lc0d7xm3"; editedCabalFile = "8c3c6afcc4ce7569ede32c8006d1d66fb10448321159f875d1dec03419bd7797"; buildDepends = [ @@ -37810,6 +38166,7 @@ self: { mkDerivation { pname = "definitive-sound"; version = "1.0"; + revision = "1"; sha256 = "01k4h7av4fhp4xchrcbnc1gnnbsh5ngasq55l16n3l438pr73vzj"; editedCabalFile = "1491f0a01f47b84ea8f01a94492738a7f3b5fe7c68c805cca8701926cc443d71"; buildDepends = [ @@ -38566,6 +38923,7 @@ self: { mkDerivation { pname = "diagrams-hsqml"; version = "0.0.0.2"; + revision = "1"; sha256 = "065jh6a24g25g1113iz4ml9vnrzpk2lyrf873jzq9x6awhi6ifng"; editedCabalFile = "bb0ff98c3522df34b9d9700a03600269cbb78d3e2a6796e6011778c315959490"; buildDepends = [ @@ -38941,8 +39299,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.7.1.4"; - sha256 = "0h2ki8vzfmvzazvzcmngb6ahki3k2zh9pbgn4hj8jaicfxrdv9xb"; + version = "0.7.1.5"; + sha256 = "1rfdxac3cnwa5r5zxic3xhj4n59f7s6l34xmja4q87ylqxfyqmls"; buildDepends = [ base bytestring containers mtl old-locale text time ]; @@ -39508,6 +39866,7 @@ self: { mkDerivation { pname = "disk-free-space"; version = "0.1.0.1"; + revision = "2"; sha256 = "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi"; editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b"; buildDepends = [ base ]; @@ -40115,8 +40474,8 @@ self: { }: mkDerivation { pname = "dns"; - version = "1.4.4"; - sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd"; + version = "1.4.5"; + sha256 = "13s9ysa5hkjjc2a5290mbpnrk2mjg3w01mib62p65rywz26yc7g5"; buildDepends = [ attoparsec base binary blaze-builder bytestring conduit conduit-extra containers iproute mtl network random resourcet @@ -40360,6 +40719,7 @@ self: { mkDerivation { pname = "doctest-discover-configurator"; version = "0.1.0.6"; + revision = "1"; sha256 = "1n2x8rp67ddifyahxcny0k7r514qa82lbxg13z7yg2kvmrfip7r8"; editedCabalFile = "79f62a00ff10acba4f850730ed2ffe99d5637bdfdb48f6fc4b92f03fbbb20a45"; isLibrary = true; @@ -40494,8 +40854,8 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.1.0.5"; - sha256 = "1gh1x4dzcrivlb8gnqgb96v6yvi78c1rx52wplbfy3z5pzg9mx1f"; + version = "0.1.0.7"; + sha256 = "0wxzlgh3qz35x3vw5m1xk3f9hq5kpyhccy9h05s0q5012fcd189a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40537,11 +40897,12 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "dotgen"; - version = "0.4.1"; - sha256 = "1g5ds0mqkz0lzhcp42hin08azschs3p083ikdk4d5jil8rzl7d8k"; + version = "0.4.2"; + sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; + homepage = "https://github.com/ku-fpg/dotgen"; description = "A simple interface for building .dot graph files."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -41005,6 +41366,7 @@ self: { mkDerivation { pname = "dtab"; version = "1.0"; + revision = "1"; sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3"; editedCabalFile = "2a7a20cc1b621e5a04b3ca28b3d03d11792731256fb39e94882e5e735d52ac15"; isLibrary = true; @@ -41376,6 +41738,7 @@ self: { mkDerivation { pname = "dynamic-plot"; version = "0.1.0.1"; + revision = "1"; sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31"; editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5"; buildDepends = [ @@ -41678,10 +42041,8 @@ self: { }: mkDerivation { pname = "ede"; - version = "0.2.4"; - sha256 = "0aji7bnkql6k0b6qa9m7g7y6nvkz8hxwf8w5bk6yzxnzvfg3dxdb"; - isLibrary = true; - isExecutable = true; + version = "0.2.7"; + sha256 = "0b632c476md2wrz0mcxbkc9c8crz2dgl58nfz25zjagqhqylslk6"; buildDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory filepath free lens mtl parsers scientific semigroups text @@ -41690,7 +42051,6 @@ self: { testDepends = [ aeson base bifunctors bytestring directory tasty tasty-golden text ]; - jailbreak = true; homepage = "http://github.com/brendanhay/ede"; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; @@ -42020,6 +42380,7 @@ self: { mkDerivation { pname = "ehs"; version = "0.7.0"; + revision = "3"; sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; isLibrary = true; @@ -42041,6 +42402,7 @@ self: { mkDerivation { pname = "eibd-client-simple"; version = "0.0.4"; + revision = "1"; sha256 = "14nxahznqy6xfjgyi8d11b4hgrw431ywqc5hkz0lbpgxysgkc61d"; editedCabalFile = "5154a0f9083521b4c60cee92f2614b253961fd1e2dd9e7c5b541630df8597d80"; buildDepends = [ base bytestring containers mtl transformers ]; @@ -42052,12 +42414,12 @@ self: { }) { eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, base, bytestring, primitive, vector }: mkDerivation { pname = "eigen"; - version = "2.0.1"; - sha256 = "1700jnqb5d4xbn6cxpbqnhdavwsgkha8pciv01f5f37ckiyj0wh3"; - buildDepends = [ base primitive vector ]; + version = "2.1.0"; + sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07"; + buildDepends = [ base bytestring primitive vector ]; testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; @@ -42709,8 +43071,8 @@ self: { }: mkDerivation { pname = "enclosed-exceptions"; - version = "1.0.1"; - sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz"; + version = "1.0.1.1"; + sha256 = "16ax1kqdsk4apg642qxkm2hf9vb5hzmkd14zmkxra8ssp8rn28z5"; buildDepends = [ async base deepseq lifted-base monad-control transformers transformers-base @@ -42798,6 +43160,7 @@ self: { mkDerivation { pname = "engine-io-yesod"; version = "1.0.1"; + revision = "1"; sha256 = "0pczmiqrg046r367j071h2hr6p2amw93sqy7j1drd2gdiwaxzn02"; editedCabalFile = "5963c385f145309049f67eb35f835abf2530a7b117730bd9fe0c4991837a52aa"; buildDepends = [ @@ -43684,8 +44047,8 @@ self: { }: mkDerivation { pname = "euler"; - version = "0.8.0"; - sha256 = "1sg82434pmy9nwi2c5i7az6jllhfjipal6l4d6ijimvavq4gim0p"; + version = "0.8.2"; + sha256 = "1dw4jsvyv4a736q2q0790qc7b5b4vaw2pwpn0ibdn33h6463a4pf"; buildDepends = [ base ]; testDepends = [ base directory happy hlint hspec process regex-posix xml @@ -43945,16 +44308,17 @@ self: { "executable-hash" = callPackage ({ mkDerivation, base, bytestring, cryptohash, directory - , executable-path, file-embed + , executable-path, file-embed, template-haskell }: mkDerivation { pname = "executable-hash"; - version = "0.1.1.1"; - sha256 = "1k01qsd2cfrhmxxs8l84g6xc0wcr2hb4s50k3yiin6r8wzli915r"; + version = "0.2.0.0"; + sha256 = "0g733akm65rjdl5mncfyhnqncan985n02vzn0z02689aq8dnav4p"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cryptohash directory executable-path file-embed + template-haskell ]; testDepends = [ base ]; homepage = "http://github.com/fpco/executable-hash"; @@ -44065,6 +44429,7 @@ self: { mkDerivation { pname = "expiring-cache-map"; version = "0.0.5.3"; + revision = "1"; sha256 = "0ihyfhkqdr29pmcb2pylrj6p2xmfgfz9qw6dabxxy8dbcg38ppvf"; editedCabalFile = "e3990400b7a0fc202dd68fb9d4fea926af9fdaeb34d2e9cf7e04eb3c2a03da4c"; buildDepends = [ base containers hashable unordered-containers ]; @@ -44205,6 +44570,7 @@ self: { mkDerivation { pname = "exposed-containers"; version = "0.5.5.1"; + revision = "1"; sha256 = "09ck4hadxgdlqpgxr45jxr261mzkzihmwd5b02xi05z8034bhqk7"; editedCabalFile = "25516f8a7288ce438b872a0d3054434c3ba48ce0ce8a57209ea6d78ce6e2665c"; buildDepends = [ array base deepseq ghc-prim ]; @@ -44709,6 +45075,7 @@ self: { mkDerivation { pname = "fastcgi"; version = "3001.0.2.4"; + revision = "1"; sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr"; editedCabalFile = "74cd87692a90492171802f25c034ef047f0b68aaa1b53303d4e50ce3ec30e98a"; buildDepends = [ base bytestring cgi ]; @@ -45086,6 +45453,7 @@ self: { mkDerivation { pname = "fedora-packages"; version = "0.0.3"; + revision = "1"; sha256 = "14fpv76ndp755mysgbya2hgr35rg2hb6dsagmrq2j2mn06xmngqk"; editedCabalFile = "b09d857e6d91527f8c9fbb8626e1610c5c7b994a6fcf30cd3328c668a6e8d33a"; buildDepends = [ @@ -45108,6 +45476,7 @@ self: { mkDerivation { pname = "feed"; version = "0.3.9.2"; + revision = "1"; sha256 = "05sg2ly1pvni3sfv03rbf60vdjkrfa0f9mmc1dm1hrmp638j67gg"; editedCabalFile = "62cb5a05a61bc09e6203b5bb7aab4464cba1703216260b0d871d98046c226358"; buildDepends = [ base old-locale old-time time utf8-string xml ]; @@ -45141,8 +45510,8 @@ self: { }: mkDerivation { pname = "feed-crawl"; - version = "0.1.1.0"; - sha256 = "0137b0bi24cdmwbvpz9cr3iavcyz95xvq48ydqdilazr6gl81m13"; + version = "0.1.2.0"; + sha256 = "0d3yfkiazzlypp3s85fqikwlli28ss27h0i215114vxsswmx1g7c"; buildDepends = [ base bytestring conduit connection http-conduit http-types hxt network-uri text transformers @@ -45288,8 +45657,8 @@ self: { ({ mkDerivation, base, containers, regex-compat }: mkDerivation { pname = "fez-conf"; - version = "1.0.1"; - sha256 = "180vflhr18kj5vgsy715wrrb0cx9l89xw2g6y2ga4gg6hc71khzl"; + version = "1.0.2"; + sha256 = "08rhkfwh7dq7x42g9mnil5naamvxn5p2mihssmqyhj8g84safrja"; buildDepends = [ base containers regex-compat ]; homepage = "http://ui3.info/d/proj/fez-conf.html"; description = "Simple functions for loading config files"; @@ -45737,6 +46106,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filtrable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "filtrable"; + version = "0.1.0.0"; + sha256 = "0hxnfjmwv1p1izxr5h7qrd5zdynj2c8k4zh198pinav5skf6v3kd"; + buildDepends = [ base ]; + jailbreak = true; + description = "Class of filtrable containers"; + license = "unknown"; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -45893,6 +46274,7 @@ self: { mkDerivation { pname = "fit"; version = "0.5"; + revision = "1"; sha256 = "0xazsm6zdvnjxhy31c5zpjbd3fc98pcy545fq3jxvzh6c913fdjl"; editedCabalFile = "87f70d521590ba57a662694c83401df69c45c6c721e52119fde62685873b5f6f"; buildDepends = [ @@ -46331,6 +46713,7 @@ self: { mkDerivation { pname = "flippers"; version = "1.0.1"; + revision = "1"; sha256 = "1swyj1f67giq7h9xcl6dzsw4ywk1jbl6avpihbv0q9g9hp6yzqp3"; editedCabalFile = "e908ada5c891a6ac39cefb7e41648606d1a5f1b1048281f93bd496c5f22d73b4"; buildDepends = [ base ]; @@ -48103,6 +48486,7 @@ self: { mkDerivation { pname = "future-resource"; version = "0.3.0.0"; + revision = "1"; sha256 = "1w1ifjzfpqlqf7dzlnca67xhc1m1ddaflq3xin5xf9s2qnmsahvx"; editedCabalFile = "f9842af26e96134d6190b8ee4f8588c0352f192443330012e66105ac4e18b082"; buildDepends = [ base ]; @@ -48184,6 +48568,7 @@ self: { mkDerivation { pname = "fwgl-glfw"; version = "0.1.0.3"; + revision = "1"; sha256 = "1zmvw7945lkghavik72w096rqh8ivjyb9h6j98yjvlj6xf85bsq0"; editedCabalFile = "f2a35fcd71bbea225624cf3b6d1f78647e103a1ee1edcc0a7eb9e27b0c4642d8"; buildDepends = [ @@ -48620,6 +49005,7 @@ self: { mkDerivation { pname = "generic-aeson"; version = "0.2.0.2"; + revision = "1"; sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh"; editedCabalFile = "51683167451b51086821ec0cb41902f0471a2444aa81a5cf66cc68838f47f99d"; buildDepends = [ @@ -49087,6 +49473,7 @@ self: { mkDerivation { pname = "gf"; version = "3.6"; + revision = "2"; sha256 = "10s8vgca36jz7b9sbd3n1in13xifwc7h42qwd58yq1lvk3j1fizx"; editedCabalFile = "ad294ebcd390005a243fe6d2203ec51f7ca2ab87a7f2fa7e7e080f0d416cb6a8"; isLibrary = true; @@ -49238,16 +49625,16 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc + ({ mkDerivation, base, containers, directory, filepath, free, ghc , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.1.1.0"; - sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l"; + version = "0.2"; + sha256 = "1sqk6y6b1scn51kjbvdnazw34bkwmfii5dhb1fzwzx4cb4iqg3ik"; buildDepends = [ - base containers directory filepath ghc ghc-paths ghc-syb-utils mtl - syb + base containers directory filepath free ghc ghc-paths ghc-syb-utils + mtl syb ]; testDepends = [ base containers directory filepath ghc ghc-paths ghc-syb-utils @@ -49442,8 +49829,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.4.0"; - sha256 = "0d29bl64gsij7169wvqgdkr8vcn35jdbqyq2aky53wcbhw4kq7k7"; + version = "0.1.6.0"; + sha256 = "1j0axpzm1ysi6sv80rr2bka1wycinrnqvkpnxlb18yb3zbwijz76"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -49524,6 +49911,7 @@ self: { mkDerivation { pname = "ghc-srcspan-plugin"; version = "0.2.0.0"; + revision = "1"; sha256 = "14p2c20xsng1h7129fadvhxs2yy2c865x19vybmzsj5ibjrzrqk2"; editedCabalFile = "540c5844d127af020f38cde32f12c531f2c4953fca5e896faf2a25f33d2a3e94"; buildDepends = [ array base containers ghc hpc ]; @@ -49863,6 +50251,7 @@ self: { aeson base bytestring cassava containers directory filepath shake split text unordered-containers vector yaml ]; + jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -50763,6 +51152,7 @@ self: { mkDerivation { pname = "gloss-accelerate"; version = "1.8.15.0"; + revision = "1"; sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0"; editedCabalFile = "3c0195c2208cb3c6786b8d1f27a17f5249af3797f6a37af410e95f23d03fb8d6"; buildDepends = [ accelerate accelerate-cuda base gloss ]; @@ -50872,7 +51262,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "gloss-raster-accelerate" = callPackage ({ mkDerivation, accelerate, accelerate-cuda, base, gloss @@ -50881,6 +51271,7 @@ self: { mkDerivation { pname = "gloss-raster-accelerate"; version = "1.8.15.0"; + revision = "2"; sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10"; editedCabalFile = "7dc701f53445822b911329368601a2de82ef2457573d6ac8ae795c74d61a5635"; buildDepends = [ @@ -51079,6 +51470,7 @@ self: { mkDerivation { pname = "goa"; version = "3.3"; + revision = "1"; sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk"; editedCabalFile = "5ae2bd1f4c29e22070fa32e5c126066813467ffe71a912148304d6f30d200137"; buildDepends = [ base directory filepath process ]; @@ -53705,6 +54097,7 @@ self: { mkDerivation { pname = "hackage-db"; version = "1.22"; + revision = "1"; sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd"; editedCabalFile = "b5277a8cbbfcfba81f29db4910003c2fa7e34c06bceb4f3e7318510e1ce74376"; buildDepends = [ @@ -53737,6 +54130,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hackage-mirror" = callPackage + ({ mkDerivation, aws, base, bytestring, cereal, conduit + , conduit-extra, cryptohash, data-default, directory, exceptions + , fast-logger, filepath, http-conduit, lifted-async, lifted-base + , mmorph, monad-control, monad-logger, old-locale + , optparse-applicative, resourcet, retry, shakespeare, stm, tar + , template-haskell, temporary, text, thyme, transformers + , unordered-containers + }: + mkDerivation { + pname = "hackage-mirror"; + version = "0.1.0.0"; + sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aws base bytestring cereal conduit conduit-extra cryptohash + data-default directory exceptions fast-logger filepath http-conduit + lifted-async lifted-base mmorph monad-control monad-logger + old-locale optparse-applicative resourcet retry shakespeare stm tar + template-haskell temporary text thyme transformers + unordered-containers + ]; + jailbreak = true; + homepage = "http://fpcomplete.com"; + description = "Simple mirroring utility for Hackage"; + license = stdenv.lib.licenses.mit; + }) {}; + "hackage-plot" = callPackage ({ mkDerivation, base, bytestring, containers, directory , download-curl, filepath, gnuplot, old-locale, old-time, parsedate @@ -54123,6 +54545,7 @@ self: { mkDerivation { pname = "hadoop-tools"; version = "0.6"; + revision = "2"; sha256 = "1nkkv9i0qk4k9vijabf1lylq8wsfsycllxvkza7abljii5jpj5fp"; editedCabalFile = "31166d3ed285e22977d237a1ae42d29b33503ad7be39c11f97b5890571da19ec"; isLibrary = false; @@ -54406,8 +54829,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.7.0"; - sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l"; + version = "4.6.7.1"; + sha256 = "125yp7ng3w91n6gvalbm3g1fj7p4zfx6fzdjcdgil2fsrcsxbcy6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54576,6 +54999,7 @@ self: { mkDerivation { pname = "half"; version = "0.2.0.1"; + revision = "1"; sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw"; editedCabalFile = "cfadc0b87a5d9c4cc9a3ab5d7a5524221ae88e962f812eb41beba7b39111ccce"; buildDepends = [ base ]; @@ -55437,8 +55861,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.1"; - sha256 = "0y3y4im18vihh4phhb6mx194gdz02z46mxrfgvf8kmg3db5bmqlk"; + version = "7.4.2"; + sha256 = "0fwxc3i0ghv0acasrpzvvbji679wg614kmpdka8p0g3cmhlrpfrg"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -55448,7 +55872,6 @@ self: { utf8-string xhtml zlib ]; testDepends = [ base bytestring containers HUnit parsec zlib ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -55564,6 +55987,7 @@ self: { mkDerivation { pname = "happy"; version = "1.19.5"; + revision = "1"; sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32"; editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c"; isLibrary = false; @@ -55647,6 +56071,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "har" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, text + }: + mkDerivation { + pname = "har"; + version = "0.1.1.0"; + sha256 = "0x51sqlybfq2pqv6nrhvf50yds3gs08sfih7zi9ijvn5dkrxx1z3"; + buildDepends = [ aeson base bytestring directory filepath text ]; + homepage = "https://github.com/freizl/har"; + description = "HAR spec in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "harchive" = callPackage ({ mkDerivation, base, binary, network, openssl, parsec, sqlite , unix, zlib @@ -55917,6 +56354,7 @@ self: { mkDerivation { pname = "hashable-extras"; version = "0.2.0.1"; + revision = "1"; sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s"; editedCabalFile = "0797bee08c6190172fa48ce7f2821160efcd26f9fcf2afce08ea64737c1aef7d"; buildDepends = [ @@ -56054,6 +56492,7 @@ self: { mkDerivation { pname = "hask"; version = "0"; + revision = "1"; sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39"; editedCabalFile = "04abcba45a7fbaa11d7f3bd9834f1e70a30f356ae871e59ab472f20d4cd60026"; buildDepends = [ @@ -56244,14 +56683,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_2_0" = callPackage + "haskeline_0_7_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , terminfo, transformers, unix, utf8-string }: mkDerivation { pname = "haskeline"; - version = "0.7.2.0"; - sha256 = "1pzvps7r53zwjcw1klc025ll786qzlp6y6k4w37ycz2g44fmd2f2"; + version = "0.7.2.1"; + sha256 = "09v4vy6nf23b13ws9whdqwv84mj1nhnla88rw2939qyqxb4a6mmf"; buildDepends = [ base bytestring containers directory filepath terminfo transformers unix utf8-string @@ -56310,6 +56749,7 @@ self: { mkDerivation { pname = "haskell-awk"; version = "1.1"; + revision = "3"; sha256 = "0ic21rfm35jp7476pm6ggkp4faqsn9rhvzb58b497ilgj9wzv1dp"; editedCabalFile = "dda4e94c57a8fce2f7d269dc09363ee84b71b33863bf1601347fa5a4b1a55698"; isLibrary = true; @@ -56605,8 +57045,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.13"; - sha256 = "1j2ka83s4fa8aqqnhvp83zqlp019ayznlkhd7pb6pqkd19npr78a"; + version = "0.3.0.15"; + sha256 = "1gxnwz7xzf4l0d4hwi8ij95910d38l89i9x3sw051zwn4fzns1cv"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base mtl resourcet scientific text @@ -56648,7 +57088,9 @@ self: { mkDerivation { pname = "haskell-packages"; version = "0.2.4.4"; + revision = "1"; sha256 = "1n4il9vkszr48n0zg3kccyqa744p0cc6idamdk6xb6hj0flpqzzc"; + editedCabalFile = "0d8b5e0dd102cc4c6aac5bc12e523d5c2ad94d981f33792b459d9373bb25c399"; buildDepends = [ aeson base bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged @@ -56863,12 +57305,13 @@ self: { mkDerivation { pname = "haskell-src-meta"; version = "0.6.0.8"; + revision = "1"; sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk"; + editedCabalFile = "98609677e15a08af231b3bb957670cb1de50132625a36ef1fc83d530fb319f8a"; buildDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; - jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56960,8 +57403,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.2.8"; - sha256 = "0xkp413s13gg11xc7x2c9gjxla3hcnk97wxfdj5zqrdvv757vp7x"; + version = "1.2.9"; + sha256 = "0nd8xjlyr8zjrqj9mw6xpn3rxsj9vpb8khc6hq6dc5agmldl9z7a"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -58030,6 +58473,7 @@ self: { mkDerivation { pname = "hastache"; version = "0.6.1"; + revision = "2"; sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc"; editedCabalFile = "92cea66e7c2d33e62c5caac8eaaf0e716fa6e2146ef906360db4d5f72cd30091"; isLibrary = true; @@ -58343,6 +58787,7 @@ self: { mkDerivation { pname = "haxy"; version = "1.0"; + revision = "2"; sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs"; editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940"; buildDepends = [ @@ -58784,8 +59229,8 @@ self: { }: mkDerivation { pname = "hdbc-aeson"; - version = "0.1.3.0"; - sha256 = "1mqcpzp9fw604nab0zs9r8515072pwbkfr4vvdpjhbdny5022naw"; + version = "0.1.3.2"; + sha256 = "04bp1zxw5alazk241gbz7g1s4cr0gabb7c15irzzlkbjz5jsk6d5"; buildDepends = [ aeson base convertible HDBC scientific text unordered-containers vector @@ -59198,6 +59643,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis-config" = callPackage + ({ mkDerivation, aeson, base, hedis, scientific, text, time }: + mkDerivation { + pname = "hedis-config"; + version = "0.0.1"; + sha256 = "1c524klmsl8n6alphxdmwm4hw05hhq3rcyb5540ksnnys77b8y2b"; + buildDepends = [ aeson base hedis scientific text time ]; + homepage = "https://bitbucket.org/s9gf4ult/hedis-config"; + description = "Easy trivial configuration for Redis"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hedis-monadic" = callPackage + ({ mkDerivation, base, hedis, monad-control, mtl, transformers + , transformers-base, transformers-compat + }: + mkDerivation { + pname = "hedis-monadic"; + version = "0.0.3"; + sha256 = "1z80kdm1cs1pk6fpbby20q49ji840zp9xwbynbry2v43g5q18lq6"; + buildDepends = [ + base hedis monad-control mtl transformers transformers-base + transformers-compat + ]; + homepage = "https://bitbucket.org/s9gf4ult/redis-monadic"; + description = "A la MonadReader for Redis connection"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hedis-pile" = callPackage ({ mkDerivation, base, binary, bytestring, hedis, hedis-tags, HUnit , lifted-base, string-conversions, test-framework @@ -59285,6 +59759,7 @@ self: { mkDerivation { pname = "heist"; version = "0.14.1"; + revision = "1"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; editedCabalFile = "2d58f7f1572a3a9ed3f20cb344a4f45e33303a40889b1e5bd8f83e4b972b195e"; buildDepends = [ @@ -59334,8 +59809,10 @@ self: { }: mkDerivation { pname = "helics"; - version = "0.5.0.1"; - sha256 = "0kqmqyf22fjcbsqlbyxmg6238im8kp6baip3v8f7hibkpgyfqip1"; + version = "0.5.1"; + revision = "1"; + sha256 = "06kj42rmlzlw6zrilq9kc5whk0np5714wwn3nwbpv6fx4ginzg2c"; + editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -59357,8 +59834,8 @@ self: { }: mkDerivation { pname = "helics-wai"; - version = "0.5.0"; - sha256 = "1d1kaik2aj0vnln4nbj958d7ay7adb6l62fx606y7xlp7zyhysr4"; + version = "0.5.1"; + sha256 = "10rb9l4sf31h59f5pwv54vqjnlm047mbq5gvhv5wblkh53ch1b31"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60603,6 +61080,7 @@ self: { mkDerivation { pname = "higherorder"; version = "0.0"; + revision = "1"; sha256 = "06cqhk9jalyps4v9w6wmpy9jdj3piwsp0wl3fvkzwa5iydlyvisz"; editedCabalFile = "c587250ea9c4828876f3837e82e5b1543e0dc2cc59bb4ec59ce0d947bae3d459"; buildDepends = [ base ]; @@ -61377,25 +61855,26 @@ self: { "hjsonschema" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, file-embed - , filepath, hashable, hjsonpointer, http-types, HUnit, lens + , filepath, hashable, hjsonpointer, http-conduit, http-types, HUnit , regexpr, scientific, test-framework, test-framework-hunit, text - , unordered-containers, vector, wreq + , unordered-containers, vector }: mkDerivation { pname = "hjsonschema"; - version = "0.4.0.0"; - sha256 = "0jak4ffjhbpwcmbx5jp6pbba52xr9zyhjjwn9y5gdqjny2scnb67"; + version = "0.5.2.1"; + sha256 = "0kff73g9gjvc035lw3420mxz9mp7pd1yl941wr3jagqnh6g1s85m"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson base bytestring file-embed hashable hjsonpointer http-types - lens regexpr scientific text unordered-containers vector wreq + aeson base bytestring file-embed hashable hjsonpointer http-conduit + http-types regexpr scientific text unordered-containers vector ]; testDepends = [ aeson base bytestring directory filepath HUnit test-framework test-framework-hunit text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/seagreen/hjsonschema"; - description = "Haskell implementation of JSON Schema Draft 4"; + description = "JSON Schema Draft 4 library"; license = stdenv.lib.licenses.mit; }) {}; @@ -62297,8 +62776,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "0.4.5"; - sha256 = "1lxn7ykk24a0kj9y36mwyd52xgw0hfvf3mqqm7m8ikrnpqps5nrs"; + version = "0.4.6"; + sha256 = "1sn2m1vpbkbiv7lyhffgkcs1ck7680qqgi7d8hk2b02ca53lw8wp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62495,6 +62974,7 @@ self: { mkDerivation { pname = "hoist-error"; version = "0.1.0.2"; + revision = "1"; sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; editedCabalFile = "900b08c7b95c9490dfc65334b32c1fdcb4a578e458f47dbfa58108c433fe7a8a"; buildDepends = [ base either mtl ]; @@ -63013,8 +63493,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.14"; - sha256 = "16syq600zgq5b60ghvxnnaskn984bqv60024bvpgzydv41l61lcd"; + version = "0.14.1"; + sha256 = "0ckmz6v6y8lwbpx0aw4a5japxgx1m664p7pgrblsbw9pn5yjrkcw"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -63282,6 +63762,7 @@ self: { mkDerivation { pname = "hourglass"; version = "0.2.8"; + revision = "1"; sha256 = "1n5kffmf9qnr2zy6igck7rlrw0gx5lqc92n1lajpa8vq96qzx7lj"; editedCabalFile = "df23ba9b63af9fd6ed50bdbde1c2a2b43dc702e68a85722a49cd1ff1b21894b5"; buildDepends = [ base deepseq ]; @@ -63576,8 +64057,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.8"; - sha256 = "1jz82d9z27zci1dl0d33xc1q96dip3b86f8i2dhxyahpi9p7khjm"; + version = "0.1.2.9"; + sha256 = "090j08ygfjsmhyfdg0azl0qwfm0i96yyk67xnwyv1as56r2pvn6r"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -64391,6 +64872,7 @@ self: { mkDerivation { pname = "hsConfigure"; version = "0.1.0.2"; + revision = "2"; sha256 = "199sza2jh3d5046yyb141b0jwh1m1p68hv4x3b5xz6vw9dzfbw3c"; editedCabalFile = "ab3264ebf799e07e40fd913b9061197b346a7d84145908566155231e62a45c02"; buildDepends = [ base directory filepath process unix ]; @@ -65580,6 +66062,23 @@ self: { inherit (pkgs) libxml2; tiff = null; wmflite = null; inherit (pkgs) zlib;}; + "hsmisc" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec + , regex-compat, time + }: + mkDerivation { + pname = "hsmisc"; + version = "1.1"; + sha256 = "1n340agvf103g84xndc9fbhq4rhywx611iykmkk10wxi364dv7wg"; + buildDepends = [ + base containers mtl old-locale parsec regex-compat time + ]; + testDepends = [ base containers HUnit mtl regex-compat ]; + homepage = "http://foo/bar/baz.html"; + description = "A collection of miscellaneous modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsmtpclient" = callPackage ({ mkDerivation, array, base, directory, network, old-time }: mkDerivation { @@ -65822,8 +66321,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.1.4"; - sha256 = "0g0wv0mvc367fi14ibi9pbxclna7kppyxgfl4axhhr5qxvhf686p"; + version = "2.1.5"; + sha256 = "0lj8inhp0lxh23ayc3wcj5c7rslwr4q6s6wqswhda0v3cz3lfmsc"; buildDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -65843,8 +66342,8 @@ self: { }: mkDerivation { pname = "hspec-attoparsec"; - version = "0.1.0.1"; - sha256 = "12246p4k0axv6w5jxnid9hyl4cbl3vmd46b7xxli7nq2iw79nl8v"; + version = "0.1.0.2"; + sha256 = "0r7v6x0k5r8jxl0rnsq8h3gqhbiimsic3kiphn6dxaw954zqnypa"; buildDepends = [ attoparsec base bytestring hspec-expectations text ]; @@ -65889,8 +66388,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.1.4"; - sha256 = "0x2azc1km06f4br2pdnklkz08ali1chysi0wdwwk3j9f0lqp6jj7"; + version = "2.1.5"; + sha256 = "1za9ybkcqrzgrmqvzijvw471yk5kjhp0pr0n47n4f4cy0ha7l0fb"; buildDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -65909,8 +66408,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.1.4"; - sha256 = "1nabyjxjsrh7901bzv88b28gcja1shiznw9n2q2l3gfq6hxfzvqw"; + version = "2.1.5"; + sha256 = "03bs5gxzhn605f8k7wdm629kzsmxy5mjb1v834q69f3w1iczx304"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath ]; @@ -66210,6 +66709,7 @@ self: { mkDerivation { pname = "hspec2"; version = "0.6.1"; + revision = "1"; sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f"; buildDepends = [ base hspec hspec-discover ]; @@ -66301,6 +66801,7 @@ self: { mkDerivation { pname = "hsql-mysql"; version = "1.8.3"; + revision = "1"; sha256 = "0834jr5jrr1m7ap93wvmb5ir0906f7f7xx52x21i1l1jfpan34j9"; editedCabalFile = "e1bbb71ecb6e310acf23a93e4a5e0121c8bd332e7a81dfa5bfe27ae94cbf14ab"; buildDepends = [ base Cabal hsql ]; @@ -67353,25 +67854,25 @@ self: { "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , case-insensitive, certificate, conduit, containers, cookie - , data-default, failure, hspec, http-conduit, http-types, HUnit - , lifted-base, monad-control, network, network-conduit, resourcet - , socks, text, time, tls, transformers, wai, warp + , case-insensitive, conduit, containers, cookie, data-default + , exceptions, hspec, http-client, http-conduit, http-types, HUnit + , lifted-base, monad-control, network, network-uri, resourcet, text + , time, transformers, transformers-base, wai, warp }: mkDerivation { pname = "http-conduit-browser"; - version = "1.9.0.2"; - sha256 = "05jbxqigld9bg26gfl37c3axcxjjhm0hwp63yy8rphqp0yr4z5lc"; + version = "2.0.0.0"; + sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q"; buildDepends = [ - base bytestring case-insensitive certificate conduit containers - cookie data-default failure http-conduit http-types lifted-base - monad-control network resourcet socks time tls transformers + base bytestring conduit containers cookie data-default exceptions + http-client http-conduit http-types lifted-base monad-control + network-uri resourcet time transformers transformers-base ]; testDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive - certificate conduit containers cookie data-default failure hspec + conduit containers cookie data-default hspec http-client http-conduit http-types HUnit lifted-base monad-control network - network-conduit resourcet socks text time tls transformers wai warp + resourcet text time transformers wai warp ]; jailbreak = true; homepage = "https://github.com/exbb2/http-conduit-browser"; @@ -67421,6 +67922,7 @@ self: { mkDerivation { pname = "http-encodings"; version = "0.9.3"; + revision = "1"; sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn"; editedCabalFile = "b9e6dd65c8dd4119887c084f1bd14570ab0540e723afb845212f041e871210d7"; buildDepends = [ @@ -67712,13 +68214,13 @@ self: { "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, blaze-builder - , bytestring, containers, directory, doctest, filepath, hex, hspec - , PSQueue, text, unordered-containers, vector, word8 + , bytestring, containers, directory, doctest, filepath, Glob, hex + , hspec, PSQueue, text, unordered-containers, vector, word8 }: mkDerivation { pname = "http2"; - version = "0.8.0"; - sha256 = "1hvjb22jmmfrj0ym4sk4yn2y4x9manic42w7yfy8kckhihzh1j1s"; + version = "0.9.0"; + sha256 = "117s8kjbqhd034f483j2x3m2kkjl895b1bc1lxj35b6ar326fp2b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -67728,7 +68230,7 @@ self: { ]; testDepends = [ aeson aeson-pretty array base blaze-builder bytestring containers - directory doctest filepath hex hspec PSQueue text + directory doctest filepath Glob hex hspec PSQueue text unordered-containers vector word8 ]; description = "HTTP/2.0 library including frames and HPACK"; @@ -68483,6 +68985,7 @@ self: { mkDerivation { pname = "hxt-pickle-utils"; version = "0.1.0.2"; + revision = "1"; sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2"; editedCabalFile = "89173b402c57c3ee7ee0eb2814e58d81e46cce5742a4f01684980b841359d2fb"; buildDepends = [ base hxt mtl ]; @@ -68753,8 +69256,8 @@ self: { }: mkDerivation { pname = "hydrogen-cli-args"; - version = "0.14"; - sha256 = "0q72w0bacaqxip26yl1qln8lrskl39wr72nphwirmdk4cxs92mx7"; + version = "0.17"; + sha256 = "1wapq5lfyvm09sl9n7zhiaxpb8iapirvizq3ak9rl17vy4iz5xl4"; buildDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; @@ -68778,12 +69281,12 @@ self: { }) {}; "hydrogen-multimap" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "hydrogen-multimap"; - version = "0.1"; - sha256 = "165lxvm0yvz0jq3l520ww0fp4zb7y4azz32bvrz00z4j1dqr5vaw"; - buildDepends = [ base containers ]; + version = "0.3"; + sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93"; + buildDepends = [ base containers ghc-prim ]; homepage = "https://scravy.de/hydrogen-multimap/"; description = "Hydrogen Multimap"; license = stdenv.lib.licenses.mit; @@ -68793,8 +69296,8 @@ self: { ({ mkDerivation, base, containers, hydrogen-prelude, parsec }: mkDerivation { pname = "hydrogen-parsing"; - version = "0.14"; - sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy"; + version = "0.17"; + sha256 = "0m9rliry031lr7bn4xkbjmar288zcrnpsbnjdyxs13v675bh7h29"; buildDepends = [ base containers hydrogen-prelude parsec ]; jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; @@ -68803,34 +69306,46 @@ self: { }) {}; "hydrogen-prelude" = callPackage - ({ mkDerivation, array, base, cereal, containers, directory - , filepath, hashable, hydrogen-multimap, hydrogen-version, network - , nicify, process, random, regex-base, regex-tdfa, strict, time - , transformers, uuid + ({ mkDerivation, array, base, binary, bytestring, cereal + , containers, directory, filepath, hashable, hydrogen-multimap + , hydrogen-version, network, process, random, regex-base + , regex-tdfa, strict, text, time, transformers, uuid }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.15"; - sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f"; + version = "0.20"; + sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697"; buildDepends = [ - array base cereal containers directory filepath hashable - hydrogen-multimap hydrogen-version network nicify process random - regex-base regex-tdfa strict time transformers uuid + array base binary bytestring cereal containers directory filepath + hashable hydrogen-multimap hydrogen-version network process random + regex-base regex-tdfa strict text time transformers uuid ]; - jailbreak = true; homepage = "http://scravy.de/hydrogen-prelude/"; description = "Hydrogen Prelude"; license = stdenv.lib.licenses.mit; }) {}; + "hydrogen-prelude-parsec" = callPackage + ({ mkDerivation, base, hydrogen-prelude, parsec }: + mkDerivation { + pname = "hydrogen-prelude-parsec"; + version = "0.17"; + sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh"; + buildDepends = [ base hydrogen-prelude parsec ]; + jailbreak = true; + homepage = "http://scravy.de/hydrogen-prelude-parsec/"; + description = "Hydrogen Prelude /w Parsec"; + license = stdenv.lib.licenses.mit; + }) {}; + "hydrogen-syntax" = callPackage ({ mkDerivation, base, containers, hydrogen-parsing , hydrogen-prelude, nicify, parsec, uuid }: mkDerivation { pname = "hydrogen-syntax"; - version = "0.14"; - sha256 = "1gkhmlxcdvs1px4ffygw11mc23f64dbiwxhhp4fjif632bs7mp1v"; + version = "0.17"; + sha256 = "17j6iq2fh1s3vwkzd5js786abk1zkmj4dfg425d290k4nvdl08dv"; buildDepends = [ base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid @@ -68860,8 +69375,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hydrogen-version"; - version = "1.3"; - sha256 = "1211ynxr4l1kwkxj37gyyfjcd8mmdajrnmwg9lwlf85dn49r4xzv"; + version = "1.4"; + sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38"; buildDepends = [ base ]; homepage = "https://scravy.de/hydrogen-version/"; description = "Hydrogen Version Type"; @@ -69302,15 +69817,15 @@ self: { , base, base64-bytestring, binary, blaze-html, blaze-markup , boehmgc, bytestring, cheapskate, containers, deepseq, directory , filepath, fingertree, gmp, happy, haskeline, lens, libffi, mtl - , network, optparse-applicative, parsers, pretty, process, split - , text, time, transformers, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , network, optparse-applicative, parsers, pretty, process, safe + , split, text, time, transformers, transformers-compat, trifecta + , uniplate, unix, unordered-containers, utf8-string, vector , vector-binary-instances, xml, zlib }: mkDerivation { pname = "idris"; - version = "0.9.16"; - sha256 = "0mnjq05v145jyj2m2v2a33ibpyf788x63agcnlb33y21684mhvcm"; + version = "0.9.17.1"; + sha256 = "16a3z7jq1pmqnb411aqn9qmirwyzpx3bqb0hrawc1404kbq7gdx7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69318,9 +69833,9 @@ self: { base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree haskeline lens libffi mtl network optparse-applicative parsers - pretty process split text time transformers trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances xml - zlib + pretty process safe split text time transformers + transformers-compat trifecta uniplate unix unordered-containers + utf8-string vector vector-binary-instances xml zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; @@ -69479,6 +69994,7 @@ self: { mkDerivation { pname = "igrf"; version = "0.2.0.0"; + revision = "1"; sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1"; editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f"; buildDepends = [ ad base polynomial ]; @@ -69488,40 +70004,40 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , classy-prelude, cmdargs, containers, directory, filepath, ghc - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, http-client, http-client-tls, HUnit, ipython-kernel - , MissingH, mono-traversable, mtl, parsec, process, random, setenv - , shelly, split, stm, strict, system-argv0, system-filepath, tar - , template-haskell, text, transformers, unix, unordered-containers - , utf8-string, uuid, vector + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, classy-prelude, cmdargs, containers + , directory, filepath, ghc, ghc-parser, ghc-paths, haskeline + , haskell-src-exts, here, hlint, hspec, http-client + , http-client-tls, HUnit, ipython-kernel, MissingH + , mono-traversable, mtl, parsec, process, random, setenv, shelly + , split, stm, strict, system-argv0, system-filepath, tar, text + , transformers, unix, unordered-containers, utf8-string, uuid + , vector }: mkDerivation { pname = "ihaskell"; - version = "0.5.0.0"; - sha256 = "1vp31ihl2hbpw3fadwmdm6hg1692khmb1v7gzcqik162i65dyzrj"; + version = "0.6.0.0"; + sha256 = "15fsan1dxlmd7y31630rqrg9gaa205g3s89vlqnxjv0dfvs86qf0"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random shelly split stm strict system-argv0 - system-filepath tar template-haskell text transformers unix - unordered-containers utf8-string uuid vector + system-filepath tar text transformers unix unordered-containers + utf8-string uuid vector ]; testDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random setenv shelly split stm strict system-argv0 system-filepath tar text transformers unix unordered-containers utf8-string uuid vector ]; - jailbreak = true; homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -69689,8 +70205,8 @@ self: { }: mkDerivation { pname = "ihaskell-rlangqq"; - version = "0.2.0.0"; - sha256 = "18681acd0wmmbalj87p4psis1qf84rzhvh8c1a96jgh5nv3rk5dn"; + version = "0.2.0.1"; + sha256 = "1si38n47p57kwqsmsqw9bnv4k6z3zd6n8f5kmsmmbcmjdqmi7i86"; buildDepends = [ base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat @@ -69745,6 +70261,7 @@ self: { mkDerivation { pname = "image-type"; version = "0.1.0.0"; + revision = "1"; sha256 = "0xr55c5g4jn1y83qy7bqa5ww9r73vw9clgln9ld893vypmb91wks"; editedCabalFile = "47033c893690f2cea85ba867343f277a8e2594f9010a5466a39dc7f3c4d682f2"; buildDepends = [ base bytestring ]; @@ -69774,6 +70291,7 @@ self: { mkDerivation { pname = "imagemagick"; version = "0.0.3.5"; + revision = "1"; sha256 = "0vwmx86wpxr1f5jrwlqpvrb94dbrm0jjdqq6bppfnfyppd3s1mmq"; editedCabalFile = "9666a02ba8aef32515f97734c86453b3b9759c46c6a9306be9f20dbdb6b98203"; isLibrary = true; @@ -69822,6 +70340,7 @@ self: { mkDerivation { pname = "imagesize-conduit"; version = "1.0.0.4"; + revision = "1"; sha256 = "0hhmjbdqdljfy3khzpg2xq6kgxa9x89jvpci7lf413pc1lpg4cw7"; editedCabalFile = "9a9a6ea6572ae1cdf6f1df1bbd35c96ae2aac9f61f7eabbcc1a60ed792d14a3d"; buildDepends = [ base bytestring conduit conduit-extra ]; @@ -70177,6 +70696,7 @@ self: { mkDerivation { pname = "index-core"; version = "1.0.1"; + revision = "1"; sha256 = "01d7025js5a3373a8ixl3clvmd0blpkly6js3ggnp26p4h5ilhv4"; editedCabalFile = "dbc4c7390f6664ca0ad083bb005897e6f3ca5dca5e95709621c131d7a1a0f09f"; buildDepends = [ base ]; @@ -70540,13 +71060,12 @@ self: { }: mkDerivation { pname = "int-cast"; - version = "0.1.1.0"; - sha256 = "1snzggbb2z6rczym0xmbfmi59cdyf49qvjbfqchp8sr7b6dgn0vz"; - buildDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb"; + buildDepends = [ base nats ]; testDepends = [ base nats QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; @@ -71018,6 +71537,7 @@ self: { mkDerivation { pname = "io-throttle"; version = "0.1.0"; + revision = "1"; sha256 = "043plb9n606hkbdjddgk9kg12fzzs7ry063ckiky4zymy2vprcj9"; editedCabalFile = "c3903532515f76e374229ea572d11f7ab02a560062425f33649399c5ac61a16e"; buildDepends = [ base SafeSemaphore threads ]; @@ -71167,8 +71687,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.3.1"; - sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp"; + version = "1.3.2"; + sha256 = "0zdcpmxyn1acxbdgh0k201ha70yzms1w27s7n6awp67hz7v0n95m"; buildDepends = [ appar base byteorder containers network ]; testDepends = [ appar base byteorder containers doctest hspec network QuickCheck @@ -71227,18 +71747,18 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, tar, text, transformers, unix - , uuid, zeromq4-haskell + , directory, filepath, mtl, parsec, SHA, tar, text, transformers + , unix, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.3.0.0"; - sha256 = "035cfq1dlkjmmfjkmfvkn4i4rx04wzsgz9s4dbdwhkx3x7bcj7sj"; + version = "0.6.0.0"; + sha256 = "0pk49hz2ba2ikd96nymrlk7nrd5sw1fmy7xbx24hrri5izqfjjli"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring cereal containers directory filepath mtl - parsec tar text transformers unix uuid zeromq4-haskell + parsec SHA tar text transformers unix uuid zeromq4-haskell ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; @@ -71315,6 +71835,7 @@ self: { mkDerivation { pname = "irc-ctcp"; version = "0.1.2.1"; + revision = "1"; sha256 = "1bpn9i9mqmhiif6mhw6q9nzy5cwx1x1yh81216gkqc5gi43gsc5s"; editedCabalFile = "23e92ff7cad332b34f89273fe543e9b8b87a19b30fb1a18fad61c9c3952d0dce"; buildDepends = [ base bytestring text ]; @@ -72138,43 +72659,42 @@ self: { }) {}; "jalla" = callPackage - ({ mkDerivation, base, c2hs, cblas, convertible, f77blas, HUnit - , lapack, lapacke, mtl, QuickCheck, random, test-framework + ({ mkDerivation, base, blas, c2hs, cblas, convertible, HUnit + , lapacke, mtl, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "jalla"; - version = "0.1.0.1"; - sha256 = "18nxlfr59ka4z45a5nn47lyqsbzfjsfgg1wm5irmncj1jmasjpq5"; + version = "0.2"; + sha256 = "02n9dfspn648090d3yhk3ngqzjky82ly770qi13d1h13ixbv2lx0"; buildDepends = [ base convertible mtl QuickCheck random ]; testDepends = [ base HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; buildTools = [ c2hs ]; - extraLibraries = [ cblas f77blas lapack lapacke ]; - jailbreak = true; + extraLibraries = [ blas cblas lapacke ]; homepage = "https://github.com/cgo/jalla"; description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE."; - license = stdenv.lib.licenses.bsd3; + license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { cblas = null; f77blas = null; lapack = null; - lapacke = null;}; + }) { inherit (pkgs) blas; cblas = null; lapacke = null;}; "jammittools" = callPackage - ({ mkDerivation, base, boxes, bytestring, conduit, containers - , directory, filepath, HPDF, JuicyPixels, process, property-list - , temporary, transformers, vector + ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio + , containers, directory, filepath, HPDF, JuicyPixels, process + , property-list, resourcet, temporary, transformers, vector }: mkDerivation { pname = "jammittools"; - version = "0.4"; - sha256 = "1dz03p2449aqf517n03mgydd527lh3pyf9s11a46rwafpwh9wn1d"; + version = "0.4.1"; + sha256 = "0dmnv20nqv72wm42m5widcq0b63rnrslg8ylabc6hqp7xdqa7vil"; isLibrary = true; isExecutable = true; buildDepends = [ - base boxes bytestring conduit containers directory filepath HPDF - JuicyPixels process property-list temporary transformers vector + base boxes bytestring conduit conduit-audio containers directory + filepath HPDF JuicyPixels process property-list resourcet temporary + transformers vector ]; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; @@ -72361,8 +72881,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.9"; - sha256 = "1prplflikryw7scz75rbijn4dl1gdi6589yq5902n26xpaigqsp6"; + version = "0.6.11"; + sha256 = "1b45graag0nmadaf1ssaps4g9p7xx7d2h7dy84nzmdhrpvdlw4xs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -72812,6 +73332,7 @@ self: { mkDerivation { pname = "json-extra"; version = "0.1.0.1"; + revision = "1"; sha256 = "1wqn68brkjmix7xidcb7170ydpxwq1p48qqmm4w9ak0zkvm70fks"; editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741"; buildDepends = [ @@ -73268,6 +73789,7 @@ self: { mkDerivation { pname = "kan-extensions"; version = "4.2.1"; + revision = "1"; sha256 = "0lymh1njw1zh9is6zk3bmr7jylna28632l4pylh6chlxpjvy4zwl"; editedCabalFile = "c0b1fdbd894c452f2658615bb14db240921b9ba5115f4f232d173ecbdae83ead"; buildDepends = [ @@ -73801,8 +74323,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "kmeans"; - version = "0.1.2"; - sha256 = "1v9f6yzzb282x30wyk91f68dphxl5g2lnibmsqhvc9m4wznnxjzc"; + version = "0.1.3"; + sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix"; buildDepends = [ base ]; description = "K-means clustering algorithm"; license = stdenv.lib.licenses.bsd3; @@ -74173,15 +74695,14 @@ self: { }: mkDerivation { pname = "laika"; - version = "0.1.1"; - sha256 = "1ifs8brgbhzwl58ccnpyvfrkn1x27a38ylawik382n221sv28pj5"; + version = "0.1.3"; + sha256 = "1j9f76sch91igpgarw7pwzhymd6ji7wnwr9l8riallglphc55g7l"; isLibrary = true; isExecutable = true; buildDepends = [ 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; @@ -74341,8 +74862,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.0"; - sha256 = "022xrcpjxzs7ac4ssaq1xkmjypvql8bpa1mvmgysskg6z0ix7jr9"; + version = "5.0.1"; + sha256 = "1zf29cqdr71n2bj7idh9v7yygk0ckpadr44f5ghqr74zdpyw6dyi"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -74366,8 +74887,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.0"; - sha256 = "0krsz6a7lgclbwnjy3581lqzcb3y6gf8fav6n7ka5683mp281xa5"; + version = "5.0.1"; + sha256 = "06asm62k2nb32yr0z4sw70z0r4ikakgkph6zqhjw7wj14ic2nxbk"; buildDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -74376,7 +74897,6 @@ self: { template-haskell time transformers transformers-base unix utf8-string zlib ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; @@ -74393,8 +74913,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.0"; - sha256 = "1ls34bqyqxf89dgfcn1frsz6bdxy10dbyk7f7c9lndks8sv8hlvr"; + version = "5.0.1"; + sha256 = "0bzfbaksij0sav93qp2j4k4qlclb9zdz8z8233ziismf9bq4bm16"; buildDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts hoogle HTTP IOSpec @@ -74415,8 +74935,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.0"; - sha256 = "0d0pm06912rc4xwmqrwcwyfnzwmazqc0sdp58nqdpzk4wg5f3lx2"; + version = "5.0.1"; + sha256 = "13ybjyx5x84g0w7l2yyni5yary59j4kpaqc4pl1942bp6y7lbfrp"; buildDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -74428,23 +74948,22 @@ self: { "lambdabot-misc-plugins" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hstatsd - , lambdabot-core, lifted-base, monad-control, mtl, network - , network-uri, parsec, process, random, random-fu, random-source - , regex-tdfa, SafeSemaphore, split, tagsoup, template-haskell, time + , lambdabot-core, lifted-base, mtl, network, network-uri, parsec + , process, random, random-fu, random-source, regex-tdfa + , SafeSemaphore, split, tagsoup, template-haskell, time , transformers, transformers-base, unix, utf8-string, zlib }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.0"; - sha256 = "0i9ax50vxfj312kw8lgxdnqsiriip2ls6zaq3c7ll4f1x6cb634r"; + version = "5.0.1"; + sha256 = "08dhwls7lgwrpyqzjxpg95cn80mqf3izrwnzbmygkp3my8xqxakp"; buildDepends = [ base bytestring containers filepath hstatsd lambdabot-core - lifted-base monad-control mtl network network-uri parsec process - random random-fu random-source regex-tdfa SafeSemaphore split - tagsoup template-haskell time transformers transformers-base unix + lifted-base mtl network network-uri parsec process random random-fu + random-source regex-tdfa SafeSemaphore split tagsoup + template-haskell time transformers transformers-base unix utf8-string zlib ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; @@ -74457,8 +74976,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.0"; - sha256 = "0nsagim2jzpap2ja7661qycvy0nqrnjq6hx6d8zvisql7g70yji0"; + version = "5.0.1"; + sha256 = "1h9qnxbdqnpwarbvviaqrl18fxd9bs33f6n60b7cdx1p2imzbp25"; buildDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -74475,8 +74994,8 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.0"; - sha256 = "017zw98mw3mcrxgl489zyfjq605m07wkjs5kcwcjf7071vh358c7"; + version = "5.0.1"; + sha256 = "11hljsbb8kdbf6h4si97c52643w2fxicql1xq743f4gkys2y0x2a"; buildDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -74492,8 +75011,8 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.0"; - sha256 = "0c5p8pxng6nwn252mi92yrwq67pdrykjmpkkbvw9ajwhg8v5nf08"; + version = "5.0.1"; + sha256 = "0ylp40j54whn4fsgxi0843mvs0gx286c5fm127ja1h7j6c74svkc"; buildDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -74506,8 +75025,8 @@ self: { ({ mkDerivation, base, oeis, QuickCheck }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.0"; - sha256 = "09cz4vr4pxsa25ms336ic80lsqm4d5lrfvra194h5h2hddvhdk5q"; + version = "5.0.1"; + sha256 = "1ijpr8b4vzvyfbry1g8wphk9wn7pxvay2wk6racl5k78kw27jd1c"; buildDepends = [ base oeis QuickCheck ]; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot trusted code"; @@ -74966,6 +75485,7 @@ self: { mkDerivation { pname = "language-ecmascript"; version = "0.17"; + revision = "2"; sha256 = "15v0nwp97058yjn0sp0hlsk7pvs6vaak3521p99f0z7a1dx4d876"; editedCabalFile = "834526a1a67668bc7689b50d0ff28b674235724d5b3df5ce8cccbcd5fd4f5622"; buildDepends = [ @@ -75653,8 +76173,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lazysplines"; - version = "0.1"; - sha256 = "08zpr5bsqgfk3f5v8133zgdprl22n09l60b31xzadcdy50zmnif1"; + version = "0.2"; + sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y"; buildDepends = [ base ]; description = "Differential solving with lazy splines"; license = stdenv.lib.licenses.bsd3; @@ -75845,8 +76365,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.2.0"; - sha256 = "1jlrp04hyzxz8bza2wj35v098b6casfa0byswvnchphgnpz1bn42"; + version = "0.3.2.1"; + sha256 = "1nk5dcz6h27d6y5lq4sgl9vn6dl9cmwrkfghxx33nbfq5p77vkyb"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -75953,6 +76473,7 @@ self: { mkDerivation { pname = "lens"; version = "4.8"; + revision = "1"; sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; buildDepends = [ @@ -76364,14 +76885,14 @@ self: { }) {}; "lhs2html" = callPackage - ({ mkDerivation, base, directory, filepath, Glob, nicify }: + ({ mkDerivation, base, directory, filepath, Glob }: mkDerivation { pname = "lhs2html"; - version = "0.99999"; - sha256 = "1znqqgbg64r790c74ggzdffkgw9i8xg86wf9pk029q02fw67b7nb"; + version = "0.999999"; + sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv"; isLibrary = false; isExecutable = true; - buildDepends = [ base directory filepath Glob nicify ]; + buildDepends = [ base directory filepath Glob ]; description = "Compile lhs in bird style to md, html, hs"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -77809,6 +78330,7 @@ self: { mkDerivation { pname = "list-tries"; version = "0.5.2"; + revision = "1"; sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6"; editedCabalFile = "50826a589644da396825e57f778b8e5596df986e1cf8ca97d946d29243b0556e"; isLibrary = true; @@ -78022,7 +78544,7 @@ self: { description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "llvm-base-types" = callPackage ({ mkDerivation, base, c2hs, containers, deepseq, dwarf, failure @@ -78500,8 +79022,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.1"; - sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8"; + version = "0.13.2"; + sha256 = "13kr1gwsrwyvnb5klcvl3h506y0l3sibks6cpszwjnz296i5kpf9"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -78660,6 +79182,7 @@ self: { mkDerivation { pname = "lojban"; version = "0.3"; + revision = "1"; sha256 = "0pd31g21db8yh1mrnmy7r60lr0dbpwlxpwc0hli3y1wcr4fisnx6"; editedCabalFile = "9d30c9c8f1aa80aea24ca606d74ee1b3a9af0ecde15a0e65b1150d483d6b1cfc"; isLibrary = true; @@ -79234,6 +79757,7 @@ self: { mkDerivation { pname = "lvish"; version = "1.1.4"; + revision = "1"; sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44"; editedCabalFile = "38b0af7bd2ebc54b5a2b01a2c24a3832d80f76596c8a8fad621499996ce76e76"; buildDepends = [ @@ -79422,6 +79946,7 @@ self: { mkDerivation { pname = "machines"; version = "0.4.1"; + revision = "1"; sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; buildDepends = [ @@ -79479,6 +80004,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "machines-zlib" = callPackage + ({ mkDerivation, base, basic-prelude, machines, streaming-commons + }: + mkDerivation { + pname = "machines-zlib"; + version = "0.1.0"; + sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d"; + buildDepends = [ base basic-prelude machines streaming-commons ]; + homepage = "https://github.com/lshift/machines-zlib"; + description = "Decompression support for machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "macho" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -80515,6 +81053,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "marquise" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , containers, cryptohash, data-binary-ieee754, directory, either + , errors, fast-logger, filepath, hashable, hslogger, hspec + , lifted-async, mmorph, monad-control, monad-logger, mtl + , old-locale, optparse-applicative, packer, pipes, pipes-attoparsec + , pipes-bytestring, pipes-group, semigroups, siphash, text, time + , transformers, transformers-base, unix, unordered-containers + , vaultaire-common, zeromq4-haskell + }: + mkDerivation { + pname = "marquise"; + version = "4.0.0"; + sha256 = "1w2lvns840hdzyismdwv70s70qd2af2ms14y58nhp24yf6h58j7b"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async attoparsec base binary bytestring containers cryptohash + data-binary-ieee754 directory either errors fast-logger filepath + hashable hslogger lifted-async mmorph monad-control monad-logger + mtl old-locale optparse-applicative packer pipes pipes-attoparsec + pipes-bytestring pipes-group semigroups siphash text time + transformers transformers-base unix unordered-containers + vaultaire-common zeromq4-haskell + ]; + testDepends = [ base bytestring hspec ]; + description = "Client library for Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "marxup" = callPackage ({ mkDerivation, base, configurator, containers, cubicbezier , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens @@ -80797,8 +81365,8 @@ self: { ({ mkDerivation, base, containers, vector }: mkDerivation { pname = "maximal-cliques"; - version = "0.1"; - sha256 = "1kjmjsvxf35sapqq7vhiyd5fc73wj1c0l11hvc41x7pkw87qm83v"; + version = "0.1.1"; + sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh"; buildDepends = [ base containers vector ]; description = "Enumerate all maximal cliques of a graph"; license = stdenv.lib.licenses.bsd3; @@ -81142,7 +81710,9 @@ self: { mkDerivation { pname = "memcached-binary"; version = "0.2.0"; + revision = "2"; sha256 = "137vb065f744jq3avpraqryzspch78vc5krp0fw2zzcbk5cm92ad"; + editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530"; buildDepends = [ base bytestring data-default-class network resource-pool storable-endian time unordered-containers @@ -81150,7 +81720,6 @@ self: { testDepends = [ base bytestring data-default-class hspec HUnit network process ]; - jailbreak = true; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; @@ -81161,6 +81730,7 @@ self: { mkDerivation { pname = "memexml"; version = "0.0.2"; + revision = "1"; sha256 = "07cmjx10wbpfcblnd23rzdkma04nyjcpd1g58gp0phajj6xj4i7a"; editedCabalFile = "a1712ea7643a27f1fb40a771fdae76282818b5d317fe8da6a22e705b06bc3b3e"; buildDepends = [ base hxt ]; @@ -81423,8 +81993,8 @@ self: { ({ mkDerivation, base, containers, lens, mtl, template-haskell }: mkDerivation { pname = "mgeneric"; - version = "0.0.0.0"; - sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk"; + version = "0.0.0.2"; + sha256 = "1pgmgssysl0nv9z4vvlmxjijl6y7jvy1b7ph30jnj3fmcrwdf6w3"; buildDepends = [ base containers lens mtl template-haskell ]; homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/"; description = "Generics with multiple parameters"; @@ -81832,6 +82402,7 @@ self: { mkDerivation { pname = "minimal-configuration"; version = "0.1.1"; + revision = "1"; sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43"; editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80"; buildDepends = [ base containers directory filepath tconfig ]; @@ -82678,6 +83249,7 @@ self: { mkDerivation { pname = "monad-lrs"; version = "0.0.2.1"; + revision = "1"; sha256 = "01i8hz50r3lf8r3rasl96blr6br3p1x6hvckhbi8aw61x507jmcg"; editedCabalFile = "dd714797826911e564a0e418307530fa99a8ba9ea91400517be2bb78b4e695c1"; buildDepends = [ base containers ]; @@ -82724,6 +83296,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-open" = callPackage + ({ mkDerivation, base, exceptions, mtl, transformers }: + mkDerivation { + pname = "monad-open"; + version = "0.1.0.0"; + sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx"; + buildDepends = [ base exceptions mtl transformers ]; + jailbreak = true; + description = "Open recursion for when you need it"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-ox" = callPackage ({ mkDerivation, base, containers, mtl, text, vector }: mkDerivation { @@ -82823,6 +83407,7 @@ self: { mkDerivation { pname = "monad-peel"; version = "0.1.1"; + revision = "1"; sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l"; editedCabalFile = "64e1f99ea3e8c36d5d4e86794d1fc02966e7036b43ae4e1dcf01ade192962611"; buildDepends = [ base extensible-exceptions transformers ]; @@ -83356,22 +83941,22 @@ self: { "mono-traversable" = callPackage ({ mkDerivation, base, bytestring, comonad, containers, dlist - , dlist-instances, foldl, hashable, hspec, QuickCheck + , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck , semigroupoids, semigroups, text, transformers , unordered-containers, vector, vector-algorithms, vector-instances }: mkDerivation { pname = "mono-traversable"; - version = "0.9.0.1"; - sha256 = "1wcl2cv16855kg9kn3cz3947jzcb3g2n3mqnhkp0spd42ya3jw83"; + version = "0.9.1"; + sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers vector vector-algorithms vector-instances ]; testDepends = [ - base bytestring containers foldl hspec QuickCheck semigroups text - transformers unordered-containers vector + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector ]; homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; @@ -83681,7 +84266,9 @@ self: { mkDerivation { pname = "mp"; version = "0.2.2"; + revision = "1"; sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; + editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -83690,7 +84277,7 @@ self: { unordered-containers utf8-string vty vty-ui ]; jailbreak = true; - homepage = "http://code.google.com/p/linux-music-player"; + homepage = "https://bitbucket.org/borekpiotr/linux-music-player"; description = "Music player for linux"; license = "GPL"; }) {}; @@ -83819,6 +84406,7 @@ self: { mkDerivation { pname = "mqtt-hs"; version = "0.2.0"; + revision = "1"; sha256 = "0jvzr6qbmdxl11j8fwnbasgqgdfm395lm2gh2va9zfpk5xpx0mjg"; editedCabalFile = "aa0a2e9ea99cfbed4646ac02625b66361f8175ae2d70efc041dc517119706439"; buildDepends = [ @@ -84164,17 +84752,17 @@ self: { }) {}; "multiarg" = callPackage - ({ mkDerivation, barecheck, base, QuickCheck, quickpull - , utf8-string + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck + , tasty-th, utf8-string }: mkDerivation { pname = "multiarg"; - version = "0.30.0.4"; - sha256 = "0bnzlz5na6fbw870vmvxd4jr71fdkdkxs7dd820p772b1pzfg1g5"; + version = "0.30.0.6"; + sha256 = "0zikmmspyk9klw44zf39qfg8c72cq9aipsdcxaldim2wzajfxrlx"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; - testDepends = [ barecheck base QuickCheck quickpull ]; + testDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th ]; homepage = "https://github.com/massysett/multiarg"; description = "Command lines for options that take multiple arguments"; license = stdenv.lib.licenses.bsd3; @@ -84909,6 +85497,7 @@ self: { mkDerivation { pname = "myTestlll"; version = "1.0.0"; + revision = "4"; sha256 = "1rd3pxc20xwb3j0q9ckygy59mks8p38vzmi4wfg8zp1dq92jmhy0"; editedCabalFile = "e554b67c3f8efd73e028328341e3b535dc4898b3d476524a40c236c4c2871e43"; buildDepends = [ @@ -84979,8 +85568,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.1.7"; - sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; + version = "0.1.1.8"; + sha256 = "115xz4khg4klrgjvv9dy83pv197b4y1zgw6fbpv8j88yr3qjmw4h"; buildDepends = [ base bytestring containers ]; buildTools = [ mysql ]; extraLibraries = [ openssl zlib ]; @@ -84996,6 +85585,7 @@ self: { mkDerivation { pname = "mysql-effect"; version = "0.2.0.3"; + revision = "1"; sha256 = "11fpsh4w2zlqdqhk5snb276pcbx4p9g1igs94fympa9asfr2rxm3"; editedCabalFile = "d4474591079b806b8e26d102824d46c7e4c239afb3479ea8d1e8cbd39f015718"; buildDepends = [ @@ -85416,8 +86006,8 @@ self: { }: mkDerivation { pname = "natural-transformation"; - version = "0.1"; - sha256 = "0qs8zfd3pwjr539453w94rddssw85ky695jz8rasn85sxp2kflbc"; + version = "0.2"; + sha256 = "1fxgbjf74kdag42hscplc5sn63z0idz2z2yykk1jz4zp71wa0wdp"; buildDepends = [ base ]; testDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -86004,8 +86594,8 @@ self: { }: mkDerivation { pname = "network-anonymous-i2p"; - version = "0.9.2"; - sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + version = "0.10.0"; + sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg"; buildDepends = [ attoparsec base bytestring exceptions mtl network network-attoparsec network-simple text transformers uuid @@ -86880,15 +87470,26 @@ self: { }) {}; "nicify" = callPackage - ({ mkDerivation, base, parsec, transformers }: + ({ mkDerivation, base, nicify-lib }: mkDerivation { pname = "nicify"; - version = "1.1"; - sha256 = "0m6cbzd1hjgsb5vhhlcx9kvyn7v8bv3h0zll7wlcyp8yaccvik3k"; - isLibrary = true; + version = "1.2.1"; + sha256 = "0qpm18md4jmfznfxqbi9aqvlqrgmiab7b477s11hwcb6y00kyfwk"; + isLibrary = false; isExecutable = true; + buildDepends = [ base nicify-lib ]; + description = "Pretty print the standard output of default `Show` instances"; + license = stdenv.lib.licenses.mit; + }) {}; + + "nicify-lib" = callPackage + ({ mkDerivation, base, parsec, transformers }: + mkDerivation { + pname = "nicify-lib"; + version = "1.0.1"; + sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx"; buildDepends = [ base parsec transformers ]; - description = "Pretty print the standard output of show for algebraic datatypes"; + description = "Pretty print the standard output of default `Show` instances"; license = stdenv.lib.licenses.mit; }) {}; @@ -87761,8 +88362,8 @@ self: { }: mkDerivation { pname = "objective"; - version = "1.0.2"; - sha256 = "01i1wsyxn0kgdgyc91wcqzmz80w6d1h6m1hpn3dnlrl35jjcwxdl"; + version = "1.0.3"; + sha256 = "1b6062isdmy5v6diqsgd8bigkmk4xy83hjglqrfns4n1a5c3fgzg"; buildDepends = [ base containers either exceptions free hashable monad-stm profunctors stm transformers unordered-containers void witherable @@ -88143,19 +88744,20 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, attoparsec, base, case-insensitive, contravariant - , old-locale, postgresql-simple, pretty, product-profunctors - , profunctors, semigroups, text, time, transformers, uuid + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , case-insensitive, contravariant, postgresql-simple, pretty + , product-profunctors, profunctors, semigroups, text, time + , time-locale-compat, transformers, uuid }: mkDerivation { pname = "opaleye"; - version = "0.3.1"; - sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; - editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd"; + version = "0.3.1.2"; + sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9"; buildDepends = [ - attoparsec base case-insensitive contravariant old-locale - postgresql-simple pretty product-profunctors profunctors semigroups - text time transformers uuid + attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid ]; testDepends = [ base postgresql-simple product-profunctors profunctors time @@ -88703,6 +89305,7 @@ self: { mkDerivation { pname = "optparse-applicative"; version = "0.10.0"; + revision = "1"; sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb"; editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0"; buildDepends = [ @@ -89138,6 +89741,7 @@ self: { mkDerivation { pname = "packedstring"; version = "0.1.0.1"; + revision = "1"; sha256 = "1x78pzzdlnpcmh9p37rlf8m5cxf3yqm2alf3whl4zpr9w25r0qj8"; editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf"; buildDepends = [ array base ]; @@ -89236,20 +89840,21 @@ self: { ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions , generics-sop, http-client, http-types, lens, lens-aeson, mmorph - , monad-control, mtl, template-haskell, text, time, transformers - , transformers-base, unordered-containers + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers }: mkDerivation { pname = "pagerduty"; - version = "0.0.1.1"; - sha256 = "0k3jj18vs1mp7k6jdqgrvs1nyzkc6gxcqnqp560nvfxpj18km9cb"; + version = "0.0.3"; + sha256 = "1jqg7k0vr78fv5cv0rn74v8p5jd4wvv6l5nc5xdwh46b7rjwcpj1"; buildDepends = [ aeson base bifunctors bytestring bytestring-conversion conduit data-default-class exceptions generics-sop http-client http-types lens lens-aeson mmorph monad-control mtl template-haskell text time - transformers transformers-base unordered-containers + time-locale-compat transformers transformers-base + transformers-compat unordered-containers ]; - jailbreak = true; homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; @@ -89541,6 +90146,7 @@ self: { mkDerivation { pname = "parallel-io"; version = "0.3.3"; + revision = "1"; sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee"; isLibrary = true; @@ -89733,11 +90339,11 @@ self: { }: mkDerivation { pname = "parsec"; - version = "3.1.8"; - sha256 = "01vqk7krbhy6bf30ydjdjvbzx5ynjdbc3dwlhzinzq6a69a6brlq"; + version = "3.1.9"; + sha256 = "1ja20cmj6v336jy87c6h3jzjp00sdbakwbdwp11iln499k913xvi"; buildDepends = [ base bytestring mtl text ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + homepage = "https://github.com/aslatter/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -89873,6 +90479,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parseerror-eq" = callPackage + ({ mkDerivation, base, hspec, parsec }: + mkDerivation { + pname = "parseerror-eq"; + version = "0.1.0.0"; + sha256 = "1vyghahkmsvd6nj5armf2i3plnzp7mkcnx4a999c3yzxpic71vic"; + buildDepends = [ base parsec ]; + testDepends = [ base hspec parsec ]; + homepage = "https://github.com/stackbuilders/parseerror-eq"; + description = "Adds and Eq instance for Parsec's ParseError if needed"; + license = stdenv.lib.licenses.mit; + }) {}; + "parsek" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -89990,6 +90609,7 @@ self: { mkDerivation { pname = "partial"; version = "0.1.0.0"; + revision = "1"; sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8"; editedCabalFile = "f49cbb0cfb2f101a006bb54ada3982ae85b6413d019fd92927ce259b3666e172"; buildDepends = [ base ]; @@ -91068,8 +91688,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.1.2.1"; - sha256 = "079imqgx7ad6gl8x8drcdqfhw137k4n6rdb3j69sppq9aka9b72b"; + version = "2.1.3"; + sha256 = "1k1sjzxz96z6pgk4012v8p4w6scgm4g2j5fs4sjgsj9azp3b7gwh"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -91110,8 +91730,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.2.2"; - sha256 = "0hhxhzpivv63rxknrn2rpmxlmza8cd8hq1g7qiap4shn4s58r5nb"; + version = "2.1.3"; + sha256 = "0hgvpfgbwb1q0zkl5g9hxdz1wh4xbl0hx26j5944qcll5f6298is"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -91198,8 +91818,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.1.2"; - sha256 = "0knp5gr7js4i7a7gps10fdn33019h1k1wz6h3bf08ld1sl88sjha"; + version = "2.1.3"; + sha256 = "1vyfhiwahyfgv6xwbfyn42f19dijbmjshlyy6a5rf0bfllc2k7gf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -91222,8 +91842,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.0.1"; - sha256 = "14jalq90x6czhasc9d8s7j1nylgjhw96ialdqsxvg7iswdp753qx"; + version = "2.1.1"; + sha256 = "1bvmxpx8dqqsq87v079sw8wy795iykkz0fknrlpxhywja2j40dxc"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -91412,9 +92032,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "7.77"; - sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; - editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; + version = "8.0"; + sha256 = "1pll0zr16f1h53vcsbbd69x8kkim165mvlgmlgdpf4p9gll01pra"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -91688,8 +92307,8 @@ self: { }: mkDerivation { pname = "picoparsec"; - version = "0.1.1"; - sha256 = "1b2dxms5bdiz2cci488cnar65jwv6mknhnm3qcff49ax4y9w8gi2"; + version = "0.1.2"; + sha256 = "1h6d04h72h4cckxh6b16336v47mn7f3ybslzzimg8nmi2yldn0b9"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -91753,8 +92372,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.2"; - sha256 = "0bvgijrgpv0yc8hkzj9mbm94z6v5s9w8ghjjm9ynh0qrpyf1dlli"; + version = "0.4"; + sha256 = "0vn5fy15yshr9ypz8qagnqsgkkn33qv19ayqp4fy5x5bv68y7a0b"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams http-types io-streams mtl network old-locale random text time @@ -91891,6 +92510,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-cliff" = callPackage + ({ mkDerivation, async, base, bytestring, pipes, pipes-concurrency + , pipes-safe, process + }: + mkDerivation { + pname = "pipes-cliff"; + version = "0.6.0.0"; + sha256 = "1rlv19imipfjws9zhn0vf3vnnrfmx4laq5npz02fg41sk2gpincq"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base bytestring pipes pipes-concurrency pipes-safe process + ]; + homepage = "http://www.github.com/massysett/pipes-cliff"; + description = "Streaming to and from subprocesses using Pipes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-concurrency" = callPackage ({ mkDerivation, async, base, pipes, stm }: mkDerivation { @@ -92274,6 +92911,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-zeromq4" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-safe, semigroups + , zeromq4-haskell + }: + mkDerivation { + pname = "pipes-zeromq4"; + version = "0.2.0.0"; + sha256 = "1zlj7vcn3ng11n80a9m37al7y322ph9grq5qxn022vpb82baxwr4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring pipes pipes-safe semigroups zeromq4-haskell + ]; + homepage = "https://github.com/peddie/pipes-zeromq4"; + description = "Pipes integration for ZeroMQ messaging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-zlib" = callPackage ({ mkDerivation, base, bytestring, pipes, transformers, zlib , zlib-bindings @@ -92461,6 +93116,7 @@ self: { mkDerivation { pname = "plivo"; version = "0.2.0.0"; + revision = "1"; sha256 = "16q6jwnbzxhapmkzi2sn1k02z8gq11s9wp555fv7msv2if5axrp0"; editedCabalFile = "7ef78cd34067e8d72872b32bcad9d01537710c11efce159c990aeb4670e4efb3"; buildDepends = [ @@ -92763,14 +93419,18 @@ self: { }) {}; "pointful" = callPackage - ({ mkDerivation, base, containers, haskell-src, mtl, syb }: + ({ mkDerivation, base, containers, haskell-src-exts, mtl, syb + , transformers + }: mkDerivation { pname = "pointful"; - version = "1.0.2"; - sha256 = "00xlxgdajkbi5d6gv88wdpwm16xdryshszz5qklryi0p65mmp99p"; - isLibrary = false; + version = "1.0.6"; + sha256 = "151cyy324g6cl5bdwcpbvcvpavj3x2592jbic1jq5q3fgahf5wqk"; + isLibrary = true; isExecutable = true; - buildDepends = [ base containers haskell-src mtl syb ]; + buildDepends = [ + base containers haskell-src-exts mtl syb transformers + ]; homepage = "http://github.com/23Skidoo/pointful"; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; @@ -92852,13 +93512,12 @@ self: { }: mkDerivation { pname = "pokitdok"; - version = "4.1.0.1"; - sha256 = "0cnrda2ahsam07pcn079wvq18hxjpyxik6qnqi5bzrdps9dwgl80"; + version = "4.1.0.2"; + sha256 = "08pknbn79hihkil1vcpr7a8ilah3i5b6lnlc41bmprycyqz5vj1w"; buildDepends = [ aeson base base64-string bytestring case-insensitive directory hex HTTP http-client http-conduit http-types strict text time ]; - jailbreak = true; homepage = "https://platform.pokitdok.com"; description = "PokitDok Platform API Client for Haskell"; license = stdenv.lib.licenses.mit; @@ -93136,6 +93795,7 @@ self: { mkDerivation { pname = "pool"; version = "0.1.2.1"; + revision = "1"; sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951"; buildDepends = [ base monad-control transformers ]; @@ -93371,8 +94031,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.0.4"; - sha256 = "1cym8c5hjjs7i2gx4n9m7a9zg7dls4wqnnr5bravj7gv2gh9s67q"; + version = "0.2.0.5"; + sha256 = "046y5i4hw4a326r3145yrfd1p6sn3b9xsn6rdk73nv74ks4wrn5v"; buildDepends = [ base bytestring unix ]; testDepends = [ base bytestring doctest HUnit QuickCheck unix ]; description = "POSIX filepath/directory functionality"; @@ -93904,21 +94564,23 @@ self: { }) {}; "prednote" = callPackage - ({ mkDerivation, base, containers, contravariant, QuickCheck - , quickpull, rainbow, split, text, transformers + ({ mkDerivation, base, bytestring, containers, contravariant + , QuickCheck, rainbow, split, tasty, tasty-quickcheck, tasty-th + , text, transformers }: mkDerivation { pname = "prednote"; - version = "0.32.0.0"; - sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh"; + version = "0.32.0.4"; + sha256 = "1w7p8f8xqwkqbhf9a59g2y31rkd84290hsprxvhrn6qka6bfxfcf"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers contravariant rainbow split text transformers + base bytestring containers contravariant rainbow split text + transformers ]; testDepends = [ - base containers contravariant QuickCheck quickpull rainbow split - text transformers + base bytestring containers contravariant QuickCheck rainbow split + tasty tasty-quickcheck tasty-th text transformers ]; homepage = "http://www.github.com/massysett/prednote"; description = "Evaluate and display trees of predicates"; @@ -93952,6 +94614,7 @@ self: { mkDerivation { pname = "prefix-units"; version = "0.1.0.2"; + revision = "1"; sha256 = "07b5s2bsqlaad06dgr5psidfgi1nmgc5c16j6kzayw9f4najjrav"; editedCabalFile = "492d6b953a52678e44a880c5272c30175eed27c3f2bd4de82fc29eee4b4db00a"; buildDepends = [ base ]; @@ -94103,11 +94766,10 @@ self: { ({ mkDerivation, base, containers, pretty, QuickCheck }: mkDerivation { pname = "presburger"; - version = "1.3"; - sha256 = "0chwx0906gsmbnjkf14d864qzfvxb5gzaih7nq7ckfc6icbc4x25"; + version = "1.3.1"; + sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; buildDepends = [ base containers pretty ]; testDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "http://github.com/yav/presburger"; description = "A decision procedure for quantifier-free linear arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -94291,6 +94953,7 @@ self: { mkDerivation { pname = "primitive"; version = "0.5.1.0"; + revision = "1"; sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8"; editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec"; buildDepends = [ base ghc-prim ]; @@ -94304,7 +94967,9 @@ self: { mkDerivation { pname = "primitive"; version = "0.5.4.0"; + revision = "1"; sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; + editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; buildDepends = [ base ghc-prim ]; testDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; @@ -94525,8 +95190,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.3.3.2"; - sha256 = "0kv4fpg5qndqf97c1znhibhzqd5z6mdk38ma72yk3ixkp45rvarh"; + version = "0.3.3.4"; + sha256 = "1cnq7lzrwckyhd829ir8h1rbh404yw0m40lka7sl23i7mak51mbp"; buildDepends = [ base bytestring deepseq ListLike process text ]; homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; @@ -94626,13 +95291,13 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.6.7.0"; - sha256 = "08j6yf2ma7w3nqcv9bslykvm4mp0pws1n538fvsq2j2dnzxq3f1h"; + version = "0.7.0.1"; + sha256 = "1dnarvm26xwrys8wjh43757r59pby41w5cizqwyg1zcr2qk7awd8"; buildDepends = [ - base bifunctors conceit containers contravariant foldl free pipes - pipes-bytestring pipes-concurrency pipes-parse pipes-safe - pipes-text process semigroups text transformers transformers-compat - void + base bifunctors bytestring conceit containers contravariant foldl + free pipes pipes-bytestring pipes-concurrency pipes-parse + pipes-safe pipes-text process semigroups text transformers + transformers-compat void ]; testDepends = [ attoparsec base bifunctors bytestring containers directory doctest @@ -94744,6 +95409,7 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.6"; + revision = "3"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; buildDepends = [ base contravariant profunctors template-haskell ]; @@ -94940,6 +95606,7 @@ self: { mkDerivation { pname = "projection"; version = "0.1"; + revision = "1"; sha256 = "0g9zrdp92w8ygrsmbw4600xaf8d17sm4pq68qd6z7hnf8zps22c1"; editedCabalFile = "805db4a9404200c6d8c00b7e96f95c9c71e3595b6601f75efed7237ad5bed30b"; buildDepends = [ base ]; @@ -95449,8 +96116,8 @@ self: { }: mkDerivation { pname = "pugixml"; - version = "0.3.0"; - sha256 = "0xma82nwl35scc43r8yhd0irhf1d60ssxs3gh6y717cpl29zv5wa"; + version = "0.3.2"; + sha256 = "0pvvx7cd16a7cjp991l487p0vgpkdyv7ic64brz92bkjxgrpw94i"; buildDepends = [ base bytestring data-default-class template-haskell ]; @@ -96255,8 +96922,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.10"; - sha256 = "02qkpgsr1w0fs2c4q9hrhx6m65lqss4f4qnfhb51ljpcaj8p1v6y"; + version = "0.3.11"; + sha256 = "041s6963czs1pz0fc9cx17lgd6p83czqy2nxji7bhxqxwl2j15h2"; buildDepends = [ array base bytestring containers hashable old-time QuickCheck text time unordered-containers @@ -96400,8 +97067,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-unicode"; - version = "1.0.0.0"; - sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq"; + version = "1.0.0.1"; + sha256 = "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4"; buildDepends = [ base QuickCheck ]; homepage = "https://github.com/bos/quickcheck-unicode"; description = "Generator and shrink functions for testing Unicode-related software"; @@ -96660,12 +97327,15 @@ self: { }) {}; "rainbow" = callPackage - ({ mkDerivation, base, terminfo, text }: + ({ mkDerivation, base, bytestring, process, QuickCheck, text }: mkDerivation { pname = "rainbow"; - version = "0.20.4.0"; - sha256 = "1h6rih0dn5ll8sz0j1w1wi9f6b8592fzf7c1mvl1d8bplcgahqhs"; - buildDepends = [ base terminfo text ]; + version = "0.22.0.0"; + sha256 = "0357yn0dqhmcpy6k661xwlyj7a3nfmj3qci55dkc126mdl66ibf1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base bytestring process text ]; + testDepends = [ base bytestring process QuickCheck text ]; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -96687,18 +97357,18 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, array, barecheck, base, ChasingBottoms, QuickCheck - , rainbow, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, array, base, bytestring, ChasingBottoms + , QuickCheck, rainbow, tasty, tasty-quickcheck, text, transformers }: mkDerivation { pname = "rainbox"; - version = "0.10.0.0"; - sha256 = "0yq9xk11rckdb72hqis0mwff82qm4hk2nahgns3fr5fxg4c7wrj1"; + version = "0.10.0.2"; + sha256 = "1s08p7ckni17q15p059nccpyq19iw5chfy28m1k8c6vm4fcrkjyw"; isLibrary = true; isExecutable = true; - buildDepends = [ array base rainbow text transformers ]; + buildDepends = [ array base bytestring rainbow text transformers ]; testDepends = [ - array barecheck base ChasingBottoms QuickCheck rainbow tasty + array base bytestring ChasingBottoms QuickCheck rainbow tasty tasty-quickcheck text transformers ]; homepage = "http://www.github.com/massysett/rainbox"; @@ -97619,6 +98289,7 @@ self: { mkDerivation { pname = "reasonable-operational"; version = "0.1.0.1"; + revision = "1"; sha256 = "18d49rzpygbsd17d9hz79bbgj6jznlx2jzhkw43gzw3rhvklwyh9"; editedCabalFile = "963ed294ec0f951858022c25b9713b06e65d2a05098068a1183110e298b5c8cf"; buildDepends = [ base ]; @@ -97656,6 +98327,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "record-gl" = callPackage + ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit + , linear, OpenGL, record, tagged, template-haskell, test-framework + , test-framework-hunit, vector + }: + mkDerivation { + pname = "record-gl"; + version = "0.1.0.0"; + revision = "1"; + sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq"; + editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85"; + buildDepends = [ + base base-prelude containers GLUtil linear OpenGL record tagged + template-haskell vector + ]; + testDepends = [ + base HUnit linear OpenGL record tagged test-framework + test-framework-hunit + ]; + description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "records" = callPackage ({ mkDerivation, base, kinds, type-functions }: mkDerivation { @@ -97797,6 +98491,7 @@ self: { mkDerivation { pname = "redis-resp"; version = "0.3.2"; + revision = "1"; sha256 = "07lvgq2l2fahhc9z3hjjjpx3n4rzdxl2l2ww9brxnv23432xpz97"; editedCabalFile = "74f97af6250dcf3b26d424e5a53a4a9bdcda5de4f7f4d5fc4d6b686f60f6d931"; buildDepends = [ @@ -97868,6 +98563,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reexport-crypto-random" = callPackage + ({ mkDerivation, base, crypto-api }: + mkDerivation { + pname = "reexport-crypto-random"; + version = "0.1.0.0"; + sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9"; + buildDepends = [ base crypto-api ]; + license = stdenv.lib.licenses.gpl2; + }) {}; + "ref" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -98031,17 +98736,18 @@ self: { "reflex" = callPackage ({ mkDerivation, base, containers, dependent-map, dependent-sum - , lens, mtl, primitive, semigroups, template-haskell, these + , mtl, primitive, semigroups, template-haskell, these }: mkDerivation { pname = "reflex"; - version = "0.0.1"; - sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; + version = "0.1.0"; + sha256 = "1l64kz1haicq4qfw5nrn93jrv37c93zz6z0xkhjnm5rxff7qrdns"; buildDepends = [ - base containers dependent-map dependent-sum lens mtl primitive + base containers dependent-map dependent-sum mtl primitive semigroups template-haskell these ]; jailbreak = true; + homepage = "https://github.com/ryantrinkle/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99033,7 +99739,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "repa-array" = callPackage ({ mkDerivation, base, bytestring, double-conversion, mtl @@ -99111,7 +99817,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "repa-fftw" = callPackage ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty @@ -99764,6 +100470,7 @@ self: { mkDerivation { pname = "rest-wai"; version = "0.1.0.7"; + revision = "1"; sha256 = "0agvs26x26cgzls66jx7pj2qdn01snjr11rv7sd3x3h4g3ww375v"; editedCabalFile = "1b15b246eb06e388c3ac37b6a7eb5697109f04f085a46ced92d9e4e809841981"; buildDepends = [ @@ -99843,22 +100550,24 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , containers, data-default, doctest, mtl, network, scientific, text - , time, unordered-containers, utf8-string, vector + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, containers, data-default, doctest, mtl, network + , scientific, text, time, unordered-containers, utf8-string, vector }: mkDerivation { pname = "rethinkdb"; - version = "1.15.2.1"; - sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5"; + version = "1.16.0.0"; + sha256 = "125gg719isf60yv5yj0frkg92bp42cb43d4qzs7jqic1wvhx32yy"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector + aeson attoparsec base base64-bytestring binary bytestring + containers data-default mtl network scientific text time + unordered-containers utf8-string vector ]; testDepends = [ base doctest ]; homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 1.15"; + description = "A driver for RethinkDB 1.16"; license = stdenv.lib.licenses.asl20; }) {}; @@ -101759,14 +102468,14 @@ self: { "satchmo" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , minisat, mtl, process + , lens, minisat, mtl, process }: mkDerivation { pname = "satchmo"; - version = "2.9.6"; - sha256 = "0k2h3q71y7bkhkfwj53wabf7ga1z27001y5cxahpgphaa8q5fgvp"; + version = "2.9.7.1"; + sha256 = "1wrbf5mnk4f1m40dw2pyp66g76rvhqbxv7qwdx6lha2wjx7z1020"; buildDepends = [ - array base bytestring containers directory minisat mtl process + array base bytestring containers directory lens minisat mtl process ]; testDepends = [ array base ]; homepage = "https://github.com/jwaldmann/satchmo"; @@ -102099,6 +102808,7 @@ self: { mkDerivation { pname = "scholdoc"; version = "0.1.3"; + revision = "1"; sha256 = "0dsbr4nk56cmbgdnk91s39lc4qp2wb39hkyisaf4f1n6nmx8zmn4"; editedCabalFile = "bbe7070ca2ca48d86095c9a45120d2bfbf6a480b3894117d70e0f8e3ccabb435"; isLibrary = true; @@ -102133,6 +102843,7 @@ self: { mkDerivation { pname = "scholdoc-citeproc"; version = "0.6"; + revision = "1"; sha256 = "0wy8cwr933zcqb85qscj9l9qcl2xv8mkbd2g9b4gs7c1k5b6khll"; editedCabalFile = "33a066de8000d8bdb0a8f04f71baca64e27f4a2bb2d2a330f6d5a7f81090b118"; isLibrary = true; @@ -102391,7 +103102,9 @@ self: { mkDerivation { pname = "scotty"; version = "0.9.1"; + revision = "1"; sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm"; + editedCabalFile = "5a0fefbeb7107a096658d4f0743084bd26e9b0c84853fd560715b0aa46c5802a"; buildDepends = [ aeson base blaze-builder bytestring case-insensitive data-default http-types monad-control mtl regex-compat text transformers @@ -102593,8 +103306,8 @@ self: { }: mkDerivation { pname = "scroll"; - version = "1.20150314"; - sha256 = "10snsi42a0jzz87fa99zdyp9dg4i7ywd83hfg2yb8nn218f2hf0z"; + version = "1.20150323"; + sha256 = "06nzvvqn592jgf93zck74w1nhzjq0llzypsy7x575ljvprb3ph0d"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -102743,6 +103456,7 @@ self: { mkDerivation { pname = "sdl2-ttf"; version = "0.2.0"; + revision = "1"; sha256 = "0ikdkzzzh3wwzypas5bd6wcm17cckxj2qyqkw6y76v0k2kpnzc35"; editedCabalFile = "25cb57affc8ad5bb0ff533037512a39803f4fcd961cb2aca3632f0ab7dc2540b"; buildDepends = [ base sdl2 ]; @@ -103096,6 +103810,7 @@ self: { mkDerivation { pname = "semigroupoids"; version = "4.3"; + revision = "1"; sha256 = "1qn0rffc1zskk6f34pxrp96iarxgp36l2404rs6sz9khl1hh58sf"; editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3"; buildDepends = [ @@ -103199,8 +103914,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.2"; - sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz"; + version = "0.3.3"; + sha256 = "1gc4g4qva3w4vrxh1pca49rm0s245zq81bg1qxyfbbp29f7zp5ay"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -103384,14 +104099,15 @@ self: { "seqloc-datafiles" = callPackage ({ mkDerivation, attoparsec, base, biocore, bytestring, cmdtheline - , conduit, conduit-extra, filepath, hashable, iteratee, lifted-base - , monads-tf, pretty, QuickCheck, random, resourcet, seqloc - , transformers, transformers-base, unordered-containers, vector + , conduit, conduit-extra, directory, filepath, hashable, iteratee + , lifted-base, monads-tf, pretty, process, QuickCheck, random + , resourcet, seqloc, transformers, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "seqloc-datafiles"; - version = "0.4"; - sha256 = "0bmgg41123c1rhq6d1vq8x6ci435smaancm8gcg9iirhxi5wwvp5"; + version = "0.4.2"; + sha256 = "175nifix2vax5xsinz604mm3nid7krh5a9d7gqpy02wh4f5qdrja"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -103400,6 +104116,11 @@ self: { random resourcet seqloc transformers transformers-base unordered-containers vector ]; + testDepends = [ + attoparsec base biocore bytestring conduit conduit-extra directory + hashable iteratee lifted-base process QuickCheck random seqloc + transformers transformers-base unordered-containers vector + ]; homepage = "http://www.ingolia-lab.org/seqloc-datafiles-tutorial.html"; description = "Read and write BED and GTF format genome annotations"; license = stdenv.lib.licenses.mit; @@ -103845,6 +104566,7 @@ self: { mkDerivation { pname = "setenv"; version = "0.1.1.3"; + revision = "1"; sha256 = "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73"; editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b"; buildDepends = [ base unix ]; @@ -103914,6 +104636,7 @@ self: { mkDerivation { pname = "sexp-show"; version = "0.1.1.0"; + revision = "1"; sha256 = "1ip1y1y2z2d6ib3ihq18j93081cp2lkwjm27bc0d0ihixd154gy5"; editedCabalFile = "314f05a4542c657517d485faa31ec23324458782cf0112acda948fb7092a154c"; isLibrary = false; @@ -103971,7 +104694,9 @@ self: { mkDerivation { pname = "sfmt"; version = "0.1.0"; + revision = "1"; sha256 = "1amfcnh3jrb54zpl6vrdmngqvmjiczzinhq3r9gx9hb1r635v04x"; + editedCabalFile = "e0b52289bb67a211186ecaa0f45275870e792430d71929cf4f1a66f29da071a4"; buildDepends = [ base bytestring entropy primitive ]; homepage = "https://github.com/philopon/sfmt-hs"; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; @@ -104137,8 +104862,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.14.3"; - sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl"; + version = "0.15"; + sha256 = "02zqkm248fvv6nh10nj6rw7ks5w832q2zrzzk9z9gp1zrqnbhxhk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104213,6 +104938,7 @@ self: { version = "0.1.2"; sha256 = "1xsh6bjrr0l4vqn8iqlkv8s0y5qwaqqz3yjlxk0y3fsi1qz28yxs"; buildDepends = [ base bytestring css-text hjsmin shake text ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; license = stdenv.lib.licenses.bsd3; @@ -104225,6 +104951,7 @@ self: { version = "0.1.0"; sha256 = "158xjn4lzcj8gk4b9z4rhql7mqdp7v5x8rpc0sb3mlws2drr8yh0"; buildDepends = [ base bytestring bzlib shake tar ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Actions"; license = stdenv.lib.licenses.bsd3; @@ -105455,6 +106182,7 @@ self: { mkDerivation { pname = "simpleirc-lens"; version = "0.1.0.0"; + revision = "2"; sha256 = "0lr4zrp8h7xgg8zsznawqkkzh3pvlzfw5hl6n0hss5ramb71ccy5"; editedCabalFile = "618750d5b230316747d59d784bd40481a4404443316fc9c3a73e1349e3d10975"; buildDepends = [ base bytestring simpleirc ]; @@ -105505,6 +106233,7 @@ self: { mkDerivation { pname = "simplesmtpclient"; version = "0.2"; + revision = "1"; sha256 = "0z8g82222nvh3yhn8qisr8qqnsv02zxjyzs32qrcg2pshbd5mdj8"; editedCabalFile = "e6021c7bbf5e50c15433dca491f4618483229203c810a7b71e7c42094e13ad25"; buildDepends = [ array base directory network old-time ]; @@ -106092,6 +106821,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smartconstructor" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "smartconstructor"; + version = "0.1.0.0"; + sha256 = "1iq9803ijx9497lc49mmvq8anm8r6ww0gysc693gq0ixf8ga2f8y"; + buildDepends = [ base template-haskell ]; + homepage = "http://github.com/frerich/smartconstructor"; + description = "A package exposing a helper function for generating smart constructors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smartword" = callPackage ({ mkDerivation, base, haskell98, pretty, unix, utf8-string }: mkDerivation { @@ -106456,6 +107197,7 @@ self: { mkDerivation { pname = "snap-extras"; version = "0.9"; + revision = "1"; sha256 = "143n0y3cavfgn6f40sh7i441q77ys4lkfv0g9cai714n7yr0ya1v"; editedCabalFile = "3a360180bc4463874da336da5b4f1271a1cce298ca36cf9407a04823d4df58d8"; buildDepends = [ @@ -106477,6 +107219,7 @@ self: { mkDerivation { pname = "snap-loader-dynamic"; version = "0.10.0.2"; + revision = "1"; sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7"; editedCabalFile = "2f64bcfd0c84d6f6f161c4418778e5c463d127a383c2f3f8216155d161d87d7d"; buildDepends = [ @@ -106533,6 +107276,7 @@ self: { mkDerivation { pname = "snap-server"; version = "0.9.4.6"; + revision = "1"; sha256 = "01qfqc63qwq604s5vy0sln7l9zhqndyqbb1y1xf397rrn97xhrpp"; editedCabalFile = "32c4388b62e047caebb4a51bd79cb592032a0cb4f2aa56c7eb8bff15e85588bf"; buildDepends = [ @@ -106613,6 +107357,7 @@ self: { mkDerivation { pname = "snaplet-acid-state"; version = "0.2.6.1"; + revision = "1"; sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; buildDepends = [ acid-state base snap text ]; @@ -107468,6 +108213,7 @@ self: { buildDepends = [ base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random ]; + jailbreak = true; homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; @@ -107481,9 +108227,8 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.2.4"; - sha256 = "03zqbdmk44jds6sqaq90rr5zprnrw524c084jndl9hgq4gd4d39c"; - editedCabalFile = "2599e7a2bf2c9f599571acb194625003de1237fe2031a39113a7a83805c2884c"; + version = "0.2.2.5"; + sha256 = "1imh9g2my0d981prai69yr9yf7linvaijcn80zlyaz44pasxnrw7"; buildDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -107493,7 +108238,6 @@ self: { base bytestring hspec HUnit text unordered-containers xml-conduit xml-conduit-writer ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; @@ -107506,13 +108250,12 @@ self: { }: mkDerivation { pname = "soap-openssl"; - version = "0.1.0.1"; - sha256 = "0b0d15nvg9qhf0ccsmw53qpcnxsw2cqslkmfzr1hw90whzaw3l5h"; + version = "0.1.0.2"; + sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; buildDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; @@ -107526,13 +108269,12 @@ self: { }: mkDerivation { pname = "soap-tls"; - version = "0.1.1.1"; - sha256 = "1vcmpcq7yw65v90cg1v279mvyvrvibi6zf71vf7d21jzxpldskih"; + version = "0.1.1.2"; + sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4"; buildDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using tls package)"; license = stdenv.lib.licenses.mit; @@ -108378,6 +109120,7 @@ self: { mkDerivation { pname = "split"; version = "0.2.2"; + revision = "1"; sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr"; editedCabalFile = "9098e40414e8491b0a400f5874408e577a444c4eadf1e03fb4ea6dfcc32e30c4"; buildDepends = [ base ]; @@ -108479,6 +109222,7 @@ self: { mkDerivation { pname = "spoon"; version = "0.3.1"; + revision = "1"; sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr"; editedCabalFile = "e46c5e919cc9d0c7b0f671cddb631ef0979622a1e2250c59c7e491a799944527"; buildDepends = [ base deepseq ]; @@ -109060,6 +109804,57 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stackage-curator" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal + , classy-prelude-conduit, conduit, conduit-extra, containers + , data-default-class, directory, filepath, hspec, http-client + , http-client-tls, http-conduit, mono-traversable, mtl, old-locale + , optparse-applicative, process, QuickCheck, semigroups + , stackage-types, stm, streaming-commons, system-fileio + , system-filepath, tar, temporary, text, time, transformers + , unix-compat, utf8-string, xml-conduit, yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.7.0.1"; + sha256 = "0w1z3h10vwinvjqkgbiq12fslqxd3ix3br004jz54vscs5i81dch"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson async base bytestring Cabal classy-prelude-conduit conduit + conduit-extra containers data-default-class directory filepath + http-client http-client-tls http-conduit mono-traversable mtl + old-locale optparse-applicative process semigroups stackage-types + stm streaming-commons system-fileio system-filepath tar temporary + text time transformers unix-compat utf8-string xml-conduit yaml + zlib + ]; + testDepends = [ + base Cabal classy-prelude-conduit containers hspec http-client + http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; + }) {}; + + "stackage-types" = callPackage + ({ mkDerivation, aeson, base, Cabal, containers, exceptions + , hashable, semigroups, text, unordered-containers, vector + }: + mkDerivation { + pname = "stackage-types"; + version = "1.0.0"; + sha256 = "17077awl2bfrhpdlqsl4dxb7hxq4dr5hxqcviyv1cbxlk6z38a4z"; + buildDepends = [ + aeson base Cabal containers exceptions hashable semigroups text + unordered-containers vector + ]; + homepage = "https://github.com/fpco/stackage-types"; + description = "Shared data types between various Stackage packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "standalone-haddock" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , optparse-applicative @@ -109325,8 +110120,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.13.2.1"; - sha256 = "0giibqpnjndnhvxqsr8ikcxxfhz3ws0mk3ckykq2sfwz7gkipvva"; + version = "0.13.2.3"; + sha256 = "1gbghzbacfrm7vn24ssx7wz9sycafxk9b306zm6cdlsr954v296n"; buildDepends = [ aeson base binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms vector-binary-instances @@ -109767,6 +110562,7 @@ self: { mkDerivation { pname = "stm-queue-extras"; version = "0.2.0.0"; + revision = "1"; sha256 = "1qd6zsr2lkkg5yxp72l38h00b2xj40jn38qx9sfvgpss6rkda40s"; editedCabalFile = "0c90122c2c5998a0b60d00506effde335dbd71ad60bc1b798759a05d4fb3193b"; buildDepends = [ base stm stm-chans ]; @@ -110695,8 +111491,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.5.11.1"; - sha256 = "18d5f25wsjryvh7pzj9wsra5pcna484v4yq8fpdbbic2cp2j3vg1"; + version = "0.5.11.2"; + sha256 = "1rbr1vkrlbvqijhrqq3f1dq8vn0q12832rlkbynmnknn6a682n8x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111484,6 +112280,7 @@ self: { mkDerivation { pname = "syntax"; version = "1.0.0.0"; + revision = "1"; sha256 = "1dhbzbf1zlpfjhnacqfhzvjznwlzv39c12a3y8ivqhplnkmqsm7x"; editedCabalFile = "7f3d7f3a8c8aedb78145f4d8a992815cdb644d839a5431b23e5fad0a62d7dd5c"; buildDepends = [ @@ -111840,8 +112637,8 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.1"; - sha256 = "037p2i5gmcnw3qqh3yhn700w51kkyc7rpw9c77wlgdq5bgbyfkbk"; + version = "0.3.16.2"; + sha256 = "17mk1crlgrh9c9lfng6a2fdk49m2mbkkdlq5iysl1rzwkn12mmkd"; buildDepends = [ base bytestring system-filepath text time unix ]; testDepends = [ base bytestring chell system-filepath temporary text time @@ -112532,6 +113329,7 @@ self: { mkDerivation { pname = "takahashi"; version = "0.2.0.2"; + revision = "1"; sha256 = "0iwwmb0przjjgfz9xav4whgqh09dq4ndil29dmq2bp81wryay0l4"; editedCabalFile = "907771d78ac3db503a9d832bae2dcc3a20d03a3a7698ff7769cb9e84703b27a1"; buildDepends = [ base mtl reasonable-lens reasonable-operational ]; @@ -112793,8 +113591,8 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.2.2.4"; - sha256 = "096c4h306r4z7wq8nm94mwmdndm0mwd6hhiqf77iilpdndasrl1c"; + version = "2.3"; + sha256 = "0irqf7sx0s937ahjgjxdmxj4afxd4qvnflry538zazikgb9s51pz"; buildDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary-rc @@ -113159,6 +113957,7 @@ self: { mkDerivation { pname = "teeth"; version = "0.1.0.0"; + revision = "1"; sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl"; editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416"; buildDepends = [ base ]; @@ -113916,6 +114715,7 @@ self: { mkDerivation { pname = "testing-feat"; version = "0.4.0.2"; + revision = "1"; sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j"; editedCabalFile = "0168dde1e9ac0e7a1f80a33c12a6c5d2b7c5e59e4dcd060ffb8d82f100c4dd3f"; buildDepends = [ base mtl QuickCheck tagshare template-haskell ]; @@ -113998,6 +114798,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tex2txt" = callPackage + ({ mkDerivation, base, containers, deepseq, parsec }: + mkDerivation { + pname = "tex2txt"; + version = "0.1.0.0"; + sha256 = "1q41kphll7xhbccwyvlsvk5vxisig23ipmcqf7v9qc3rx1hb0p0w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base containers deepseq parsec ]; + homepage = "http://textmining.lt/tex2txt/"; + description = "LaTeX to plain-text conversion"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb @@ -114212,8 +115026,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit, text, text-format }: mkDerivation { pname = "text-manipulate"; - version = "0.1.2.1"; - sha256 = "1cr1f0d7xxj6nr5rlqhnijjrd5k7xpfamqdd8j9pbwx2qi91vimz"; + version = "0.1.3"; + sha256 = "0f8xfgsvj50x1br9r4szc94y9hycwgdnjmpwn2h4840kdcpds780"; buildDepends = [ base text text-format ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/text-manipulate"; @@ -114286,21 +115100,22 @@ self: { "text-show" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, nats - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, transformers - , transformers-compat, void + , QuickCheck, quickcheck-instances, semigroups, silently, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , transformers, transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "0.6.0.1"; - sha256 = "01abl9vah82v8z1a8la57afnvj0hd3ri1lb7bj6w5dmzsv8pjp41"; + version = "0.7"; + sha256 = "088fbm7zg0gvw4w232qfmlv1nbc0wxxrjni7wf39y4dinhd9wkwl"; buildDepends = [ array base bytestring ghc-prim nats semigroups template-haskell text transformers void ]; testDepends = [ - array base bytestring nats quickcheck-instances tasty tasty-hunit - tasty-quickcheck text transformers transformers-compat void + array base bytestring ghc-prim nats QuickCheck quickcheck-instances + silently tasty tasty-hunit tasty-quickcheck text transformers + transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; @@ -114317,8 +115132,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "0.2"; - sha256 = "1zmjv5l5a60iir5w6w9jhb22ywid680s7k1xhw6jmd5d0bml27jk"; + version = "0.3"; + sha256 = "13vz9s2q8qahm1d957wzi8yz3dh7wqpgxqsg3b8qaaym59h2brak"; buildDepends = [ base binary bytestring containers directory haskeline hoopl hpc old-locale old-time pretty random semigroups tagged @@ -114344,6 +115159,7 @@ self: { mkDerivation { pname = "text-stream-decode"; version = "0.1.0.5"; + revision = "1"; sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy"; editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd"; buildDepends = [ base bytestring text ]; @@ -114602,23 +115418,21 @@ self: { "th-instance-reification" = callPackage ({ mkDerivation, base, containers, HTF, HUnit, list-extras, loch-th - , placeholders, QuickCheck, QuickCheck-GenT, quickcheck-instances - , template-haskell, th-expand-syns + , placeholders, QuickCheck, quickcheck-instances, template-haskell + , th-expand-syns }: mkDerivation { pname = "th-instance-reification"; - version = "0.1.2"; - sha256 = "0r16s7m0yy3siy9nbqvpv66gk7c6xzz8ccdf9abpqap15vkkz7sc"; + version = "0.1.3"; + sha256 = "1aiq4ygxdh9mz59wcnhbjr74sk7l20dvwpjkc4nkj2048axq17h1"; buildDepends = [ base containers list-extras loch-th placeholders template-haskell th-expand-syns ]; testDepends = [ base containers HTF HUnit list-extras loch-th placeholders - QuickCheck QuickCheck-GenT quickcheck-instances template-haskell - th-expand-syns + QuickCheck quickcheck-instances template-haskell th-expand-syns ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; @@ -114836,6 +115650,7 @@ self: { mkDerivation { pname = "these"; version = "0.4.2"; + revision = "1"; sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7"; editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629"; buildDepends = [ @@ -114912,6 +115727,7 @@ self: { mkDerivation { pname = "thorn"; version = "0.2"; + revision = "1"; sha256 = "1krxfsgj4ciifg76khsl4lw1nb40xx4gs07nwd84ail85s394h1h"; editedCabalFile = "d19e959e95f55075f6f4f0013cbc980e2c351c871e3d9d5bbe2febafb7711b9a"; buildDepends = [ @@ -116296,8 +117112,8 @@ self: { ({ mkDerivation, base, ghc-prim, void }: mkDerivation { pname = "total"; - version = "1.0.1"; - sha256 = "03c7ic8yd6803m7xjpbfwfvds9p251x6biak580q9578a0p664y6"; + version = "1.0.2"; + sha256 = "1di1iblxijdffczv3yni8bj1yjjc2258w7dxf8iwrd5n5h6574d4"; buildDepends = [ base ghc-prim void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -116392,6 +117208,7 @@ self: { mkDerivation { pname = "trace"; version = "0.1.0.4"; + revision = "1"; sha256 = "1x3920fvv2vjhbzss87lqi6d9d04lcc7nxifq3yjzhzg45rzy2cn"; editedCabalFile = "c7889409f09df52fe6f14db2dc020899bf2810550aaa250d9c64e1318d00dbef"; buildDepends = [ @@ -116887,6 +117704,7 @@ self: { mkDerivation { pname = "trivial-constraint"; version = "0.3.0.0"; + revision = "1"; sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y"; editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b"; buildDepends = [ base ]; @@ -116938,6 +117756,7 @@ self: { mkDerivation { pname = "tsession"; version = "0.1"; + revision = "2"; sha256 = "1rj11vyd272h66cjx8pq6smcpi65n3vlfv4g7indcnpcz4w5l6rk"; editedCabalFile = "afd89984a633388a2db5ad107968c92693527eb6f746318c4752993633705e57"; buildDepends = [ base containers mtl time transformers ]; @@ -117119,6 +117938,7 @@ self: { mkDerivation { pname = "tuple-morph"; version = "0.1.0.0"; + revision = "4"; sha256 = "1zi6nh1z7z2jz5h0pvdm2czfy1rx7ixnnvp9akcpas19npgyfk94"; editedCabalFile = "835c4661ff3b962ec5fa6f1899c6cb0d241362f06636478935fd5475c684eada"; buildDepends = [ base HList template-haskell ]; @@ -117239,6 +118059,7 @@ self: { mkDerivation { pname = "twentefp-eventloop-graphics"; version = "0.1.0.4"; + revision = "1"; sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm"; editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817"; buildDepends = [ @@ -117502,6 +118323,7 @@ self: { mkDerivation { pname = "twitter-conduit"; version = "0.1.0"; + revision = "2"; sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji"; editedCabalFile = "e70397da5f43d657c6c3bef7419810f61675e78aa0b0da688b1f5939d1e11bf8"; isLibrary = true; @@ -118205,8 +119027,9 @@ self: { mkDerivation { pname = "types-compat"; version = "0.1.1"; + revision = "2"; sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby"; - editedCabalFile = "9d6a31178b383e430ec161d2329d9b52bcf164266f3064e66da53d865825fc96"; + editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041"; buildDepends = [ base ]; homepage = "https://github.com/philopon/types-compat"; description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; @@ -118483,6 +119306,7 @@ self: { mkDerivation { pname = "uhc-light"; version = "1.1.8.7"; + revision = "1"; sha256 = "05ki2zmravvnikn9d5ldiaxafyqnf2ghh7w2jpq1gzpx2mwslrrp"; editedCabalFile = "d2ebe192f81a8eec4d1c0bc1b5a52a78c00d1839754ec75a88c16bc63c722f2d"; isLibrary = true; @@ -118741,8 +119565,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.8.1"; - sha256 = "0y3y8m271spkmzc3182v8j06kspkzv03yxiscaa1vvhm2sbqp2is"; + version = "0.8.2"; + sha256 = "0r6jffm2i2la70xzqsribfbsa84ha5g4zfqphp9gqkvr1x2jmr2i"; buildDepends = [ base ghc-prim QuickCheck random transformers ]; jailbreak = true; homepage = "https://github.com/sjoerdvisscher/unfoldable"; @@ -119709,6 +120533,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.0.1"; + sha256 = "16cp95r94cqzch529i7h282w7d7nrjjxqb6rxd2k5nj7ax0pavy5"; + buildDepends = [ attoparsec base bytestring ]; + testDepends = [ + attoparsec base bytestring derive HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://travis-ci.org/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -119832,6 +120674,7 @@ self: { mkDerivation { pname = "url-generic"; version = "0.1"; + revision = "1"; sha256 = "0yfcy2nhc67kxb7n9mjxi4z5jcq4iz4kq80fb9lbi461vijhmw5m"; editedCabalFile = "d9926e2ce6433a73b2ba940d476f7046890752c8a1145b42a78561e8d3ff6fb9"; buildDepends = [ base mtl syb ]; @@ -119987,6 +120830,7 @@ self: { mkDerivation { pname = "usb-hid"; version = "0.1.0.0"; + revision = "1"; sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh"; editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc"; buildDepends = [ attoparsec base bytestring usb ]; @@ -120151,6 +120995,7 @@ self: { mkDerivation { pname = "utf8-string"; version = "0.3.8"; + revision = "2"; sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"; editedCabalFile = "0555d720026fff65342bdc500391ffd300858b6f2c6db441d4dd1eafbcb599ff"; buildDepends = [ base bytestring ]; @@ -120366,17 +121211,18 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash, deepseq - , hashable, HUnit, network-info, QuickCheck, random, test-framework + ({ mkDerivation, base, binary, bytestring, cryptohash, HUnit + , network-info, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, time + , uuid-types }: mkDerivation { pname = "uuid"; - version = "1.3.8"; - sha256 = "077q6772xlyhq721r9pxmb458camh5d56wmxv3ankk1j5mv431b6"; + version = "1.3.9"; + sha256 = "1ngajcmg0sxj67qq9h4lfcvgazx1bbzq3y8zhqb6vb3vw6vwmcny"; buildDepends = [ - base binary bytestring cryptohash deepseq hashable network-info - random time + base binary bytestring cryptohash network-info random time + uuid-types ]; testDepends = [ base bytestring HUnit QuickCheck random test-framework @@ -120421,6 +121267,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uuid-types" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit + , QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.0"; + sha256 = "09djqdbfd7a5fqarw38r4rrm9bq51f5a664g8hvk9190bwlsyvlq"; + buildDepends = [ base binary bytestring deepseq hashable random ]; + testDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/aslatter/uuid"; + description = "Type definitions for Universally Unique Identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uulib" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -120438,6 +121303,7 @@ self: { mkDerivation { pname = "uvector"; version = "0.1.1.1"; + revision = "1"; sha256 = "1psbdsq20nr28cr9ni2mwzwkpz3p20n1xqp0m0m9qafz66d2vi08"; editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508"; buildDepends = [ base ghc-prim ]; @@ -120838,14 +121704,14 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.3"; - sha256 = "0zswcrd65dv8mnifh3h5hr1bmysc7mlqyyi4viln1is08daramzz"; + version = "0.2.4"; + sha256 = "1dfdfcvq6554dxda1h2mnl1ggm39k8w779836v3dwpi0wnq4x249"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers ]; homepage = "http://github.com/dmbarbour/haskell-vcache"; - description = "large, persistent, memcached values and structure sharing for Haskell"; + description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -120964,6 +121830,7 @@ self: { mkDerivation { pname = "vect-floating-accelerate"; version = "0.1.0.4"; + revision = "1"; sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x"; editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216"; buildDepends = [ accelerate base vect-floating ]; @@ -121343,8 +122210,10 @@ self: { ({ mkDerivation, alex, array, base, happy, monadLib }: mkDerivation { pname = "verilog"; - version = "0.0.9"; - sha256 = "0i7jc3lriy0ad4ixkf7lj7yis9lzs9j3wh5la7rlawvfq8hj0sag"; + version = "0.0.10"; + sha256 = "1kyhxxa1d1pqipq714nh60qh90pwb2b3a5wiy1h6yms77c2p4wq4"; + isLibrary = true; + isExecutable = true; buildDepends = [ array base monadLib ]; buildTools = [ alex happy ]; homepage = "http://github.com/tomahawkins/verilog"; @@ -121649,6 +122518,7 @@ self: { mkDerivation { pname = "vivid"; version = "0.1.0.1"; + revision = "1"; sha256 = "15l36rfazqaz1ng1nf5bs6yai4qlcia5lalqwsj0bh526xjd1y82"; editedCabalFile = "85cc767be7d6265ce51587d0e2eda19066f2e7ae580eced0378684db8c0b4426"; buildDepends = [ @@ -122038,8 +122908,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.4.6"; - sha256 = "0vl6f2by245fg5sfbzj27zb5mmskqj2h4a68rhwdb8w7gsl2mxz5"; + version = "3.0.5"; + sha256 = "1z4ifsldm1j6kf7jnbq8j4pk39f5d51yrygaxfs1m3mnnvr8xl52"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers data-default-class deepseq directory @@ -123327,8 +124197,8 @@ self: { }: mkDerivation { pname = "web-routing"; - version = "0.6.0"; - sha256 = "0zs4znmg34d4q14v14h07k48921xan69wrp27xjza5kp6nmqy58w"; + version = "0.6.1"; + sha256 = "0lz81mdc0a2i1jpra1c7v1pva9nff2b35cm5snllnpkb7r898vgr"; buildDepends = [ base bytestring primitive text types-compat unordered-containers ]; @@ -123412,6 +124282,7 @@ self: { mkDerivation { pname = "webdriver-snoy"; version = "0.6.0.4"; + revision = "1"; sha256 = "02c2ihqk5gsgnv61rj14rdd76r2nhmxacml3z9krrgxgn326hrbk"; editedCabalFile = "7cc952e84c8ff09b8d032df7d8089bd4d5167b32834bda67c79c62a34b12d52a"; buildDepends = [ @@ -123587,8 +124458,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.9.3.0"; - sha256 = "0aq0mbfi1sh55z46pcy3g0n3zjqw176pah4zny0nk8l3gl8ss7v1"; + version = "0.9.3.1"; + sha256 = "0yqq2jj22a17n0cqcd54f0a7vjwwak2zr3wybbh1iq6gz0p5qf76"; buildDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy mtl network random SHA text @@ -123661,6 +124532,7 @@ self: { mkDerivation { pname = "wedged"; version = "0"; + revision = "1"; sha256 = "1sdnqc40qg5pv0kj4qw33vk5cy3yym60csh3iwmpm7pzpray7511"; editedCabalFile = "64bac15c983cf83ab2b05b002439b8f125b9c942ae46ed75a187f7e2dc68dba5"; isLibrary = false; @@ -123710,6 +124582,7 @@ self: { mkDerivation { pname = "welshy"; version = "0.1.0.0"; + revision = "1"; sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki"; editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c"; buildDepends = [ @@ -123827,6 +124700,7 @@ self: { mkDerivation { pname = "whois"; version = "1.2.2"; + revision = "1"; sha256 = "199fd710zicx7ijyvipc7p0d3yg18f6nppcln2wz38hl9kfv0iv0"; editedCabalFile = "c11f42da958683ffb7a2e958dcefe2ef1a3e732732010f44facfbb0fffd7571e"; buildDepends = [ base network network-uri split ]; @@ -123942,8 +124816,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.2.1"; - sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; + version = "0.1.2.2"; + sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; @@ -124726,6 +125600,7 @@ self: { mkDerivation { pname = "x11-xim"; version = "0.0.9.0"; + revision = "1"; sha256 = "0sn789j0kz891l9p0srx6537yq44b5jlyph9vc3xdb3ygy20bjrw"; editedCabalFile = "4404aa037f4df2ef8cd16834c8149d596f09b30379f0b85a3b8db9ddd30fa6b0"; buildDepends = [ base utf8-string X11 ]; @@ -125461,6 +126336,7 @@ self: { mkDerivation { pname = "xml-html-conduit-lens"; version = "0.3.2.1"; + revision = "1"; sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12"; editedCabalFile = "b525d68eb964e306dc6fab3f9ba89e2325d91af53469ad32ec1d49e5f9a80647"; buildDepends = [ @@ -125475,14 +126351,18 @@ self: { }) {}; "xml-lens" = callPackage - ({ mkDerivation, base, containers, lens, text, xml-conduit }: + ({ mkDerivation, base, case-insensitive, containers, lens, text + , xml-conduit + }: mkDerivation { pname = "xml-lens"; - version = "0.1.6.2"; - sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz"; - buildDepends = [ base containers lens text xml-conduit ]; + version = "0.1.6.3"; + sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd"; + buildDepends = [ + base case-insensitive containers lens text xml-conduit + ]; homepage = "https://github.com/fumieval/xml-lens"; - description = "Lenses, traversals, prisms for xml-conduit"; + description = "Lenses, traversals, and prisms for xml-conduit"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -125712,6 +126592,7 @@ self: { mkDerivation { pname = "xmlhtml"; version = "0.2.3.4"; + revision = "1"; sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr"; editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9"; buildDepends = [ @@ -125806,6 +126687,7 @@ self: { mkDerivation { pname = "xmonad"; version = "0.11"; + revision = "1"; sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5"; editedCabalFile = "e9b49b3835d57df793f01d2e4f6f32ce9b2478ba6fce8503b0e4e80c57807f0b"; isLibrary = true; @@ -126241,6 +127123,7 @@ self: { mkDerivation { pname = "xxhash"; version = "0.0.1"; + revision = "1"; sha256 = "0crmvkvk2604a06jjsn613bxx0n1lv59picl2656rx2pc7wbyidn"; editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274"; buildDepends = [ base bytestring crypto-api tagged ]; @@ -126619,6 +127502,7 @@ self: { mkDerivation { pname = "yaop"; version = "0.1.2.1"; + revision = "1"; sha256 = "0z66ffxb89bksgqfji9x8msch9yk7nmbzm2qrcn5j3w4ylg7dpdr"; editedCabalFile = "5333f04af0a27a0197004dc2e686dbbf29e5e2dc248277eb2afcb7587092a55c"; buildDepends = [ base mtl template-haskell ]; @@ -126811,8 +127695,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.3.1"; - sha256 = "08kyg83alf1z1c5llr5gbfg827ds1fvyz0d7vicmx6fzl1m9nkzb"; + version = "1.4.4"; + sha256 = "079ny0jdg68kxdp117y1av0d09fhpywbb8v9iyl867vswpb38b08"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -127085,8 +127969,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.5"; - sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1"; + version = "1.4.5.1"; + sha256 = "0q5n2rcwz7qc5gs4r2kfc8dc7xg0khy9khzb1zgbfxl6bv9kvnk5"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -127160,8 +128044,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.3"; - sha256 = "0k49s9cybr36knmx2lwapivszcq6xg67vpx5fw812dzv8x2cj714"; + version = "1.4.9"; + sha256 = "10rf7xrb0zrqpiv8149z52h1jx4nr96ajs2pxdr9avazprls9jmb"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -127722,6 +128606,7 @@ self: { mkDerivation { pname = "yesod-routes"; version = "1.2.0.7"; + revision = "1"; sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j"; editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e"; buildDepends = [ @@ -129078,6 +129963,7 @@ self: { mkDerivation { pname = "zot"; version = "0.0.2"; + revision = "1"; sha256 = "12wgkrlvhby0gy6kngjwyx468yarpgkiwy51v6zb8jhx79mhidq3"; editedCabalFile = "325ccedb3426935b4a56f838f3d05fc914b72729a2b80d6c804bec5657593a40"; isLibrary = false; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 763164cec876..b2071fa61c0f 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,7 +1,11 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: +{ stdenv, ghc, llvmPackages, packages, buildEnv +, makeWrapper +, ignoreCollisions ? false, withLLVM ? false }: + +with stdenv.lib; # This wrapper works only with GHC 6.12 or later. -assert stdenv.lib.versionOlder "6.12" ghc.version; +assert versionOlder "6.12" ghc.version; # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -25,15 +29,20 @@ assert stdenv.lib.versionOlder "6.12" ghc.version; # fi let - ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version; + ghc761OrLater = versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; libDir = "$out/lib/ghc-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; - paths = stdenv.lib.filter (x: x ? isHaskellLibrary) (stdenv.lib.closePropagation packages); - hasLibraries = stdenv.lib.any (x: x.isHaskellLibrary) paths; + paths = filter (x: x ? isHaskellLibrary) (closePropagation packages); + hasLibraries = any (x: x.isHaskellLibrary) paths; + # CLang is needed on Darwin for -fllvm to work: + # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html + llvm = makeSearchPath "bin" + ([ llvmPackages.llvm ] + ++ optional stdenv.isDarwin llvmPackages.clang); in -if paths == [] then ghc else +if paths == [] && !withLLVM then ghc else buildEnv { inherit (ghc) name; paths = paths ++ [ghc]; @@ -55,7 +64,8 @@ buildEnv { --set "NIX_GHC" "$out/bin/ghc" \ --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" + --set "NIX_GHC_LIBDIR" "${libDir}" \ + ${optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} done for prg in runghc runhaskell; do @@ -73,7 +83,7 @@ buildEnv { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done - ${stdenv.lib.optionalString hasLibraries "$out/bin/ghc-pkg recache"} + ${optionalString hasLibraries "$out/bin/ghc-pkg recache"} $out/bin/ghc-pkg check ''; } // { diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 2a8f7ca2c302..03c836d9251a 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,50 +1,21 @@ -x@{builderDefsPackage - , fetchgit - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["fetchgit"]; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); -in -rec { - srcDrv = a.fetchgit { - url = "https://github.com/kevinlawler/kona.git"; - inherit rev; - sha256 = "a8189c94fca3e62a740eb6823ab3fc571c0960ff5e7a3eb0353e5cf36ef9fdcb"; - }; - - src = "${srcDrv}/"; - - rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; - version = "git-${rev}"; +stdenv.mkDerivation rec { name = "kona-${version}"; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["prepareOut" "doMakeInstall"]; - makeFlags = ["PREFIX=\$out"]; + version = "3.21"; + src = fetchurl { + url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz"; + sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3"; + }; - prepareOut = a.fullDepEntry '' - mkdir -p "$out/bin" - '' ["minInit" "defEnsureDir"]; + makeFlags = "PREFIX=$(out)"; + preInstall = ''mkdir -p "$out/bin"''; - meta = { + meta = with stdenv.lib; { description = "An interpreter of K, APL-like programming language"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.free; - }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/kevinlawler/kona"; - }; + homepage = https://github.com/kevinlawler/kona/; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + license = licenses.isc; }; -}) x +} diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index eba2a0b0a109..cf7bf881a8f0 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -25,7 +25,7 @@ let v8 = v8_3_16_14; - mysql = (import <nixpkgs> {}).mysql; + mysql = assert false; (import <nixpkgs> {}).mysql; in diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3f1fbfcd6a9c..6d6148e092a9 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -7,7 +7,7 @@ # OSS is no longer supported, for it's much crappier than ALSA and # PulseAudio. -assert !(stdenv ? cross) -> alsaSupport || pulseaudioSupport; +assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { "--without-x" ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib"); + # Fix a build failure on OS X Mavericks + # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 + patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl { + url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320"; + sha1 = "3137feb503a89a8d606405373905b92dcf7e293b"; + }) ]; + crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { patches = let f = rev: sha256: fetchurl { @@ -72,6 +79,6 @@ stdenv.mkDerivation rec { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 2aa122a8fb28..a1d839504770 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/cl-ppcre/default.nix b/pkgs/development/libraries/cl-ppcre/default.nix deleted file mode 100644 index b81896d88944..000000000000 --- a/pkgs/development/libraries/cl-ppcre/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - simplyShare = args.simplyShare; - - version = lib.attrByPath ["version"] "2.0.0" args; - buildInputs = with args; [ ]; -in -rec { - src = fetchurl { - url = http://weitz.de/files/cl-ppcre.tar.gz; - sha256 = "1hrk051yi1qixy0vdig99cbv0v0p825acli65s08yz99b0pjz7m5"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = [(simplyShare "cl-ppcre")]; - - name = "cl-ppcre-" + version; - meta = { - description = "Common Lisp Portable Perl Compatible RegExp library"; - }; -} diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index c688e42edeaf..0841990fa95d 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "glm-0.9.6.0"; + name = "glm-0.9.6.1"; src = fetchurl { url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0gq79gxjm449ryi8l94rahrqy2cjccnrvivxgbwp10xdlfdyc4ha"; + sha256 = "1s1kpf9hpyq6bdf87nhlkxyr2ay0ip9wqicdma9h8yz4vs20r2hs"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 9d06f4b1c5d7..9723bf90eb03 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -9,14 +9,14 @@ assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; let - version = "1.0.12"; + version = "1.0.13"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "1aa3pkg8yz6glg2273yl7310nkx1q31wkwbmmxwk3059k0p5l4k7"; + sha256 = "12payqyx1ly8nm3qn24bj0kyy9d08sixnjqxw7fn6rbwr7m1x7sd"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index c9098fc08502..b9f2f3c77e54 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz"; - sha256 = "1hqaddgzxjw9lpsphankld6a8bpm92hfv46kp99cgmj82rdjwdq1"; + sha256 = "1hiwzajf18v9ik4nai3s7frps4ccn9s20nggad1c4k2mwb9ydwhk"; }; buildInputs = [ aspell pkgconfig gtk3 enchant intltool ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index a7ec3a758788..311bfe2c209d 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.38"; + name = "harfbuzz-0.9.40"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "056mrzf6ry78s8nvnj4rqzc1gml2lcn314ijdzmsmz7dnj1z6dk7"; + sha256 = "07rjp05axas96fp23lpf8l2yyfdj9yib4m0qjv592vdyhcsxaw8p"; }; configureFlags = [ diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index bfa7675034a5..0189ecda77ff 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -60,17 +60,17 @@ let { shortName, shortDescription, longDescription, dictFileName }: mkDict rec { inherit dictFileName; - version = "5.2"; + version = "5.3"; name = "hunspell-dict-${shortName}-dicollecte-${version}"; readmeFile = "README_dict_fr.txt"; src = fetchurl { url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip"; - sha256 = "c5863f7592a8c4defe8b4ed2b3b45f6f10ef265d34ae9881c1f3bbb3b80bdd02"; + sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0"; }; meta = with stdenv.lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; - homepage = http://www.dicollecte.org/home.php?prj=fr; + homepage = "http://www.dicollecte.org/home.php?prj=fr"; license = licenses.mpl20; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -86,7 +86,7 @@ let readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; - homepage =http://wordlist.aspell.net/; + homepage = http://wordlist.aspell.net/; license = licenses.bsd3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix new file mode 100644 index 000000000000..af2611a0bae0 --- /dev/null +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jbigkit-2.1"; + + src = fetchurl { + url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; + }; + + postPatch = '' + sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile + ''; + + installPhase = '' + install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a + install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a + install -D -m644 libjbig/jbig.h $out/include/jbig.h + install -D -m644 libjbig/jbig_ar.h $out/include/jbig_ar.h + install -D -m644 libjbig/jbig85.h $out/include/jbig85.h + + install -d -m755 $out/share/man/man1 + install -m644 pbmtools/*.1* $out/share/man/man1 + + install -D -m755 pbmtools/jbgtopbm $out/bin/jbgtopbm + install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg + install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85 + install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85 + ''; + + meta = with stdenv.lib; { + homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; + description = "a software implementation of the JBIG1 data compression standard"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 8bb015a6c5f4..db82c943d7c2 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.6"; + name = "lcms2-2.7"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji"; + sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 7dda6912a986..2a9af50fcde9 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Portable ASS/SSA subtitle renderer"; homepage = https://github.com/libass/libass; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel urkud ]; repositories.git = git://github.com/libass/libass.git; }; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index afde4e260e8f..1d6b00abe539 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; - buildInputs = [ libraw1394 libusb1 ]; + buildInputs = [ libusb1 ] + ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ]; meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ecc92fce40c9..5323cc693fce 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.59"; + name = "libdrm-2.4.60"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b"; + sha256 = "12cqnmssi6mbr93n29mm84k8wix5nx6zs82k7wcmj7z3r335ymwr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index a2065111190f..818177ff49d7 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.3.0"; + name = "libebml-1.3.1"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43"; + sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r"; }; - configurePhase = "cd make/linux"; - makeFlags = "prefix=$(out)"; - - meta = { + meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; + license = licenses.lgpl21; homepage = http://dl.matroska.org/downloads/libebml/; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 6b070c170c7d..90cab2cc6871 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,25 +1,16 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - +stdenv.mkDerivation rec { + name = "libev-${version}"; + version="4.19"; + src = fetchurl { + url = "http://dist.schmorp.de/libev/${name}.tar.gz"; + sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; + }; meta = { - description = "An event loop library remotely similar to libevent"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = a.lib.platforms.all; + description = "A high-performance event loop/event model with lots of features"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.bsd2; # or GPL2+ }; } diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix deleted file mode 100644 index 3e4f58a5ce0f..000000000000 --- a/pkgs/development/libraries/libev/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="4.15"; - name="libev-4.15"; - hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj"; - url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz"; - advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz"; - - -} diff --git a/pkgs/development/libraries/libev/src-info-for-default.nix b/pkgs/development/libraries/libev/src-info-for-default.nix deleted file mode 100644 index e14ca4195504..000000000000 --- a/pkgs/development/libraries/libev/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://dist.schmorp.de/libev/Attic/?M=D"; - sourceRegexp = "(^|/)libev-.*[.]tar[.]gz"; - baseName = "libev"; -} diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix new file mode 100644 index 000000000000..11ec1c0ecf33 --- /dev/null +++ b/pkgs/development/libraries/libfpx/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libfpx-1.3.1-4"; + + src = fetchurl { + url = "mirror://imagemagick/delegates/${name}.tar.xz"; + sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233"; + }; + + meta = with stdenv.lib; { + homepage = http://www.imagemagick.org; + description = "A library for manipulating FlashPIX images"; + license = "Flashpix"; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index dbb104546ad6..6292318d5ca9 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,13 +1,25 @@ -{stdenv, fetchurl, perl, cmake}: +{ stdenv, fetchFromGitHub, perl, cmake }: stdenv.mkDerivation rec { - pName = "libical"; - name = "${pName}-1.0"; - src = fetchurl { - url = "mirror://sourceforge/freeassociation/${pName}/${name}/${name}.tar.gz"; - sha256 = "1dy0drz9hy0sn2q3s2lp00jb9bis5gsm7n3m4zga49s9ir2b6fbw"; + name = "libical-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "libical"; + repo = "libical"; + rev = "v${version}"; + sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9"; }; + nativeBuildInputs = [ perl cmake ]; patches = [ ./respect-env-tzdir.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libical/libical; + description = "an Open Source implementation of the iCalendar protocols"; + license = licenses.mpl10; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; } diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 12da8d41c7b5..980a0d5c71ae 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,21 +1,19 @@ -* Remove /usr/*/zoneinfo from the default search path -* Respect $TZDIR diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c -index adf7598..d2fd5c8 100644 +index fe984c9..22ba0a1 100644 --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -108,7 +108,7 @@ typedef struct - - static int r_pos [] = {1, 2, 3, -2, -1}; +@@ -107,7 +107,7 @@ typedef struct + char charcnt[4]; + } tzinfo; -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; +static char *search_paths [] = {"/etc/zoneinfo"}; static char *zdir = NULL; #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -195,6 +195,16 @@ set_zonedir (void) +@@ -194,6 +194,16 @@ set_zonedir (void) const char *fname = ZONES_TAB_SYSTEM_FILENAME; - int i; + unsigned int i; + const char *env_tzdir = strdup (getenv ("TZDIR")); + if (env_tzdir) { @@ -27,6 +25,6 @@ index adf7598..d2fd5c8 100644 + free (env_tzdir); + } + - for (i = 0;i < NUM_SEARCH_PATHS; i++) { + for (i = 0; i < NUM_SEARCH_PATHS; i++) { sprintf (file_path, "%s/%s", search_paths [i], fname); if (!access (file_path, F_OK|R_OK)) { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a57ff0bb7378..80ad7879e101 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-0.11.0"; + name = "libinput-0.13.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0hq7plvf9gpscy69pngffrfzqdrcwvpqr0a8fh45xslm5xwxcz4j"; + sha256 = "06n6ih2bfr957rprsgjxhi6f7m96wmf4kgac8y0ispsjvrzszv3c"; }; configureFlags = [ diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index c6323fcc84a4..3af1227c69b4 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "liblqr-1-0.4.1"; + name = "liblqr-1-0.4.2"; + src = fetchurl { url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2"; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; + sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; - configureFlags = "--enable-install-man"; meta = with stdenv.lib; { homepage = http://liblqr.wikidot.com; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 67b9e7289550..b4032f3c22dc 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -9,12 +9,16 @@ stdenv.mkDerivation rec { }; configurePhase = "cd make/linux"; - makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"; + makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib" + + stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++"; propagatedBuildInputs = [ libebml ]; - meta = { - description = "Matroska library"; - homepage = http://dl.matroska.org/downloads/libmatroska; + meta = with stdenv.lib; { + description = "A library to parse Matroska files"; + homepage = http://matroska.org/; + license = licenses.lgpl21; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 8207051b2a86..d58f031f3762 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev }: stdenv.mkDerivation rec { - name = "libmbim-1.6.0"; + name = "libmbim-1.12.2"; src = fetchurl { url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "10mh1b8jfxg6y6nhr7swbi9wx4acjgvx1if7nhrw1ppd5apvvvz0"; + sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; }; preConfigure = '' - for f in build-aux/mbim-codegen/*; do - substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" - done + patchShebangs . ''; - buildInputs = [ pkgconfig glib udev ]; + buildInputs = [ pkgconfig glib udev python ]; meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/software/libmbim/; description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 7ecac071ce40..19d912e5523c 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; + # Otherwise clang fails with 'duplicate symbol ___sputc' + buildFlags = stdenv.lib.optionalString stdenv.isDarwin "CFLAGS=-std=gnu89"; + meta = { homepage = http://libmpeg2.sourceforge.net/; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index 4bec67f85131..3e43842495ad 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "0vkhjil4rh5z9kvjfgzm79kfqwvlimvv49q74wlsjx7vgvv9019d"; + sha256 = "0qyjz2rm0gxbv81dlh28ynss66dsyhlqzs09rblbjsdf1vh6yzcq"; }; }) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index a0292067dbb2..9699d67d7b87 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python }: stdenv.mkDerivation rec { - name = "libqmi-1.8.0"; + name = "libqmi-1.12.6"; src = fetchurl { url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "03gf221yjcdzvnl4v2adwpc6cyg5mlbccn20s00fp5bgvmq81pgs"; + sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; }; preBuild = '' @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib python ]; meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/libqmi/; description = "Modem protocol helper library"; platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 808407877e9d..3ed89ec8a8a5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf , bzip2, libcroco -, gtk2 ? null, gtk3 ? null +, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.36.4"; # 2.37 needs pango 1.32.6, 2.40 doesn't support gtk2 + name = "librsvg-2.40.9"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; - sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; + url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; + sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk"; }; buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk2 gtk3 ]; + propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 76daf7d748bf..c5a7a7202e2c 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,22 +1,29 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, perl, zlib, bzip2, popt }: -stdenv.mkDerivation { - name = "librsync-0.9.7"; +stdenv.mkDerivation rec { + name = "librsync-${version}"; + version = "1.0.0"; - src = fetchurl { - url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz; - sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; + src = fetchFromGitHub { + owner = "librsync"; + repo = "librsync"; + rev = "v${version}"; + sha256 = "0rc2pksdd0mhdvk8y1yix71rf19wdx1lb2ryrkhi7vcy240rvgvc"; }; + buildInputs = [ autoreconfHook perl zlib bzip2 popt ]; + configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; crossAttrs = { dontStrip = true; }; - meta = { + meta = with stdenv.lib; { homepage = http://librsync.sourceforge.net/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a66d31d2ec44..00655b51afc7 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchurl, getopt, bash }: +{ stdenv, fetchFromGitHub, autoreconfHook, getopt }: stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.1.1"; + version = "2.2.0"; - src = fetchurl { - url = "mirror://sourceforge/libseccomp/libseccomp-${version}.tar.gz"; - sha256 = "0744mjx5m3jl1hzz13zypivl88m0wn44mf5gsrd3yf3w80gc24l8"; + src = fetchFromGitHub { + owner = "seccomp"; + repo = "libseccomp"; + rev = "v${version}"; + sha256 = "0vfd6hx92cp1jaqxxaj30r92bfm6fmamxi2yqxrl82mqism1lk84"; }; - # This fixes the check for 'getopt' to function appropriately. - # Additionally, this package can optionally include the kernel - # headers if they exist, or use its own inline copy of the source - # for talking to the seccomp filter - we opt to always use the - # inline copy + buildInputs = [ autoreconfHook getopt ]; + patchPhase = '' - substituteInPlace ./configure --replace "/bin/bash" "${bash}/bin/bash" - substituteInPlace ./configure --replace "verify_deps getopt" "" - substituteInPlace ./configure --replace getopt ${getopt}/bin/getopt - substituteInPlace ./configure --replace 'opt_sysinc_seccomp="yes"' 'opt_sysinc_seccomp="no"' + patchShebangs . ''; - meta = { + meta = with stdenv.lib; { description = "high level library for the Linux Kernel seccomp filter"; homepage = "http://sourceforge.net/projects/libseccomp"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix new file mode 100644 index 000000000000..9b6e87bd57e6 --- /dev/null +++ b/pkgs/development/libraries/libsvm/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "libsvm-${version}"; + version = "3.20"; + + src = fetchurl { + url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; + sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg"; + }; + + buildPhase = '' + make + make lib + ''; + + installPhase = let + libSuff = if stdenv.isDarwin then "dylib" else "so"; + in '' + mkdir -p $out/lib $out/bin $out/include; + cp libsvm.so.2 $out/lib/libsvm.2.${libSuff}; + ln -s $out/lib/libsvm.2.${libSuff} $out/lib/libsvm.${libSuff}; + cp svm-scale svm-train svm-predict $out/bin; + cp svm.h $out/include; + ''; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib; + ''; + + meta = with stdenv.lib; { + description = "A library for support vector machines"; + homepage = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index cb9367474173..ef7a8ab09a8e 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool}: +{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: stdenv.mkDerivation ({ name = "libtheora-1.1.1"; @@ -7,12 +7,28 @@ stdenv.mkDerivation ({ sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [libogg libvorbis]; + # GCC's -fforce-addr flag is not supported by clang + # It's just an optimization, so it's safe to simply remove it + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-fforce-addr" "" + ''; + crossAttrs = { propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; configureFlags = "--disable-examples"; }; + + meta = with stdenv.lib; { + homepage = http://www.theora.org/; + description = "Library for Theora, a free and open video compression format"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; + }; } # It has an old config.guess that doesn't know the mips64el. diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0f09af30b0a1..dc648e1ea2e2 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }: stdenv.mkDerivation rec { - name = "libva-1.5.0"; + name = "libva-1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "11ilp32fy7s42ii2dlcnf7305r9pi610r3jqdbn26khf26rx8ip9"; + sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index dfb3575b89b2..4da60397444f 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "libvdpau-0.9"; + name = "libvdpau-1.1"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3"; + sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f"; }; buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 80381743100e..5d3218169d9f 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg, pkgconfig }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.4"; + name = "libvorbis-1.3.5"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"; + sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; }; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index ce8a58be7f40..6da1b00ee81f 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "0bbjl5spgq7jq7ms5q0scxg5hmg4dd386syb3di4jzggqbbjbn0l"; + sha256 = "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg"; }; configureFlags = [ diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a9c7d51923b5..d86a55b78bd2 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.17.4"; + version = "3.18"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/${name}.tar.gz"; - sha256 = "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_RTM/src/${name}.tar.gz"; + sha256 = "0h0xy9kvd2s8r438q4dfn25cgvv5dc1hkm9lb4bgrxpr5bxv13b1"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index a635f68839b7..4ffcd62f982b 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { Name: openjp2 Description: JPEG2000 library (Part 1 and 2) URL: http://www.openjpeg.org/ - Version: @OPENJPEG_VERSION@ + Version: ${version} Libs: -L$out/lib -lopenjp2 Cflags: -I$out/include EOF diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d93341b81ff6..14529c6c643b 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; + patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch; + meta = { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; diff --git a/pkgs/development/libraries/pixman/fix-clang36.patch b/pkgs/development/libraries/pixman/fix-clang36.patch new file mode 100644 index 000000000000..7db3c7ecaba3 --- /dev/null +++ b/pkgs/development/libraries/pixman/fix-clang36.patch @@ -0,0 +1,11 @@ +--- a/pixman/pixman-mmx.c 2014-04-24 08:34:14.000000000 +0400 ++++ b/pixman/pixman-mmx.c 2015-01-30 20:19:28.000000000 +0300 +@@ -89,7 +89,7 @@ + return __A; + } + +-# ifdef __OPTIMIZE__ ++# if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6) + extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) + _mm_shuffle_pi16 (__m64 __A, int8_t const __N) + { diff --git a/pkgs/development/libraries/protobufc/1.1.nix b/pkgs/development/libraries/protobufc/1.1.nix index 228225b721df..97fc8642778e 100644 --- a/pkgs/development/libraries/protobufc/1.1.nix +++ b/pkgs/development/libraries/protobufc/1.1.nix @@ -1,11 +1,11 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; rev = "v${version}"; - sha256 = "11j9vg55a732v14cki4721ipr942c4krr562gliqmnlwvyz0hlyb"; + sha256 = "0mdl2i87394l4zdvq2npsxq4zs8p7sqhqmbm2r380ngjs6zic6gw"; }; }) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 8ba2d52741f0..0ab4f21f2d88 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = version; - sha256 = "0qx5dnq9halqaznmbwg44p1wl64pzl485r4054569rbx9y9ak1zy"; + sha256 = "0iklvslz35dd0lz26ffrbfb20qirl9v5kcdmlcnnzc034hr2zmnv"; }; buildInputs = [ zlib perl ]; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 67f026fb4828..c80b1bca685f 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,11 +1,28 @@ -{stdenv, fetchurl, liboil, pkgconfig}: +{stdenv, fetchurl, orc, pkgconfig}: stdenv.mkDerivation { - name = "schroedinger-1.0.0"; + name = "schroedinger-1.0.11"; + src = fetchurl { - url = mirror://sourceforge/schrodinger/schroedinger-1.0.0.tar.gz; - sha256 = "0r374wvc73pfzkcpwk0q0sjx6yhp79acyiqbjy3c7sfqdy7sm4x8"; + url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz; + sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - buildInputs = [liboil pkgconfig]; + buildInputs = [orc pkgconfig]; + + # The test suite is known not to build against Orc >0.4.16 in Schroedinger 1.0.11. + # A fix is in upstream, so test when pulling 1.0.12 if this is still needed. See: + # http://www.mail-archive.com/schrodinger-devel@lists.sourceforge.net/msg00415.html + preBuild = '' + substituteInPlace Makefile \ + --replace "SUBDIRS = schroedinger doc tools testsuite" "SUBDIRS = schroedinger doc tools" \ + --replace "DIST_SUBDIRS = schroedinger doc tools testsuite" "DIST_SUBDIRS = schroedinger doc tools" + ''; + + meta = with stdenv.lib; { + homepage = "http://diracvideo.org/"; + maintainers = [ maintainers.spwhitt ]; + license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 7f05daab0210..f970a63ff12e 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usbredir-${version}"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; - sha256 = "028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf"; + sha256 = "1ah64271r83lvh8hrpkxzv0iwpga1wkrfkx4rkljpijx5dqs0qqa"; }; buildInputs = [ pkgconfig libusb ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f4d87e8effa9..8eddb2b0ae8a 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.5.0"; + name = "libva-intel-driver-1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1p537n2dpmybpf7rligbnhw406lr575bhkafs4n64jxk78clid6h"; + sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb"; }; prePatch = '' diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 51666e3ba6de..6c541f1aa682 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, yasm}: +{stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { - version = "snapshot-20130424-2245-stable"; - name = "x264-20130424_2245"; + version = "snapshot-20141218-2245-stable"; + name = "x264-20141218-2245"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk"; + sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m"; }; patchPhase = '' @@ -14,13 +14,16 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" + ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; buildInputs = [ yasm ]; - meta = { + meta = with stdenv.lib; { description = "library for encoding H264/AVC video streams"; - homepage = http://www.videolan.org/developers/x264.html; - license = "GPL"; + homepage = http://www.videolan.org/developers/x264.html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.spwhitt ]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f662c26fe424..abaf586974f4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -267,6 +267,7 @@ let rgeos = [ pkgs.geos ]; rgl = [ pkgs.mesa pkgs.x11 ]; Rglpk = [ pkgs.glpk ]; + rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; ridge = [ pkgs.gsl ]; @@ -339,6 +340,7 @@ let WideLM = [ pkgs.cudatoolkit ]; RCurl = [ pkgs.curl ]; R2SWF = [ pkgs.pkgconfig ]; + rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; RProtoBuf = [ pkgs.pkgconfig ]; Rpoppler = [ pkgs.pkgconfig ]; @@ -664,7 +666,6 @@ let "BcDiag" # requires fabia "bdvis" # requres taxize "beadarrayFilter" # requires beadarray - "beadarrayMSV" # requires rggobi "bigGP" # requires MPI running. HELP WANTED! "bigpca" # requires NCmisc "Biograph" # requires mvna @@ -680,7 +681,6 @@ let "ChemoSpec" # depends on broken speaq "classGraph" # requires graph, and Rgraphviz "clpAPI" # requires clp - "clusterfly" # requires rggobi "compendiumdb" # requires Biobase "CORM" # requires limma "cplexAPI" # requires CPLEX @@ -729,6 +729,7 @@ let "GeneticTools" # requires snpStats "GExMap" # requires Biobase and multtest "gitter" # requires EBImage + "glmgraph" # test suite says: "undefined symbol: dgemv_" "gmatrix" # depends on proprietary cudatoolkit "GOGANPA" # requires WGCNA "gputools" # depends on proprietary cudatoolkit @@ -796,6 +797,7 @@ let "NCmisc" # requires BiocInstaller "netClass" # requires samr "nettools" # requires WGCNA + "NORRRM" # can't load SDMTools properly "netweavers" # requires BiocGenerics, Biobase, and limma "NLPutils" # requires qdap "NSA" # requires aroma_core @@ -803,6 +805,7 @@ let "optBiomarker" # requires rpanel "ora" # requires ROracle "orQA" # requires genefilter + "PBSmapping" # fails its test suite for unclear reasons "PairViz" # requires graph "PANDA" # requires GO.db "ParDNAcopy" # requires DNAcopy @@ -821,7 +824,6 @@ let "permGPU" # requires Biobase "PhViD" # requires LBE "pi0" # requires qvalue - "PKgraph" # requires rggobi "plmDE" # requires limma "plsRcox" # requires survcomp "PMA" # requires impute @@ -844,6 +846,7 @@ let "rainfreq" # SDMTools.so: undefined symbol: X "RAM" # requires Heatplus "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges + "RapidPolygonLookup" # depends on broken PBSmapping "RbioRXN" # requires fmcsR, and KEGGREST "RcppAPT" # configure script depends on /bin/sh "RcmdrPlugin_seeg" # requires seeg @@ -855,7 +858,6 @@ let "REBayes" # requires Rmosek "RefFreeEWAS" # requires isva "retistruct" # depends on broken RImageJROI - "rggobi" # requires GGobi "RImageJROI" # requires spatstat "rjade" # requires V8 to build "rJPSGCS" # requires chopsticks @@ -886,7 +888,6 @@ let "selectspm" # depends on broken ecespa "semiArtificial" # requires RSNNS "SeqFeatR" # requires Biostrings, qvalue, and widgetTools - "SeqGrapheR" # requires rggobi "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat @@ -923,6 +924,7 @@ let "ttScreening" # requires sva, and limma "V8" # compilation error "vows" # requires rpanel + "vmsbase" # depends on broken PBSmapping "WGCNA" # requires impute "wgsea" # requires snpStats "WideLM" # depends on proprietary cudatoolkit diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index f9406279b5d7..c3381186aa8a 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, cmake, llvmPackages }: +{ stdenv, fetchurl, cmake, llvmPackages_35 }: -with llvmPackages; - -let version = "3.5"; in +let version = "3.5"; in with llvmPackages_35; stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; @@ -16,12 +14,9 @@ stdenv.mkDerivation rec { longDescription = '' For every symbol (type, function variable, or macro) that you use in foo.cc, either foo.cc or foo.h should #include a .h file that exports the - declaration of that symbol. The include-what-you-use tool is a program - that can be built with the clang libraries in order to analyze #includes - of source files to find include-what-you-use violations, and suggest - fixes for them. The main goal of include-what-you-use is to remove - superfluous #includes. It does this both by figuring out what #includes - are not actually needed for this file (for both .cc and .h files), and + declaration of that symbol. The main goal of include-what-you-use is to + remove superfluous #includes, both by figuring out what #includes are not + actually needed for this file (for both .cc and .h files), and by replacing #includes with forward-declares when possible. ''; homepage = http://include-what-you-use.com; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix new file mode 100644 index 000000000000..e9ddc17bb026 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "bazel-20150326.981b7bc1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "bazel"; + rev = "981b7bc1"; + sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7"; + }; + + buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; + + installPhase = '' + PROTOC=protoc bash compile.sh + mkdir -p $out/bin $out/share + cp -R output $out/share/bazel + ln -s $out/share/bazel/bazel $out/bin/bazel + wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk}" + ''; + + meta = { + homepage = http://github.com/google/bazel/; + description = "Build tool that builds code quickly and reliably"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch new file mode 100644 index 000000000000..25bbd2a91ba1 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch @@ -0,0 +1,11 @@ +--- ./Modules/FindOpenSSL.cmake ++++ ./Modules/FindOpenSSL.cmake +@@ -264,7 +264,7 @@ + set(OPENSSL_VERSION "${_OPENSSL_VERSION}") + elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") + file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str +- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") ++ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + + # The version number is encoded as 0xMNNFFPPS: major minor fix patch status + # The status gives if this is a developer or prerelease and is ignored here. diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 60a941a66375..64ed4d59d3dc 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -32,14 +32,18 @@ stdenv.mkDerivation rec { sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. + # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path.patch ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); + }) ++ + # fix cmake detection of openssl libs + # see: http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386 + # and http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1 + [./cmake_find_openssl_for_openssl-1.0.1m_and_up.patch]; buildInputs = [ curl expat zlib bzip2 libarchive ] ++ optional useNcurses ncurses @@ -48,7 +52,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; - + configureFlags = "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + stdenv.lib.optionalString useQt4 " --qt-gui"; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index f73f47ab87b1..0b42b88ef7ac 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -41,7 +41,7 @@ let # # extraConfig is meant to be sh lines exporting environment # variables like DISTCC_HOSTS, DISTCC_DIR, ... - links = extraConfig : (runCommand "distcc-links" { } + links = extraConfig: (runCommand "distcc-links" { passthru.gcc = gcc.cc; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix new file mode 100644 index 000000000000..5edc57e2f819 --- /dev/null +++ b/pkgs/development/tools/toluapp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, scons, lua }: + +stdenv.mkDerivation rec { + version = "1.0.92"; + name = "toluapp-${version}"; + + src = fetchFromGitHub { + owner = "eddieringle"; + repo = "toluapp"; + rev = "b1e680dc486c17128a3c21f89db1693ff06c02b1"; + sha256 = "1d1a9bll9825dg4mz71vwykvfd3s5zi2yvzbfsvlr3qz1l3zqfwb"; + }; + + buildInputs = [ lua scons ]; + + patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + + preConfigure = '' + substituteInPlace config_posix.py \ + --replace /usr/local $out + ''; + + NIX_CFLAGS_COMPILE = "-fPIC"; + + buildPhase = ''scons''; + + installPhase = ''scons install''; + + meta = { + licence = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch new file mode 100644 index 000000000000..6743b25cb8ab --- /dev/null +++ b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch @@ -0,0 +1,36 @@ +As it turns out, scons doesn't inherit environment variables by +default. Debugging this was very pleasant. -- oxij + +diff --git a/SConstruct b/SConstruct +index 5c1e774..66aa4c8 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -5,13 +5,11 @@ tools = ['default'] + if os.name == 'nt': + tools = ['mingw'] + +-env = Environment(tools = tools) ++env = Environment(tools = tools, ENV = os.environ) + + options_file = None +-if sys.platform == 'linux2': +- options_file = "linux" + +-elif 'msvc' in env['TOOLS']: ++if 'msvc' in env['TOOLS']: + options_file = "msvc" + else: + options_file = "posix" +diff --git a/config_posix.py b/config_posix.py +index 2bb696c..eb4eb9b 100644 +--- a/config_posix.py ++++ b/config_posix.py +@@ -16,7 +16,7 @@ CCFLAGS = ['-O2', '-ansi', '-Wall'] + prefix = '/usr/local' + + # libraries +-LIBS = ['lua', 'lualib', 'm'] ++LIBS = ['lua', 'liblua', 'm'] + + + diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 5d50d25194a3..dab4e2b6afff 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -6,7 +6,7 @@ let py = pythonPackages; - version = "2.0.31"; + version = "2.0.32"; in stdenv.mkDerivation rec { name = "anki-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "http://ankisrs.net/download/mirror/${name}.tgz" "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "0bxy4pq9yq78g0ffnlkpqj91ri0w4xqgv8mqksddn02v4llrd5jb"; + sha256 = "0g5rmg0yqh40a3g8ci3y3if7vw4jl5nrpq8ki1a13a3xmgch13rr"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 883de8d2b9db..d2170cfc332f 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, libusb, acl }: +, dbus, acl, gmp +, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null +}: -let version = "1.7.5"; in +let version = "2.0.2"; in +with stdenv.lib; stdenv.mkDerivation { name = "cups-${version}"; @@ -10,15 +13,27 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; + sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; - propagatedBuildInputs = [ openssl ]; + propagatedBuildInputs = [ openssl gmp ]; - configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-systemd=\${out}/lib/systemd/system" + "--enable-raw-printing" + "--enable-threads" + ] ++ optionals stdenv.isLinux [ + "--enable-dbus" + "--enable-pam" + ] ++ optional (libusb != null) "--enable-libusb" + ++ optional (gnutls != null) "--enable-ssl" + ++ optional (avahi != null) "--enable-avahi" + ++ optional (libpaper != null) "--enable-libpaper"; installFlags = [ # Don't try to write in /var at build time. diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix new file mode 100644 index 000000000000..683b70120580 --- /dev/null +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "git-20150126"; + name = "physlock-${version}"; + src = fetchFromGitHub { + owner = "muennich"; + repo = "physlock"; + rev = "b64dccc8c22710f8bf01eb5419590cdb0e65cabb"; + sha256 = "1dapkwj3y6bb4j8q4glms7zsqm7drr37nrnr30sbahwq67rnvzcc"; + }; + + preConfigure = '' + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace "-m 4755 -o root -g root" "" + ''; + + meta = with stdenv.lib; { + description = "A secure suspend/hibernate-friendly alternative to `vlock -an` without PAM support"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index a41fe5afb9ee..48d88ed40ce6 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,14 +1,25 @@ -{stdenv, fetchurl, x11, mesa, pkgconfig, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}: + +stdenv.mkDerivation rec { + version = "0.9.1"; + name = "rss-glx-${version}"; -stdenv.mkDerivation { - name = "rss-glx-0.8.1"; - src = fetchurl { - url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2; - sha256 = "1fs2xavyf9i6vcdmdnpyi9rbnrg05ldd49bvlcwpn5igv2g400yg"; + url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2"; + sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2]; + buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; + NIX_LDFLAGS= "-rpath ${libXext}/lib"; + + meta = { + description = "Really Slick Screensavers Port to GLX"; + longDescription = '' + This package currently contains all of the screensavers from the + original collection, plus a few others. + ''; + licence = stdenv.lib.licenses.gpl2; + }; } diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index cb937a940006..1d039e0a4402 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -18,14 +18,15 @@ stdenv.mkDerivation rec { libXxf86misc intltool ]; - patchPhase = + preConfigure = '' # Fix build error in version 5.18. Remove this patch when updating # to a later version. #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c - # Fix path to GTK. + + # Fix installation paths for GTK resources. sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ - -i driver/Makefile.in po/Makefile.in.in + -i driver/Makefile.in po/Makefile.in.in ''; configureFlags = diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 6378ffdafe3c..8cc44f2bfcba 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { fetchurl, bash, stdenv, python, cmake, vim, vimUtils, perl, ruby, unzip, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip, - vim_configurable, vimPlugins, xkb_switch + vim_configurable, vimPlugins, xkb_switch, git }: let @@ -51,25 +51,24 @@ rec { alternative = a; # backwards compat, added 2014-10-21 calendar = buildVimPlugin { - name = "calendar-git-2014-10-19"; + name = "calendar-git-2015-03-19"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim.git"; - rev = "44890a96d80bcd5fe62307e4bcb4d4085010e324"; - sha256 = "55f38e3e0af0f95229c654420c332668f93ac941f044c0573c7f1b26030e9202"; - }; + rev = "a1b9d1a11e301a25bc48350da833469ef8bb6c9f"; + sha256 = "a3a8da7890c5eedba72e2def86760b79092b3b5cf2ca3999deda5fa8eddecd49"; + }; meta = { - homepage = https://github.com/itchyny/calendar.vim; + homepage = https://github.com/itchyny/calendar.vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; command-t = buildVimPlugin rec { - version = "1.8"; - name = "command-t-${version}"; - src = fetchzip { - inherit name; - url = "https://github.com/wincent/Command-T/archive/${version}.tar.gz"; - sha256 = "186qz1smf7w91r68p724whg6d821f7ph6ks63l2vkhff8f9qqhrc"; + name = "command-t-git-2015-01-12"; + src = fetchgit { + url = "https://github.com/wincent/Command-T"; + rev = "13760a725779b65fa0f2ebef51806f3c05a52550"; + sha256 = "0cb284w1m8sxcc8ph64pm0cvqslpixss593a1ffnx9c09g6d7m8w"; }; buildInputs = [ perl ruby ]; buildPhase = '' @@ -83,25 +82,26 @@ rec { command_T = command-t; # backwards compat, added 2014-10-18 easymotion = buildVimPlugin { - name = "easymotion-git-2014-09-29"; + name = "easymotion-git-2015-02-24"; src = fetchgit { url = "https://github.com/lokaltog/vim-easymotion.git"; - rev = "868cd71710a48e8ec8acffeabd1eebfb10812c77"; - sha256 = "13c8b93c257fcbb0f6e0eb197700b4f8cbe4cf4846d29f1aba65f625202b9d77"; - }; + rev = "8acdfc60e58bb0600ded42a4f752bec6e3b6d882"; + sha256 = "1177d1c06a16fe7c1e681a729d158a6cacf3fed9c14bd8c4ece35a069f21dc07"; + }; meta = { - homepage = https://github.com/lokaltog/vim-easymotion; + homepage = https://github.com/lokaltog/vim-easymotion; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - - eighties = buildVimPlugin rec { - version = "1.0.4"; - name = "eighties-${version}"; - src = fetchurl { - url = "https://github.com/justincampbell/vim-eighties/archive/${version}.tar.gz"; - sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr"; + + eighties = buildVimPlugin { + name = "eighties-git-2015-02-12"; + src = fetchgit { + url = "https://github.com/justincampbell/vim-eighties"; + rev = "5d0ebf5424adb8017bec049de0cd51f6fa427281"; + sha256 = "b4216c805e54f923efcbd8d914f97883f135c989f33e87d2eee69b488b57e747"; }; + buildPhase = ":"; meta = with stdenv.lib; { description = "Automatically resizes your windows to 80 characters"; homepage = https://github.com/justincampbell/vim-eighties; @@ -111,6 +111,7 @@ rec { }; }; + gitgutter = vim-gitgutter; golang = buildVimPlugin { @@ -195,40 +196,40 @@ rec { }; idris-vim = buildVimPlugin { - name = "idris-vim-git-2014-10-14"; + name = "idris-vim-git-2014-12-29"; src = fetchgit { url = "https://github.com/idris-hackers/idris-vim.git"; - rev = "78730e511cae0a067f79da1168466601553f619b"; - sha256 = "47638b25fa53203e053e27ec6f135fd63ae640edbe37e62d7450a8c434a4cc6b"; - }; + rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1"; + sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff"; + }; meta = { - homepage = https://github.com/idris-hackers/idris-vim; + homepage = https://github.com/idris-hackers/idris-vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; ipython = buildVimPlugin { - name = "ipython-git-2014-07-17"; + name = "ipython-git-2015-01-12"; src = fetchgit { url = "https://github.com/ivanov/vim-ipython.git"; - rev = "9ce4f201ce26e9f01d56a6040ddf9255aab27272"; - sha256 = "444dede544f9b519143ecc3a6cdfef0c4c32043fc3cd69f92fdcd86c1010e824"; - }; + rev = "a47d92b371588a81f8501c66604d79e2827c60a8"; + sha256 = "7cf2dbed5b404164199d4784331b21d90d371275b1d324298cde9eeda3c4eb53"; + }; meta = { - homepage = https://github.com/ivanov/vim-ipython; + homepage = https://github.com/ivanov/vim-ipython; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; latex-box = buildVimPlugin { - name = "latex-box-git-2014-10-05"; + name = "latex-box-git-2015-03-05"; src = fetchgit { url = "https://github.com/latex-box-team/latex-box.git"; - rev = "3e000fb161bdf6efe7aef517aef276554aeabb65"; - sha256 = "462803aceec5904943074e11888482ef6c49c8a5e26d6728ebcb2c4f5dbbb6a4"; - }; + rev = "0992511ad9b250cbe53bccbec3b0cb24feca64ec"; + sha256 = "8e73020a4ad275dfb8887bfc6a85c8aa059a081feefb680b2fd7c85267137440"; + }; meta = { - homepage = https://github.com/latex-box-team/latex-box; + homepage = https://github.com/latex-box-team/latex-box; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; @@ -247,14 +248,14 @@ rec { }; neco-ghc = buildVimPlugin { - name = "neco-ghc-git-2014-10-17"; + name = "neco-ghc-git-2015-03-21"; src = fetchgit { url = "https://github.com/eagletmt/neco-ghc.git"; - rev = "fffdf57dcb312f874a43a202157b5efecfe3d9de"; - sha256 = "464b24e3151ebaf0e95c25f09cb047e2542d5dd9100087e538d0a5e46bd0e638"; - }; + rev = "7d2c360736679064986925873b8d1e2b1978d9f8"; + sha256 = "3c4d1b00c79953e56379792a64df036075a456cb10a7b891e1691d04c9f15310"; + }; meta = { - homepage = https://github.com/eagletmt/neco-ghc; + homepage = https://github.com/eagletmt/neco-ghc; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; @@ -262,12 +263,12 @@ rec { necoGhc = neco-ghc; # backwards compat, added 2014-10-18 neocomplete = buildVimPlugin { - name = "neocomplete-git-2014-11-18"; + name = "neocomplete-git-2015-03-24"; src = fetchgit { url = "https://github.com/Shougo/neocomplete.vim.git"; - rev = "26aef680ece29047089e7540b78696f1e6336be2"; - sha256 = "42734ddb29f6661de687e0d18c5ddbd443adc6d2f69fe8e44d0e47473f1bc0ae"; - }; + rev = "1ef1c33cfdcae43d8b3c6381c4f54f0e93a17287"; + sha256 = "5c61629c30906aacc00924ab5aaad720aba0011df348ea8835b6aaa53199550a"; + }; meta = { homepage = https://github.com/Shougo/neocomplete.vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; @@ -275,12 +276,12 @@ rec { }; neosnippet = buildVimPlugin { - name = "neosnippet-git-2014-11-18"; + name = "neosnippet-git-2015-01-19"; src = fetchgit { url = "https://github.com/Shougo/neosnippet.vim.git"; - rev = "811176b29b1a60a164c9878f8dcbe4a680ee32e5"; - sha256 = "903b6fa01511e319e5ce3efa3a7007047512f5f7ee7d61b69cd4a324420cf718"; - }; + rev = "044c9cb8ca46a5e27eec37198990c26fe707b02a"; + sha256 = "c448fac34e432a496ec1d76e07b478b27e66e6e4ec99c1b3923e66c781b74fc8"; + }; meta = { homepage = https://github.com/Shougo/neosnippet.vim; maintainers = [ stdenv.lib.maintainers.jagajaga ]; @@ -288,26 +289,27 @@ rec { }; neosnippet-snippets = buildVimPlugin { - name = "neosnippet-snippets-git-2014-11-17"; + name = "neosnippet-snippets-git-2015-03-25"; src = fetchgit { url = "https://github.com/Shougo/neosnippet-snippets.git"; - rev = "a15cdc307a62d64c3510b4a1097a8bd174746894"; - sha256 = "8d69b93163dd93474422bf4f362130151f25e2c9fad3500ba170161c24bf5bce"; - }; + rev = "dfa436157c9e72f16f0f0d088fa181b37e226c2f"; + sha256 = "00a65d1f6a1309acef42c0ca70f333ab355db521319c14db8247be38d28da730"; + }; meta = { homepage = https://github.com/Shougo/neosnippet-snippets; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; + nerdcommenter = The_NERD_Commenter; quickrun = buildVimPlugin { - name = "quickrun-git-2014-10-08"; + name = "quickrun-git-2015-03-26"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun.git"; - rev = "ae97cef42ae142306e9431dce9ab97c4353e5254"; - sha256 = "3219fadb3732c895c82b8bcff1d6e86f0917cd5ac7bf34180c27bb3f75ed1787"; + rev = "2d03b3a7405da0e95ff7f6f617843ba9f536395f"; + sha256 = "803e902a083b79c70ea3f826a89864b8879897cd36a655d9e789a0d651127eb3"; }; meta = { homepage = https://github.com/thinca/vim-quickrun; @@ -316,16 +318,14 @@ rec { }; racer = buildVimPlugin { - name = "racer-git-2014-11-24"; + name = "racer-git-2015-03-23"; src = fetchgit { - url = https://github.com/phildawes/racer; - rev = "50655ffd509bea09ea9b310970dedfeaf5a33cf3"; - sha256 = "0bd456i4nz12z39ljnw1kjg8mcflvm7rjql2r80fb038c7rd6xi1"; + url = "https://github.com/phildawes/racer"; + rev = "c6f557bfd9a22d45476651fa95f7d8415ed897a8"; + sha256 = "697d92e0acbb3a8c1d691eaebc008bec422060df10e3c4cf6fad448b30391852"; }; buildPhase = '' find . -type f -not -name 'racer.vim' -exec rm -rf {} \; - mkdir plugin - mv ./editors/racer.vim plugin/racer.vim rm -rf editors images src ''; meta = { @@ -399,11 +399,11 @@ rec { }; thumbnail = buildVimPlugin { - name = "thumbnail-git-2014-07-24"; + name = "thumbnail-git-2015-03-15"; src = fetchgit { url = "https://github.com/itchyny/thumbnail.vim.git"; - rev = "e59a1791862ed470510a58456cc001226e177a39"; - sha256 = "f36d915804e36b5f2dcea7db481da97ec60d0c90df87599a5d5499e649d97f66"; + rev = "19bd717307a8d0986a4a77116f47168fbe11e178"; + sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882"; }; meta = { homepage = https://github.com/itchyny/thumbnail.vim; @@ -412,11 +412,11 @@ rec { }; tmux-navigator = buildVimPlugin { - name = "tmux-navigator-git-2014-09-09"; + name = "tmux-navigator-git-2015-03-16"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator.git"; - rev = "195cdf087fea7beaf6274d0a655d157dfab3130c"; - sha256 = "4235c2bfb64a9094b854cdd7303a64bbb994717f24704911c4b358b2373dfaa9"; + rev = "928a52fbda90ec70b2eb6edaf570654df4521af0"; + sha256 = "6f6912960245664146ead711886aad216b74f4c6b1feec975cab199114afb13c"; }; meta = { homepage = https://github.com/christoomey/vim-tmux-navigator; @@ -427,11 +427,11 @@ rec { tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = buildVimPlugin { - name = "tslime-git-2014-06-12"; + name = "tslime-git-2015-02-10"; src = fetchgit { url = "https://github.com/jgdavey/tslime.vim.git"; - rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd"; - sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251"; + rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7"; + sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b"; }; meta = { homepage = https://github.com/jgdavey/tslime.vim; @@ -440,12 +440,12 @@ rec { }; vimproc = buildVimPlugin { - name = "vimproc-git-2014-10-03"; + name = "vimproc-git-2015-02-23"; src = fetchgit { url = "https://github.com/shougo/vimproc.vim.git"; - rev = "3e055023dfab4f5a4dfa05a834f9d0cb7294a82e"; - sha256 = "63c2786897e8315eed2473822879b7ceb847e6021695a861892d7b9ab15a69fb"; - }; + rev = "0f68bcd93399ecbcde3eaa4efd09107314c9bdee"; + sha256 = "850cb6d347f4c353782c48533f2dc6e3150a3982dc71efbd5f6b0a921264f939"; + }; buildInputs = [ which ]; buildPhase = '' @@ -460,9 +460,12 @@ rec { }; vimshell = buildVimPlugin rec { - version = "9.2"; - name = "vimshell-${version}"; - + name = "vimshell-git-2015-03-24"; + src = fetchgit { + url = "https://github.com/Shougo/vimshell.vim"; + rev = "41d3ad325852e80588ab57c64433fa338789d6ac"; + sha256 = "bf76ee252a3cbb121013ce10547cee7d31a64d10c46687ddfaa988e7c5baf095"; + }; meta = with stdenv.lib; { description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script"; homepage = https://github.com/Shougo/vimshell.vim; @@ -471,14 +474,7 @@ rec { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; - - src = fetchurl { - url = "https://github.com/Shougo/vimshell.vim/archive/ver.${version}.tar.gz"; - sha256 = "1pbwxdhpv6pr09b6hwkgy7grpmpwlqpsgsawl38r40q6yib8zb4a"; - }; - buildInputs = [ vimproc ]; - preBuild = '' sed -ie '1 i\ set runtimepath+=${vimproc}/${rtpPath}/vimproc\ @@ -508,11 +504,11 @@ rec { }; watchdogs = buildVimPlugin { - name = "watchdogs-git-2014-10-18"; + name = "watchdogs-git-2015-03-20"; src = fetchgit { url = "https://github.com/osyo-manga/vim-watchdogs.git"; - rev = "ad222796eb88b44954340c19c39938046af26e05"; - sha256 = "4c621ac2834864cf0c46f776029837913e1ba0c725a12d7cb24bf92e04ed1279"; + rev = "01ba53074fd3bedd81f5aed2dcc4fec092f62ba9"; + sha256 = "7b363779a0b035a0aaec025653a29e2f4dbd9e1518a34a6e993c43e8ec810d57"; }; meta = { homepage = https://github.com/osyo-manga/vim-watchdogs; @@ -548,14 +544,13 @@ rec { }; }; - YouCompleteMe = addRtp "${rtpPath}/youcompleteme" (stdenv.mkDerivation rec { + YouCompleteMe = buildVimPlugin { src = fetchgit { - rev = "035b6ca862da3bba0ab8aad388a485758311a464"; + rev = "56dc60ddc88d075902a5f13f10446923b009ad2f"; url = "https://github.com/Valloric/YouCompleteMe.git"; - sha256 = "0l4a7mp0r888gdfzl59z8vk5jx4km58kzzqbn8v48i1k6scryvl7"; + sha256 = "1i4qv2g9vhd8999iv7ly0pxyp9l99dzq3rjf4snkb8rpcrimgbkj"; }; - - name = "vimplugin-youcompleteme-2015-02-05"; + name = "youcompleteme-2015-03-25"; buildInputs = [ python cmake llvmPackages.clang ]; @@ -583,13 +578,13 @@ rec { installPhase = ":"; meta = { - description = "fastest non utf-8 aware word and C completion engine for Vim"; + description = "Fastest non utf-8 aware word and C completion engine for Vim"; homepage = http://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.linux; }; - }); + }; youcompleteme = YouCompleteMe; @@ -639,6 +634,7 @@ rec { ### The following derivations are generated by nix#ExportPluginsForNix + "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Colour_Sampler_Pack"; src = fetchurl { @@ -655,11 +651,11 @@ rec { }; "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist"; + name = "Gist-2015-03-25"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "8a567b823163d349406dffaff4519e0bac10eade"; - sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88"; + rev = "22eeb3a72f116818dec0e2f9fe3ea46443141b95"; + sha256 = "9ecaa593267958c5860d6e34be5fc1e3280da5265a1fb35bdb2904163049325f"; }; dependencies = []; @@ -675,7 +671,7 @@ rec { }; "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle"; + name = "Hoogle-2013-11-26"; src = fetchgit { url = "git://github.com/Twinside/vim-hoogle"; rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; @@ -685,7 +681,7 @@ rec { }; "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized"; + name = "Solarized-2011-05-09"; src = fetchgit { url = "git://github.com/altercation/vim-colors-solarized"; rev = "528a59f26d12278698bb946f8fb82a63711eec21"; @@ -695,27 +691,27 @@ rec { }; "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab"; + name = "Supertab-2015-02-15"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "454c06e25680799b6f408622d6bfbaf920ace825"; - sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01"; + rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; + sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b"; }; dependencies = []; }; "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic"; + name = "Syntastic-2015-03-25"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52"; - sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723"; + rev = "dac07db61758590c71d655ed5403181af4e845a2"; + sha256 = "96ae43056b79a50c34272f483c5c7a3cf55f5aa8699b319fe9ed5f7ba12ed0d7"; }; dependencies = []; }; "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular"; + name = "Tabular-2013-05-16"; src = fetchgit { url = "git://github.com/godlygeek/tabular"; rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; @@ -725,17 +721,17 @@ rec { }; "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar"; + name = "Tagbar-2015-03-17"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "00dfa82b00e734b453153564efeec933c48087f0"; - sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635"; + rev = "3634e7ab4feeab8ad49166e9e716638c20f1637c"; + sha256 = "cecbb15e025b300f688a7a67cc886a2e8a8afaf3e8fdca4a4d8ba73dabda8ab2"; }; dependencies = []; }; "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter"; + name = "The_NERD_Commenter-2014-07-08"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; @@ -745,7 +741,7 @@ rec { }; "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree"; + name = "The_NERD_tree-2014-11-20"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921"; @@ -755,17 +751,17 @@ rec { }; "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips"; + name = "UltiSnips-2015-03-05"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "d693259abb2e28f70abf760d395fcf526d5272ee"; - sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600"; + rev = "1971030b506a8f0e2e0398fb166f21a5341f8c7a"; + sha256 = "84c07f73ea22a34422c843c5ccb40aa8d3967175ff38ab6155303ba3c039e859"; }; dependencies = []; }; "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner"; + name = "VimOutliner-2015-01-09"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; rev = "7c995f973c54b0d026137615af28059890edb197"; @@ -775,7 +771,7 @@ rec { }; "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI"; + name = "WebAPI-2014-10-27"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; rev = "a7789abffe936db56e3152e23733847f94755753"; @@ -800,7 +796,7 @@ rec { }; "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary"; + name = "commentary-2014-11-10"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; rev = "9c685131a5facfa0d643feca3a61b41c007d8170"; @@ -810,7 +806,7 @@ rec { }; "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp"; + name = "ctrlp-2013-07-29"; src = fetchgit { url = "git://github.com/kien/ctrlp.vim"; rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; @@ -820,7 +816,7 @@ rec { }; "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite"; + name = "extradite-2015-01-26"; src = fetchgit { url = "git://github.com/int3/vim-extradite"; rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f"; @@ -830,33 +826,33 @@ rec { }; "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive"; + name = "fugitive-2015-02-20"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "933f6a1e1df549564062f936bd1c836d28cf1676"; - sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908"; + rev = "0095769029709b531d2505ee6ad9907dd9bd72a0"; + sha256 = "83184b527538d0aac01783074ec29addfa18b62880ec8959dae6e404c6ff3d11"; }; dependencies = []; }; "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod"; + name = "ghcmod-2015-03-17"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; - sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; + rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb"; + sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899"; }; dependencies = []; }; - "github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "github-MarcWeber-vim-addon-vim2nix"; + "github:JagaJaga/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "github-JagaJaga-vim-addon-vim2nix-2015-03-06"; src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-vim2nix"; - rev = "5507ee4db7599873d72fab035c752dea245e2cd4"; - sha256 = "1rqvgg3wq1grkh4nfj2wqmjg7a9r4hd82m89s9520kyzvldp8sgx"; - }; - dependencies = ["vim-addon-manager"]; + url = "git://github.com/JagaJaga/vim-addon-vim2nix"; + rev = "343d8a4e43a5b40f134e73be7140f754ca74d2e5"; + sha256 = "466ac56d4397d964cf21a63d31f2628fdea40bc94a54018affe8717de8514564"; + }; + dependencies = ["vim-addon-manager"]; }; "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -881,7 +877,7 @@ rec { ''; }; "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen"; + name = "pathogen-2014-11-06"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2"; @@ -891,7 +887,7 @@ rec { }; "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus"; + name = "quickfixstatus-2011-09-02"; src = fetchgit { url = "git://github.com/dannyob/quickfixstatus"; rev = "fd3875b914fc51bbefefa8c4995588c088163053"; @@ -901,7 +897,7 @@ rec { }; "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses"; + name = "rainbow_parentheses-2013-03-04"; src = fetchgit { url = "git://github.com/kien/rainbow_parentheses.vim"; rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; @@ -911,7 +907,7 @@ rec { }; "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust"; + name = "rust-2015-01-29"; src = fetchgit { url = "git://github.com/wting/rust.vim"; rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376"; @@ -921,26 +917,27 @@ rec { }; "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible"; + name = "sensible-2014-11-24"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; rev = "b30dcf387af977acfa21732592bfca05598b2188"; sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f"; }; dependencies = []; + }; "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate"; + name = "snipmate-2015-03-21"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5"; - sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0"; + rev = "2079ea5aadaada568f78acfc6b565945625ed97d"; + sha256 = "47f5d131485f8a57389a0b455c6e83f8f543d71a04cbaa7af594b3abe9099d9f"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap"; + name = "sourcemap-2012-09-19"; src = fetchgit { url = "git://github.com/chikatoike/sourcemap.vim"; rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; @@ -950,47 +947,47 @@ rec { }; "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround"; + name = "surround-2015-03-15"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd"; - sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269"; + rev = "772ab9587b7d1e2c3bae75395c9123803059ba8a"; + sha256 = "5f4c5afecaa99dc67875a2356b46cb6e8daeffca4a00a451965ca022de26cbef"; }; dependencies = []; }; "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode"; + name = "table-mode-2015-03-17"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9"; - sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c"; + rev = "c0a6d43f2191b841c01cec0638a33a8116f7f920"; + sha256 = "222532a9803f855b5f261eb311359980625606716c1b9419703b97874554c49d"; }; dependencies = []; }; "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib"; + name = "tlib-2015-02-23"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "9e629767e5a91ede057d07f8754326e68c92a692"; - sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6"; + rev = "2376d1233e7d1db8157fdc3157278dda7a2c796f"; + sha256 = "07966a0f2a073ae07e8d2a63a8a265ec0053997721545b41cedff910bcc24de0"; }; dependencies = []; }; "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree"; + name = "undotree-2015-03-01"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "42000e2a7140843030f517de9d4923dd5fa40458"; - sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293"; + rev = "fa018f38252f58073f2987f8bf0d2d4a61e07277"; + sha256 = "c52874b0b85d0a44a1f2f055a74985886af97615bac032259fc21d6ea40d6ca7"; }; dependencies = []; }; "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions"; + name = "vim-addon-actions-2014-09-22"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-actions"; rev = "a5d20500fb8812958540cf17862bd73e7af64936"; @@ -1000,7 +997,7 @@ rec { }; "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async"; + name = "vim-addon-async-2013-10-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; @@ -1010,7 +1007,7 @@ rec { }; "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd"; + name = "vim-addon-background-cmd-2015-01-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-background-cmd"; rev = "e99076519139b959edce0581b0f31207a5ec7c64"; @@ -1020,7 +1017,7 @@ rec { }; "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting"; + name = "vim-addon-commenting-2013-06-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-commenting"; rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; @@ -1030,17 +1027,17 @@ rec { }; "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion"; + name = "vim-addon-completion-2015-02-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; - sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "969a474749edf7e4443d2540eaf12e891cc0a3f5533e62e081d32408f403a0ea"; }; dependencies = ["tlib"]; }; "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats"; + name = "vim-addon-errorformats-2014-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-errorformats"; rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; @@ -1050,7 +1047,7 @@ rec { }; "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor"; + name = "vim-addon-goto-thing-at-cursor-2012-01-11"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; @@ -1060,27 +1057,27 @@ rec { }; "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc"; + name = "vim-addon-local-vimrc-2015-03-19"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; - sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; + rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; + sha256 = "f0687e08f380ff085b6fa3e708d1631049571706f55d796e22612aff02e51459"; }; dependencies = []; }; "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager"; + name = "vim-addon-manager-2014-12-03"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07"; - sha256 = "1gp7w6wnp1cnvq7lhb6kkqrp315mxzwsc4sy1bxz1ih1rjdxmdd3"; + sha256 = "a3b5da9bcc01c6f0fb0a5e13a6f9efb58471339ed32c480fde96856bb9e1e7be"; }; dependencies = []; }; "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru"; + name = "vim-addon-mru-2013-08-08"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mru"; rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; @@ -1090,7 +1087,7 @@ rec { }; "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils"; + name = "vim-addon-mw-utils-2012-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mw-utils"; rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; @@ -1100,17 +1097,17 @@ rec { }; "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix"; + name = "vim-addon-nix-2015-03-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; - sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; + rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1"; + sha256 = "0e326e2c6cb6597ca533a64a845ef9dd946cd249250375ef9775d974ecef37e2"; }; dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other"; + name = "vim-addon-other-2014-07-15"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-other"; rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; @@ -1120,7 +1117,7 @@ rec { }; "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual"; + name = "vim-addon-php-manual-2015-01-01"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-php-manual"; rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; @@ -1130,7 +1127,7 @@ rec { }; "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs"; + name = "vim-addon-signs-2013-04-19"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-signs"; rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; @@ -1140,7 +1137,7 @@ rec { }; "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql"; + name = "vim-addon-sql-2014-01-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; @@ -1150,7 +1147,7 @@ rec { }; "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker"; + name = "vim-addon-syntax-checker-2013-07-12"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; @@ -1160,7 +1157,7 @@ rec { }; "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer"; + name = "vim-addon-toggle-buffer-2012-01-13"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; @@ -1170,7 +1167,7 @@ rec { }; "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug"; + name = "vim-addon-xdebug-2014-08-29"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-xdebug"; rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; @@ -1180,17 +1177,17 @@ rec { }; "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline"; + name = "vim-airline-2015-03-24"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "446397e006d8cba9e1ac38d8c656ba39218c139b"; - sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119"; + rev = "f45ecdac15d99ed2354873a8b4d40432fd0a85a3"; + sha256 = "30176b06f13838fe7b0374e2ed529c0d26abe432ff7453c7443b2f204cf70012"; }; dependencies = []; }; "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script"; + name = "vim-coffee-script-2014-10-10"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; rev = "827e4a38b07479433b619091469a7495a392df8a"; @@ -1200,7 +1197,7 @@ rec { }; "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align"; + name = "vim-easy-align-2014-12-14"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; rev = "c62d124be614de65922b15d468c4049d1eee9353"; @@ -1210,17 +1207,17 @@ rec { }; "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter"; + name = "vim-gitgutter-2015-03-23"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd"; - sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d"; + rev = "8345c35770ffc6fc4088c36406d1e24170aabcc6"; + sha256 = "f7580832ebfd60f0b7cf05e697ac44e4b59a0f606fe49b7ef392052a50c69ad3"; }; dependencies = []; }; "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script"; + name = "vim-iced-coffee-script-2013-12-27"; src = fetchgit { url = "git://github.com/noc7c9/vim-iced-coffee-script"; rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; @@ -1230,7 +1227,7 @@ rec { }; "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview"; + name = "vim-latex-live-preview-2013-11-25"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; @@ -1240,7 +1237,7 @@ rec { }; "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature"; + name = "vim-signature-2015-01-12"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45"; @@ -1250,17 +1247,17 @@ rec { }; "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets"; + name = "vim-snippets-2015-03-24"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "27906a3754f0ac292d0915a4075bff22db53fa3e"; - sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6"; + rev = "707f005ccddaa15a0b8c207a7a711b0a9590578a"; + sha256 = "0c5807b82e18530a6b83f4f1c0010564a1a4b39f687672ab235b95e694095d03"; }; dependencies = []; }; "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs"; + name = "vim2hs-2014-04-16"; src = fetchgit { url = "git://github.com/dag/vim2hs"; rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; @@ -1270,11 +1267,11 @@ rec { }; "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle"; + name = "vundle-2015-03-21"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; + rev = "cfd3b2d388a8c2e9903d7a9d80a65539aabfe933"; + sha256 = "7ce9bb0a59c8f86cedd9b3867b834bcd160f2224c187189997ef76c2bfd99d50"; }; dependencies = []; @@ -1292,7 +1289,6 @@ rec { url = "http://www.vim.org/scripts/script.php?script_id=2465"; }; - }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c69f91223561..32ff3045a13e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -52,5 +52,5 @@ "YankRing" "vim-addon-manager" "vim-addon-nix" -"github:MarcWeber/vim-addon-vim2nix" +"github:JagaJaga/vim-addon-vim2nix" "sensible" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 6b5dd139525b..9140acffe0d8 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -296,7 +296,7 @@ rec { pluginnames2Nix = {name, namefiles} : vim_configurable.customize { inherit name; vimrcConfig.vam.knownPlugins = vimPlugins; - vimrcConfig.vam.pluginDictionaries = ["github:MarcWeber/vim-addon-vim2nix"]; + vimrcConfig.vam.pluginDictionaries = ["github:JagaJaga/vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream vimrcConfig.customRC = '' " Yes - this is impure and will create the cache file and checkout vim-pi " into ~/.vim/vim-addons diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index e8be1b6b0e66..61d3667f1658 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.25"; + name = "bluez-5.29"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0c7xs4imwfgyx59qxbinfi403vhki1n8src1g87qlqz28lzjz9jw"; + sha256 = "1r7h8qr52n372r73fdyk804r92hqg9g6pvflwmak64y6brnnl8fz"; }; pythonPath = with pythonPackages; diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix new file mode 100644 index 000000000000..7f5a30144c8b --- /dev/null +++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, python, + pythonPackages, pythonDBus, readline, libsndfile, udev, libical, + systemd, enableWiimote ? false }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "bluez-5.28"; + + src = fetchurl { + url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; + sha256 = "1a8qzh38wpq5c0rydpx9isf0jc6g14g2qs18j1rmi8a79f7v9fl5"; + }; + + pythonPath = with pythonPackages; + [ pythonDBus pygobject pygobject3 recursivePthLoader ]; + + buildInputs = + [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython + readline libsndfile udev libical + # Disables GStreamer; not clear what it gains us other than a + # zillion extra dependencies. + # gstreamer gst_plugins_base + ]; + + preConfigure = '' + substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm + substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " + ''; + + configureFlags = [ + "--localstatedir=/var" + "--enable-library" + "--enable-cups" + "--with-dbusconfdir=$(out)/etc" + "--with-dbussystembusdir=$(out)/share/dbus-1/system-services" + "--with-dbussessionbusdir=$(out)/share/dbus-1/services" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-udevdir=$(out)/lib/udev" + ] ++ + stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; + + # Work around `make install' trying to create /var/lib/bluetooth. + installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; + + makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; + + # FIXME: Move these into a separate package to prevent Bluez from + # depending on Python etc. + postInstall = '' + mkdir $out/test + cp -a test $out + pushd $out/test + for a in \ + simple-agent \ + test-adapter \ + test-device \ + test-thermometer \ + list-devices \ + monitor-bluetooth \ + ; do + ln -s ../test/$a $out/bin/bluez-$a + done + popd + wrapPythonProgramsIn $out/test "$out/test $pythonPath" + + # for bluez4 compatibility for NixOS + mkdir $out/sbin + ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd + ''; + + meta = with stdenv.lib; { + homepage = http://www.bluez.org/; + repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; + description = "Bluetooth support for Linux"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix new file mode 100644 index 000000000000..79be500a13d7 --- /dev/null +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, libnih, dbus }: + +stdenv.mkDerivation rec { + name = "cgmanager-0.36"; + + src = fetchurl { + url = "https://linuxcontainers.org/downloads/cgmanager/${name}.tar.gz"; + sha256 = "039azd4ghpmiccd95ki8fna321kccapff00rib6hrdgg600pyw7l"; + }; + + buildInputs = [ pkgconfig libnih dbus ]; + + configureFlags = [ + "--with-init-script=systemd" + "--sysconfdir=/etc/" + "--localstatedir=/var" + ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + + meta = with stdenv.lib; { + homepage = https://linuxcontainers.org/cgmanager/introduction/; + description = "a central privileged daemon that manages all your cgroups"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index d3a0b827ed10..50ea3f6a0675 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.6.3"; + name = "cryptsetup-1.6.7"; src = fetchurl { - url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2"; + url = "mirror://kernel/linux/utils/cryptsetup/v1.6/${name}.tar.xz"; + sha256 = "0878vwblazms1dac2ds7vyz8pgi1aac8870ccnl2s0v2sv428g62"; }; configureFlags = [ "--enable-cryptsetup-reencrypt" ] diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index be3d6a997b3a..6ac468774ad1 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchgit }: -stdenv.mkDerivation { - name = "firmware-linux-nonfree-2015-03-09"; +stdenv.mkDerivation rec { + name = "firmware-linux-nonfree-${version}"; + version = "2015-03-20"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "020e534ec90106d42a890cd9d090b24e3d158c53"; - sha256 = "101mpps0jcv2dd4jh1w3j4h78d4iv8n8r1cnf4br2vg66zl3zg9v"; + rev = "f404336ba808cbd57547196e13367079a23b822c"; + sha256 = "0avz5vxax2b3s4gafib47vih1lbq78agdmpjcjnnnykw2kschkwa"; }; preInstall = '' @@ -22,4 +23,6 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; + + passthru = { inherit version; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index f8081127d515..84535e8d25ee 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libnl, openssl, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "1pxlkfj1r2k5lxph2x9l02jrn652b3whcfh6l604rbbghxv2nk69"; + sha256 = "0zv5pnfrp6z7jjbskzgdb2rlmlbvdxmmis7ca94x5jy9s5mypq3g"; }; buildInputs = [ libnl openssl pkgconfig ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { echo CONFIG_IEEE80211N=y | tee -a .config export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)" ''; + preInstall = "mkdir -p $out/bin"; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 325a44f97aa4..1987e914ad9a 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { - name = "hwdata-0.249"; + name = "hwdata-0.276"; src = fetchurl { - url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.249-1.tar.bz2"; - sha256 = "1ak3h3psg3wk9yk0dqnzdzik3jadzja3ah22vjfmf71p3b5xc8ai"; + url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.276.tar.xz"; + sha256 = "0pg0ms6kb2mm25mdklsb0xn2spcwi2mhygzc7bkpji72qq8srzsh"; }; preConfigure = "patchShebangs ./configure"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 002c2997cd6d..c38636ffac35 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -240,6 +240,16 @@ with stdenv.lib; SECURITY_APPARMOR y DEFAULT_SECURITY_APPARMOR y + # Microcode loading support + MICROCODE y + MICROCODE_INTEL y + MICROCODE_AMD y + ${optionalString (versionAtLeast version "3.11") '' + MICROCODE_EARLY y + MICROCODE_INTEL_EARLY y + MICROCODE_AMD_EARLY y + ''} + # Misc. options. 8139TOO_8129 y 8139TOO_PIO n # PIO is slower @@ -282,7 +292,6 @@ with stdenv.lib; LOGO n # not needed MEDIA_ATTACH y MEGARAID_NEWGEN y - MICROCODE_AMD y MODVERSIONS y MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 31fe3081ab24..853b784a3357 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.72"; + version = "3.10.73"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "17qfy5hmd2cn5wfk4mfvv9ygn958a4j75lsya9xdjrw10in1a22a"; + sha256 = "0xy8738sdbw7lbqwkmbhr2zghva5nyfqq163r6jmjr6cfw116kin"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index a1340335983e..ea5a9f927d4f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.36"; + version = "3.14.37"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "03pl303z3vvldc3hamlrq77mcy66nsqdfk7yi43nzyrnmrby3l0r"; + sha256 = "1pq4i97vys38rl8ylx4s08qgh9yz3cl840j1f70yzakmc2017byc"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 154c9633cdb6..06145488d50f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.9"; + version = "3.18.10"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "00cm64s17d03rlzkgqs0fq91vm95csfa2xw4zhp7y0md9fd73dxi"; + sha256 = "0kmh0ybjh1l35pm421v2q3z9fyhss85agh1rkmnh9bim2bq1ac6h"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 2a34202c8950..10c6215f871f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19.2"; + version = "3.19.3"; # Remember to update grsecurity! extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0b8bfpfpyrpccb8v4nld0a0siricg8f3awmhz8wn4kwdvhhf83hc"; + sha256 = "0nis1r9fg562ysirzlyvfxvirpcfhxhhpfv3s13ccz20qiqiy46f"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a2473e3f4c8d..6a4b707e7779 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.36"; - revision = "201503182218"; + { kversion = "3.14.37"; + revision = "201503270048"; branch = "stable"; - sha256 = "14njc3xih3v38fnh7wrx7xdapqi67032qa6gp2qzhp41f5q7i4i8"; + sha256 = "1ryxh89m392mwqlwqiy3jszyhq9cxmvkv320di7hi50aqx8k2lqf"; }; grsecurity_unstable = grsecPatch - { kversion = "3.19.2"; - revision = "201503201903"; + { kversion = "3.19.3"; + revision = "201503270049"; branch = "test"; - sha256 = "0ha4hvf2c9im9cyq9sxdbdx165i6ngywf46899aq3giyw74gnpf3"; + sha256 = "0m76p947gr0bqk6xxb237bpf4ikxjzycjzq4i2szm4n86k9sfac0"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 1d4ecdec98d4..228f7b34be01 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.114"; + version = "2.02.118"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "19bl536yylyi873p46prfwv086bg0sg0q5l4c7x6lnlwzfnb176y"; + sha256 = "1ishsibxn1l5fymrrc5fd3z05x1z2zh0y8939wpvwz0qp9rwxazn"; }; configureFlags = diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 97f80b53032b..9939a5525747 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,38 +1,63 @@ -{ stdenv, autoreconfHook, fetchurl, libcap, libapparmor, perl, docbook2x -, docbook_xml_dtd_45, gnutls, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x +, docbook_xml_dtd_45, systemd +, libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null +, libnih ? null, dbus ? null, libcap ? null }: +let + enableCgmanager = cgmanager != null && libnih != null && dbus != null; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-1.0.7"; + name = "lxc-1.1.1"; - src = fetchurl { - url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "1wm8n1b8j3x37757h2yyz53k3b6r2r301fmkviqf4xp0jaav1cd0"; + src = fetchFromGitHub { + owner = "lxc"; + repo = "lxc"; + rev = name; + sha256 = "04zpznd364862y3dwn97klvwfw9i2b6n1lh4fkci0z74c6z9svql"; }; - buildInputs = [ libcap libapparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; + buildInputs = [ + autoreconfHook pkgconfig perl docbook2x systemd + libapparmor gnutls libseccomp cgmanager libnih dbus libcap + ]; - patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; + patches = [ ./support-db2x.patch ]; - preConfigure = '' - export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml - substituteInPlace doc/rootfs/Makefile.am --replace '@LXCROOTFSMOUNT@' '$out/lib/lxc/rootfs' - substituteInPlace configure.ac --replace '$sysconfdir/' '/etc/' - substituteInPlace configure.ac --replace '$${sysconfdir}/' '/etc/' - ''; + XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; configureFlags = [ "--localstatedir=/var" + "--sysconfdir=/etc" "--with-rootfs-path=/var/lib/lxc/rootfs" + ] ++ optional (libapparmor != null) "--enable-apparmor" + ++ optional (gnutls != null) "--enable-gnutls" + ++ optional (libseccomp != null) "--enable-seccomp" + ++ optional (enableCgmanager) "--enable-cgmanager" + ++ optional (libcap != null) "--enable-capabilities" + ++ [ "--enable-doc" "--enable-tests" - "--enable-apparmor" ]; + 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://lxc.sourceforge.net"; description = "userspace tools for Linux Containers, a lightweight virtualization system"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; longDescription = '' LXC is the userspace control package for Linux Containers, a @@ -42,7 +67,7 @@ stdenv.mkDerivation rec { mechanisms to Linux’s existing process management infrastructure. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.linux; + maintainers = with maintainers; [ simons wkennington ]; }; } diff --git a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch deleted file mode 100644 index d45335a02324..000000000000 --- a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index eac2bfd..8f040d3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,8 +25,8 @@ pcdatadir = $(libdir)/pkgconfig - pcdata_DATA = lxc.pc - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(LXCPATH) -- $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc -+ $(MKDIR_P) $(out)$(LXCPATH) -+ $(MKDIR_P) $(out)$(localstatedir)/cache/lxc - - ChangeLog:: - @touch ChangeLog diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1ab7a600fcd9..b6ae89afbaf6 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }: let pname = "macchanger"; - version = "1.6.0"; + version = "1.7.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "31534f138f1d21fa247be74ba6bef3fbfa47bbcd5033e99bd10c432fe58e51f7"; + + src = fetchFromGitHub { + owner = "alobbs"; + repo = "macchanger"; + rev = version; + sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r"; }; + buildInputs = [ autoreconfHook texinfo ]; + meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; maintainers = [ stdenv.lib.maintainers.joachifm ]; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 48e1c1784900..767f1e9ecaea 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.3"; + name = "mdadm-3.3.2"; src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; - sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; + url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; + sha256 = "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg"; }; nativeBuildInputs = [ groff ]; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 0ca33fa31f04..76a340529910 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, firmwareLinuxNonfree, libarchive }: stdenv.mkDerivation rec { - name = "amd-ucode-2012-09-10"; + name = "amd-ucode-${firmwareLinuxNonfree.version}"; - src = fetchurl { - urls = - [ "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/${name}.tar/559bc355d3799538584add80df2996f0/${name}.tar" - "http://www.amd64.org/pub/microcode/${name}.tar" - ]; - sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111"; - }; + src = firmwareLinuxNonfree; + + sourceRoot = "."; + + buildInputs = [ libarchive ]; + + buildPhase = '' + mkdir -p kernel/x86/microcode + find ${firmwareLinuxNonfree}/lib/firmware/amd-ucode -name \*.bin \ + -exec sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' \; + ''; installPhase = '' - mkdir -p $out/lib/firmware/amd-ucode $out/share/doc/amd-ucode - mv microcode_amd_fam15h.bin microcode_amd.bin $out/lib/firmware/amd-ucode/ - mv LICENSE $out/share/doc/amd-ucode + mkdir -p $out + echo kernel/x86/microcode/AuthenticAMD.bin | bsdcpio -o -H newc -R 0:0 > $out/amd-ucode.img ''; - meta = { + meta = with stdenv.lib; { description = "AMD Processor microcode patch"; homepage = http://www.amd64.org/support/microcode.html; - license = stdenv.lib.licenses.unfreeRedistributableFirmware; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/microcode/converter.nix b/pkgs/os-specific/linux/microcode/converter.nix deleted file mode 100644 index da4d96772171..000000000000 --- a/pkgs/os-specific/linux/microcode/converter.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "microcode2ucode-20120205"; - src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/intel-microcode2ucode.c/0efc5f6c74a4d7e61ca22683c93c98cf/intel-microcode2ucode.c"; - sha256 = "c51b1b1d8b4b28e7d5d007917c1e444af1a2ff04a9408aa9067c0e57d70164de"; - }; - - sourceRoot = "."; - - unpackPhase = '' - # nothing to unpack - ''; - - buildPhase = '' - gcc -Wall -O2 $src -o intel-microcode2ucode - ''; - - installPhase = '' - mkdir -p "$out/bin" - cp intel-microcode2ucode "$out/bin/" - ''; - - meta = { - homepage = http://www.intel.com; - description = "Microcode converter for Intel .dat files"; - }; -} diff --git a/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c b/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c new file mode 100644 index 000000000000..c1660fae38a1 --- /dev/null +++ b/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c @@ -0,0 +1,154 @@ +/* + * Convert Intel microcode.dat into a single binary microcode.bin file + * + * Based on code by Kay Sievers <kay.sievers@vrfy.org> + * Changed to create a single file by Thomas Bächler <thomas@archlinux.org> + */ + + +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <limits.h> +#include <stdbool.h> +#include <inttypes.h> +#include <fcntl.h> +#include <errno.h> +#include <sys/stat.h> + +struct microcode_header_intel { + unsigned int hdrver; + unsigned int rev; + unsigned int date; + unsigned int sig; + unsigned int cksum; + unsigned int ldrver; + unsigned int pf; + unsigned int datasize; + unsigned int totalsize; + unsigned int reserved[3]; +}; + +union mcbuf { + struct microcode_header_intel hdr; + unsigned int i[0]; + char c[0]; +}; + +int main(int argc, char *argv[]) +{ + const char *filename = "/lib/firmware/microcode.dat"; + FILE *f; + char line[LINE_MAX]; + char buf[4000000]; + union mcbuf *mc; + size_t bufsize, count, start; + int rc = EXIT_SUCCESS; + + if (argv[1] != NULL) + filename = argv[1]; + + count = 0; + mc = (union mcbuf *) buf; + f = fopen(filename, "re"); + if (f == NULL) { + printf("open %s: %m\n", filename); + rc = EXIT_FAILURE; + goto out; + } + + while (fgets(line, sizeof(line), f) != NULL) { + if (sscanf(line, "%x, %x, %x, %x", + &mc->i[count], + &mc->i[count + 1], + &mc->i[count + 2], + &mc->i[count + 3]) != 4) + continue; + count += 4; + } + fclose(f); + + bufsize = count * sizeof(int); + printf("%s: %lu(%luk) bytes, %zu integers\n", + filename, + bufsize, + bufsize / 1024, + count); + + if (bufsize < sizeof(struct microcode_header_intel)) + goto out; + + f = fopen("microcode.bin", "we"); + if (f == NULL) { + printf("open microcode.bin: %m\n"); + rc = EXIT_FAILURE; + goto out; + } + + start = 0; + for (;;) { + size_t size; + unsigned int family, model, stepping; + unsigned int year, month, day; + + mc = (union mcbuf *) &buf[start]; + + if (mc->hdr.totalsize) + size = mc->hdr.totalsize; + else + size = 2000 + sizeof(struct microcode_header_intel); + + if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) { + printf("unknown version/format:\n"); + rc = EXIT_FAILURE; + break; + } + + /* + * 0- 3 stepping + * 4- 7 model + * 8-11 family + * 12-13 type + * 16-19 extended model + * 20-27 extended family + */ + family = (mc->hdr.sig >> 8) & 0xf; + if (family == 0xf) + family += (mc->hdr.sig >> 20) & 0xff; + model = (mc->hdr.sig >> 4) & 0x0f; + if (family == 0x06) + model += ((mc->hdr.sig >> 16) & 0x0f) << 4; + stepping = mc->hdr.sig & 0x0f; + + year = mc->hdr.date & 0xffff; + month = mc->hdr.date >> 24; + day = (mc->hdr.date >> 16) & 0xff; + + printf("\n"); + printf("signature: 0x%02x\n", mc->hdr.sig); + printf("flags: 0x%02x\n", mc->hdr.pf); + printf("revision: 0x%02x\n", mc->hdr.rev); + printf("date: %04x-%02x-%02x\n", year, month, day); + printf("size: %zu\n", size); + + if (fwrite(mc, size, 1, f) != 1) { + printf("write microcode.bin: %m\n"); + rc = EXIT_FAILURE; + goto out; + } + + start += size; + if (start >= bufsize) + break; + } + fclose(f); + printf("\n"); +out: + return rc; +} diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index b72194548e07..ea9ff1d58d1a 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchurl, microcode2ucode }: +{ stdenv, fetchurl, libarchive }: -let version = "20140624"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "microcode-intel-${version}"; + version = "20150121"; src = fetchurl { - url = "http://downloadmirror.intel.com/23984/eng/microcode-${version}.tgz"; - sha256 = "0dza0bdlx7q88yhnynvfgkrhgf7ycrq6mlp6hwnpp2j3h33jlrml"; + url = "http://downloadmirror.intel.com/24661/eng/microcode-${version}.tgz"; + sha256 = "1cznv3f25cxkwxdc930ab0ifvq0c76fryppadi4p26a2pf9knd93"; }; - buildInputs = [ microcode2ucode ]; + buildInputs = [ libarchive ]; sourceRoot = "."; buildPhase = '' - intel-microcode2ucode microcode.dat + gcc -O2 -Wall -o intel-microcode2ucode ${./intel-microcode2ucode.c} + ./intel-microcode2ucode microcode.dat ''; installPhase = '' - mkdir -p $out/lib/firmware - cp -r intel-ucode "$out/lib/firmware/" + mkdir -p $out kernel/x86/microcode + mv microcode.bin kernel/x86/microcode/GenuineIntel.bin + echo kernel/x86/microcode/GenuineIntel.bin | bsdcpio -o -H newc -R 0:0 > $out/intel-ucode.img ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.intel.com/; description = "Microcode for Intel processors"; - license = stdenv.lib.licenses.unfree; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index cd13914580a9..c10cfb38cbd6 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "1d7inhai37g1ph6yg7ldyl4k5c7i8xvaa5w62n85n3albk2n00as"; + sha256 = "168mz5mwmzr5j6l4jxnwaxw6l89xycql3vfk01jsmy7chziamq6q"; }; enableParallelBuilding = true; - configurePhase = '' - ./configure --enable-shared --enable-static --prefix=$out --syslibdir=$out/lib - ''; + + configureFlags = [ + "--enable-shared" + "--enable-static" + ]; + + dontDisableStatic = true; meta = { description = "An efficient, small, quality libc implementation"; diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 5c3ccd86120f..be09b424a6b7 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-20"; + version = "2015-03-25"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "79a0056e137c9cc540eb9ff7327c85ac8d094e6c"; - sha256 = "0xj132x0q76h9anjh7km2blqnr19yx7szwifj02x5h6xa07vq6fd"; + rev = "a4f54cf036d9a966ff87abe9a0063f2b457c2389"; + sha256 = "0n10icwmnx3y6201fncswhd1mfvs6xyk8praj27z0wnzxs1i4k96"; }; patches = [ ./const.patch ./install_prefix-git.patch ]; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index ca1f698fa31e..710a01ed03d2 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,32 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: - -let - - # Obtained from http://www.linux-usb.org/usb.ids.bz2. - usbids = fetchurl { - url = http://tarballs.nixos.org/usb.ids.20130821.bz2; - sha256 = "0x7mf4h5h5wjzhygfr4lc8yz0cwm7mahxrnp5nkxcmawmyxwsg53"; - }; - -in +{ stdenv, fetchurl, pkgconfig, libusb1, hwdata }: stdenv.mkDerivation rec { - name = "usbutils-007"; + name = "usbutils-008"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "197gpbxnspy6ncqv5mziaikcfqgb3irbqqlfwjgzvh5v4hbs14vm"; + sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24"; }; buildInputs = [ pkgconfig libusb1 ]; - preBuild = "bunzip2 < ${usbids} > usb.ids"; - postInstall = '' rm $out/sbin/update-usbids.sh substituteInPlace $out/bin/lsusb.py \ - --replace /usr/share/usb.ids $out/share/usb.ids + --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids ''; meta = { diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 62600886fa64..fb7b7f76ee44 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-20"; + version = "2015-03-25"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "bc88866657979c5658441e201e19df365c67ddfe"; - sha256 = "1d97xw7cak64f0ywwskjssnryljidf4hpngmqv0mmz4lk4hwirm9"; + rev = "7d90f569b3f05def7cbd0a52ce8ac3040364d702"; + sha256 = "09qcfd3h6zjwvgr1prs41qi8wlzvdv8x4sfrcf95bjj6h25v7n51"; }; patches = [ diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 5e0bc4f60f1b..4228f8b1eab3 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -9,20 +9,13 @@ assert jackaudioSupport -> jack2 != null; stdenv.mkDerivation rec { - name = "pulseaudio-5.0"; + name = "pulseaudio-6.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.xz"; - sha256 = "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr"; + sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm"; }; - patches = [(fetchpatch { - name = "CVE-2014-3970.patch"; - url = "http://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/" - + "?id=26b9d22dd24c17eb118d0205bf7b02b75d435e3c"; - sha256 = "13vxp6520djgfrfxkzy5qvabl94sga3yl5pj93xawbkgwzqymdyq"; - })]; - # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated. propagatedBuildInputs = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; @@ -55,6 +48,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--with-access-group=audio" + "--with-systemduserunitdir=\${out}/lib/systemd/user" ] ++ stdenv.lib.optional jackaudioSupport "--enable-jack" ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/"; diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix new file mode 100644 index 000000000000..230e0aee2181 --- /dev/null +++ b/pkgs/servers/rippled/data-api.nix @@ -0,0 +1,25 @@ +{ lib, fetchgit, fetchurl, nodePackages }: + +with lib; + +let + np = nodePackages.override { generated = ./package.nix; self = np; }; +in nodePackages.buildNodePackage rec { + name = "ripple-data-api-${version}"; + version = lib.strings.substring 0 7 rev; + rev = "c56b860105f36c1c44ae011189d495272648c589"; + + src = fetchgit { + url = https://github.com/ripple/ripple-data-api.git; + inherit rev; + sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m"; + }; + + deps = (filter (v: nixType v == "derivation") (attrValues np)); + + meta = { + description = "Historical ripple data"; + homepage = https://github.com/ripple/ripple-data-api; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix new file mode 100644 index 000000000000..fd318c979fee --- /dev/null +++ b/pkgs/servers/rippled/package.nix @@ -0,0 +1,3909 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."accepts"."~1.2.5" = + self.by-version."accepts"."1.2.5"; + by-version."accepts"."1.2.5" = self.buildNodePackage { + name = "accepts-1.2.5"; + version = "1.2.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz"; + name = "accepts-1.2.5.tgz"; + sha1 = "bb07dc52c141ae562611a836ff433bcec8871ce9"; + }; + deps = { + "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = self.buildNodePackage { + name = "asn1-0.1.11"; + version = "0.1.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."assert-plus"."^0.1.5" = + self.by-version."assert-plus"."0.1.5"; + by-version."assert-plus"."0.1.5" = self.buildNodePackage { + name = "assert-plus-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + name = "assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.2.x" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + version = "0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."^0.2.10" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.7" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.9" = + self.by-version."async"."0.2.10"; + "async" = self.by-version."async"."0.2.10"; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = self.buildNodePackage { + name = "async-0.9.0"; + version = "0.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."aws-sign"."~0.2.0" = + self.by-version."aws-sign"."0.2.0"; + by-version."aws-sign"."0.2.0" = self.buildNodePackage { + name = "aws-sign-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; + name = "aws-sign-0.2.0.tgz"; + sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = self.buildNodePackage { + name = "aws-sign2-0.5.0"; + version = "0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."base64-url"."1.2.1" = + self.by-version."base64-url"."1.2.1"; + by-version."base64-url"."1.2.1" = self.buildNodePackage { + name = "base64-url-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + name = "base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."basic-auth"."1.0.0" = + self.by-version."basic-auth"."1.0.0"; + by-version."basic-auth"."1.0.0" = self.buildNodePackage { + name = "basic-auth-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"; + name = "basic-auth-1.0.0.tgz"; + sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."basic-auth-connect"."1.0.0" = + self.by-version."basic-auth-connect"."1.0.0"; + by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage { + name = "basic-auth-connect-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + name = "basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."batch"."0.5.2" = + self.by-version."batch"."0.5.2"; + by-version."batch"."0.5.2" = self.buildNodePackage { + name = "batch-0.5.2"; + version = "0.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz"; + name = "batch-0.5.2.tgz"; + sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bignumber.js"."^2.0.0" = + self.by-version."bignumber.js"."2.0.3"; + by-version."bignumber.js"."2.0.3" = self.buildNodePackage { + name = "bignumber.js-2.0.3"; + version = "2.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.3.tgz"; + name = "bignumber.js-2.0.3.tgz"; + sha1 = "1328f1d618f4bfe23587af73577a5a1e4f3cf105"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bindings"."1.2.x" = + self.by-version."bindings"."1.2.1"; + by-version."bindings"."1.2.1" = self.buildNodePackage { + name = "bindings-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + name = "bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bl"."~0.9.0" = + self.by-version."bl"."0.9.4"; + by-version."bl"."0.9.4" = self.buildNodePackage { + name = "bl-0.9.4"; + version = "0.9.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz"; + name = "bl-0.9.4.tgz"; + sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7"; + }; + deps = { + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."body-parser"."~1.12.2" = + self.by-version."body-parser"."1.12.2"; + by-version."body-parser"."1.12.2" = self.buildNodePackage { + name = "body-parser-1.12.2"; + version = "1.12.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.2.tgz"; + name = "body-parser-1.12.2.tgz"; + sha1 = "698368fb4dfc57a05bff1ddb1bebeba3bd2c0e87"; + }; + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "qs-2.4.1" = self.by-version."qs"."2.4.1"; + "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3"; + "type-is-1.6.1" = self.by-version."type-is"."1.6.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."boom"."0.3.x" = + self.by-version."boom"."0.3.8"; + by-version."boom"."0.3.8" = self.buildNodePackage { + name = "boom-0.3.8"; + version = "0.3.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; + name = "boom-0.3.8.tgz"; + sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; + }; + deps = { + "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = self.buildNodePackage { + name = "boom-0.4.2"; + version = "0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."boom"."2.x.x" = + self.by-version."boom"."2.6.1"; + by-version."boom"."2.6.1" = self.buildNodePackage { + name = "boom-2.6.1"; + version = "2.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz"; + name = "boom-2.6.1.tgz"; + sha1 = "4dc8ef9b6dfad9c43bbbfbe71fa4c21419f22753"; + }; + deps = { + "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."browser-request"."~0.3.0" = + self.by-version."browser-request"."0.3.3"; + by-version."browser-request"."0.3.3" = self.buildNodePackage { + name = "browser-request-0.3.3"; + version = "0.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; + name = "browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bufferutil"."1.0.x" = + self.by-version."bufferutil"."1.0.1"; + by-version."bufferutil"."1.0.1" = self.buildNodePackage { + name = "bufferutil-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz"; + name = "bufferutil-1.0.1.tgz"; + sha1 = "0c53a9ffe8d616c4e2df27d00b808f7a25501e3b"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bytes"."1.0.0" = + self.by-version."bytes"."1.0.0"; + by-version."bytes"."1.0.0" = self.buildNodePackage { + name = "bytes-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + name = "bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."caseless"."~0.6.0" = + self.by-version."caseless"."0.6.0"; + by-version."caseless"."0.6.0" = self.buildNodePackage { + name = "caseless-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + name = "caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."caseless"."~0.9.0" = + self.by-version."caseless"."0.9.0"; + by-version."caseless"."0.9.0" = self.buildNodePackage { + name = "caseless-0.9.0"; + version = "0.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; + name = "caseless-0.9.0.tgz"; + sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."clone"."~0.1.11" = + self.by-version."clone"."0.1.19"; + by-version."clone"."0.1.19" = self.buildNodePackage { + name = "clone-0.1.19"; + version = "0.1.19"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; + name = "clone-0.1.19.tgz"; + sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "clone" = self.by-version."clone"."0.1.19"; + by-spec."colors"."0.6.x" = + self.by-version."colors"."0.6.2"; + by-version."colors"."0.6.2" = self.buildNodePackage { + name = "colors-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = self.buildNodePackage { + name = "combined-stream-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."~0.0.5" = + self.by-version."combined-stream"."0.0.7"; + by-spec."commander"."2.6.0" = + self.by-version."commander"."2.6.0"; + by-version."commander"."2.6.0" = self.buildNodePackage { + name = "commander-2.6.0"; + version = "2.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + name = "commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."component-emitter"."1.1.2" = + self.by-version."component-emitter"."1.1.2"; + by-version."component-emitter"."1.1.2" = self.buildNodePackage { + name = "component-emitter-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + name = "component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."compressible"."~2.0.2" = + self.by-version."compressible"."2.0.2"; + by-version."compressible"."2.0.2" = self.buildNodePackage { + name = "compressible-2.0.2"; + version = "2.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz"; + name = "compressible-2.0.2.tgz"; + sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5"; + }; + deps = { + "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."compression"."~1.4.3" = + self.by-version."compression"."1.4.3"; + by-version."compression"."1.4.3" = self.buildNodePackage { + name = "compression-1.4.3"; + version = "1.4.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/compression/-/compression-1.4.3.tgz"; + name = "compression-1.4.3.tgz"; + sha1 = "7161bc0441df629273e5c31dd631b8e41e886b4d"; + }; + deps = { + "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connect"."2.29.1" = + self.by-version."connect"."2.29.1"; + by-version."connect"."2.29.1" = self.buildNodePackage { + name = "connect-2.29.1"; + version = "2.29.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.29.1.tgz"; + name = "connect-2.29.1.tgz"; + sha1 = "e0456742d25ed232b573ce156883dd4e6f208538"; + }; + deps = { + "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; + "body-parser-1.12.2" = self.by-version."body-parser"."1.12.2"; + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "compression-1.4.3" = self.by-version."compression"."1.4.3"; + "connect-timeout-1.6.1" = self.by-version."connect-timeout"."1.6.1"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "csurf-1.7.0" = self.by-version."csurf"."1.7.0"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5"; + "express-session-1.10.4" = self.by-version."express-session"."1.10.4"; + "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "method-override-2.3.2" = self.by-version."method-override"."2.3.2"; + "morgan-1.5.2" = self.by-version."morgan"."1.5.2"; + "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "qs-2.4.1" = self.by-version."qs"."2.4.1"; + "response-time-2.3.0" = self.by-version."response-time"."2.3.0"; + "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; + "serve-index-1.6.3" = self.by-version."serve-index"."1.6.3"; + "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2"; + "type-is-1.6.1" = self.by-version."type-is"."1.6.1"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; + "pause-0.0.1" = self.by-version."pause"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connect-timeout"."~1.6.1" = + self.by-version."connect-timeout"."1.6.1"; + by-version."connect-timeout"."1.6.1" = self.buildNodePackage { + name = "connect-timeout-1.6.1"; + version = "1.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.1.tgz"; + name = "connect-timeout-1.6.1.tgz"; + sha1 = "1de3a2b853734820a232080b95742494ba4cd067"; + }; + deps = { + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = self.buildNodePackage { + name = "content-disposition-0.5.0"; + version = "0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."content-type"."~1.0.1" = + self.by-version."content-type"."1.0.1"; + by-version."content-type"."1.0.1" = self.buildNodePackage { + name = "content-type-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; + name = "content-type-1.0.1.tgz"; + sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie"."0.1.2" = + self.by-version."cookie"."0.1.2"; + by-version."cookie"."0.1.2" = self.buildNodePackage { + name = "cookie-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + name = "cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie-jar"."~0.2.0" = + self.by-version."cookie-jar"."0.2.0"; + by-version."cookie-jar"."0.2.0" = self.buildNodePackage { + name = "cookie-jar-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; + name = "cookie-jar-0.2.0.tgz"; + sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie-parser"."~1.3.4" = + self.by-version."cookie-parser"."1.3.4"; + by-version."cookie-parser"."1.3.4" = self.buildNodePackage { + name = "cookie-parser-1.3.4"; + version = "1.3.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz"; + name = "cookie-parser-1.3.4.tgz"; + sha1 = "193035a5be97117a21709b3aa737f6132717bda6"; + }; + deps = { + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie-signature"."1.0.6" = + self.by-version."cookie-signature"."1.0.6"; + by-version."cookie-signature"."1.0.6" = self.buildNodePackage { + name = "cookie-signature-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + name = "cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookiejar"."2.0.1" = + self.by-version."cookiejar"."2.0.1"; + by-version."cookiejar"."2.0.1" = self.buildNodePackage { + name = "cookiejar-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; + name = "cookiejar-2.0.1.tgz"; + sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."core-util-is"."~1.0.0" = + self.by-version."core-util-is"."1.0.1"; + by-version."core-util-is"."1.0.1" = self.buildNodePackage { + name = "core-util-is-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; + name = "core-util-is-1.0.1.tgz"; + sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."couch-compile"."^1.0.1" = + self.by-version."couch-compile"."1.2.0"; + by-version."couch-compile"."1.2.0" = self.buildNodePackage { + name = "couch-compile-1.2.0"; + version = "1.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/couch-compile/-/couch-compile-1.2.0.tgz"; + name = "couch-compile-1.2.0.tgz"; + sha1 = "c4f7396f3dea38516b4e51d3edc3196de4f2d69c"; + }; + deps = { + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "async-0.2.10" = self.by-version."async"."0.2.10"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "couch-compile" = self.by-version."couch-compile"."1.2.0"; + by-spec."crc"."3.2.1" = + self.by-version."crc"."3.2.1"; + by-version."crc"."3.2.1" = self.buildNodePackage { + name = "crc-3.2.1"; + version = "3.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + name = "crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cron-parser"."~0.3.0" = + self.by-version."cron-parser"."0.3.6"; + by-version."cron-parser"."0.3.6" = self.buildNodePackage { + name = "cron-parser-0.3.6"; + version = "0.3.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cron-parser/-/cron-parser-0.3.6.tgz"; + name = "cron-parser-0.3.6.tgz"; + sha1 = "1e4734ebd5fa054f5766693c52468b17df9681c9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cryptiles"."0.1.x" = + self.by-version."cryptiles"."0.1.3"; + by-version."cryptiles"."0.1.3" = self.buildNodePackage { + name = "cryptiles-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; + name = "cryptiles-0.1.3.tgz"; + sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; + }; + deps = { + "boom-0.3.8" = self.by-version."boom"."0.3.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cryptiles"."0.2.x" = + self.by-version."cryptiles"."0.2.2"; + by-version."cryptiles"."0.2.2" = self.buildNodePackage { + name = "cryptiles-0.2.2"; + version = "0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + deps = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cryptiles"."2.x.x" = + self.by-version."cryptiles"."2.0.4"; + by-version."cryptiles"."2.0.4" = self.buildNodePackage { + name = "cryptiles-2.0.4"; + version = "2.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; + name = "cryptiles-2.0.4.tgz"; + sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; + }; + deps = { + "boom-2.6.1" = self.by-version."boom"."2.6.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."csrf"."~2.0.6" = + self.by-version."csrf"."2.0.6"; + by-version."csrf"."2.0.6" = self.buildNodePackage { + name = "csrf-2.0.6"; + version = "2.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz"; + name = "csrf-2.0.6.tgz"; + sha1 = "a90a9d88fc7411423cb0c5c13e901a8cc588132e"; + }; + deps = { + "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; + "rndm-1.1.0" = self.by-version."rndm"."1.1.0"; + "scmp-1.0.0" = self.by-version."scmp"."1.0.0"; + "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."csurf"."~1.7.0" = + self.by-version."csurf"."1.7.0"; + by-version."csurf"."1.7.0" = self.buildNodePackage { + name = "csurf-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz"; + name = "csurf-1.7.0.tgz"; + sha1 = "f24dc53753fccbdce0505f2abc5b57167b65ff18"; + }; + deps = { + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "csrf-2.0.6" = self.by-version."csrf"."2.0.6"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ctype"."0.5.3" = + self.by-version."ctype"."0.5.3"; + by-version."ctype"."0.5.3" = self.buildNodePackage { + name = "ctype-0.5.3"; + version = "0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cycle"."1.0.x" = + self.by-version."cycle"."1.0.3"; + by-version."cycle"."1.0.3" = self.buildNodePackage { + name = "cycle-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."~0.7.2" = + self.by-version."debug"."0.7.4"; + by-version."debug"."0.7.4" = self.buildNodePackage { + name = "debug-0.7.4"; + version = "0.7.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + name = "debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."~1.0.1" = + self.by-version."debug"."1.0.4"; + by-version."debug"."1.0.4" = self.buildNodePackage { + name = "debug-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; + name = "debug-1.0.4.tgz"; + sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + }; + deps = { + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."~2.1.3" = + self.by-version."debug"."2.1.3"; + by-version."debug"."2.1.3" = self.buildNodePackage { + name = "debug-2.1.3"; + version = "2.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + name = "debug-2.1.3.tgz"; + sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; + }; + deps = { + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."deep-diff"."^0.1.4" = + self.by-version."deep-diff"."0.1.7"; + by-version."deep-diff"."0.1.7" = self.buildNodePackage { + name = "deep-diff-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-diff/-/deep-diff-0.1.7.tgz"; + name = "deep-diff-0.1.7.tgz"; + sha1 = "d36da978b64429c268116cea941f490e7949cd3d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "deep-diff" = self.by-version."deep-diff"."0.1.7"; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = self.buildNodePackage { + name = "delayed-stream-0.0.5"; + version = "0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.0"; + by-version."depd"."1.0.0" = self.buildNodePackage { + name = "depd-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; + name = "depd-1.0.0.tgz"; + sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."destroy"."1.0.3" = + self.by-version."destroy"."1.0.3"; + by-version."destroy"."1.0.3" = self.buildNodePackage { + name = "destroy-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + name = "destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ee-first"."1.1.0" = + self.by-version."ee-first"."1.1.0"; + by-version."ee-first"."1.1.0" = self.buildNodePackage { + name = "ee-first-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + name = "ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."errorhandler"."~1.3.5" = + self.by-version."errorhandler"."1.3.5"; + by-version."errorhandler"."1.3.5" = self.buildNodePackage { + name = "errorhandler-1.3.5"; + version = "1.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.5.tgz"; + name = "errorhandler-1.3.5.tgz"; + sha1 = "4ef655dd2c30e1fc1bf9c24805fa34ba20d4f69a"; + }; + deps = { + "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."errs"."~0.3.0" = + self.by-version."errs"."0.3.2"; + by-version."errs"."0.3.2" = self.buildNodePackage { + name = "errs-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/errs/-/errs-0.3.2.tgz"; + name = "errs-0.3.2.tgz"; + sha1 = "798099b2dbd37ca2bc749e538a7c1307d0b50499"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-html"."1.0.1" = + self.by-version."escape-html"."1.0.1"; + by-version."escape-html"."1.0.1" = self.buildNodePackage { + name = "escape-html-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + name = "escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."etag"."~1.5.1" = + self.by-version."etag"."1.5.1"; + by-version."etag"."1.5.1" = self.buildNodePackage { + name = "etag-1.5.1"; + version = "1.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + name = "etag-1.5.1.tgz"; + sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; + }; + deps = { + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."express"."^3.4.8" = + self.by-version."express"."3.20.2"; + by-version."express"."3.20.2" = self.buildNodePackage { + name = "express-3.20.2"; + version = "3.20.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.20.2.tgz"; + name = "express-3.20.2.tgz"; + sha1 = "c604027746e60f3da0a4b43063375d21c3235858"; + }; + deps = { + "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; + "connect-2.29.1" = self.by-version."connect"."2.29.1"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "commander-2.6.0" = self.by-version."commander"."2.6.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; + "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.12.2" = self.by-version."send"."0.12.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "express" = self.by-version."express"."3.20.2"; + by-spec."express-session"."~1.10.4" = + self.by-version."express-session"."1.10.4"; + by-version."express-session"."1.10.4" = self.buildNodePackage { + name = "express-session-1.10.4"; + version = "1.10.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/express-session/-/express-session-1.10.4.tgz"; + name = "express-session-1.10.4.tgz"; + sha1 = "04e1d92e00593893e1f76569eb3ad63113daf94c"; + }; + deps = { + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."extend"."~1.2.1" = + self.by-version."extend"."1.2.1"; + by-version."extend"."1.2.1" = self.buildNodePackage { + name = "extend-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + name = "extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."eyes"."0.1.x" = + self.by-version."eyes"."0.1.8"; + by-version."eyes"."0.1.8" = self.buildNodePackage { + name = "eyes-0.1.8"; + version = "0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."finalhandler"."0.3.4" = + self.by-version."finalhandler"."0.3.4"; + by-version."finalhandler"."0.3.4" = self.buildNodePackage { + name = "finalhandler-0.3.4"; + version = "0.3.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.4.tgz"; + name = "finalhandler-0.3.4.tgz"; + sha1 = "4787d3573d079ae8b07536f26b0b911ebaf2a2ac"; + }; + deps = { + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."follow"."~0.11.2" = + self.by-version."follow"."0.11.4"; + by-version."follow"."0.11.4" = self.buildNodePackage { + name = "follow-0.11.4"; + version = "0.11.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/follow/-/follow-0.11.4.tgz"; + name = "follow-0.11.4.tgz"; + sha1 = "87e9a50d443f921d05704ebac412a14ab9d9232f"; + }; + deps = { + "request-2.53.0" = self.by-version."request"."2.53.0"; + "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forever-agent"."~0.2.0" = + self.by-version."forever-agent"."0.2.0"; + by-version."forever-agent"."0.2.0" = self.buildNodePackage { + name = "forever-agent-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; + name = "forever-agent-0.2.0.tgz"; + sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forever-agent"."~0.5.0" = + self.by-version."forever-agent"."0.5.2"; + by-version."forever-agent"."0.5.2" = self.buildNodePackage { + name = "forever-agent-0.5.2"; + version = "0.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."0.1.3" = + self.by-version."form-data"."0.1.3"; + by-version."form-data"."0.1.3" = self.buildNodePackage { + name = "form-data-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; + name = "form-data-0.1.3.tgz"; + sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + }; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."~0.0.3" = + self.by-version."form-data"."0.0.10"; + by-version."form-data"."0.0.10" = self.buildNodePackage { + name = "form-data-0.0.10"; + version = "0.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; + name = "form-data-0.0.10.tgz"; + sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; + }; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.2.10" = self.by-version."async"."0.2.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."~0.1.0" = + self.by-version."form-data"."0.1.4"; + by-version."form-data"."0.1.4" = self.buildNodePackage { + name = "form-data-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."~0.2.0" = + self.by-version."form-data"."0.2.0"; + by-version."form-data"."0.2.0" = self.buildNodePackage { + name = "form-data-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; + name = "form-data-0.2.0.tgz"; + sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; + }; + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formidable"."1.0.14" = + self.by-version."formidable"."1.0.14"; + by-version."formidable"."1.0.14" = self.buildNodePackage { + name = "formidable-1.0.14"; + version = "1.0.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + name = "formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forwarded"."~0.1.0" = + self.by-version."forwarded"."0.1.0"; + by-version."forwarded"."0.1.0" = self.buildNodePackage { + name = "forwarded-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + name = "forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fresh"."0.2.4" = + self.by-version."fresh"."0.2.4"; + by-version."fresh"."0.2.4" = self.buildNodePackage { + name = "fresh-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + name = "fresh-0.2.4.tgz"; + sha1 = "3582499206c9723714190edd74b4604feb4a614c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."^3.2.11" = + self.by-version."glob"."3.2.11"; + by-version."glob"."3.2.11" = self.buildNodePackage { + name = "glob-3.2.11"; + version = "3.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + name = "glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hawk"."1.1.1" = + self.by-version."hawk"."1.1.1"; + by-version."hawk"."1.1.1" = self.buildNodePackage { + name = "hawk-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + name = "hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; + "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hawk"."~0.10.2" = + self.by-version."hawk"."0.10.2"; + by-version."hawk"."0.10.2" = self.buildNodePackage { + name = "hawk-0.10.2"; + version = "0.10.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; + name = "hawk-0.10.2.tgz"; + sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; + }; + deps = { + "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + "boom-0.3.8" = self.by-version."boom"."0.3.8"; + "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3"; + "sntp-0.1.4" = self.by-version."sntp"."0.1.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hawk"."~2.3.0" = + self.by-version."hawk"."2.3.1"; + by-version."hawk"."2.3.1" = self.buildNodePackage { + name = "hawk-2.3.1"; + version = "2.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; + name = "hawk-2.3.1.tgz"; + sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; + }; + deps = { + "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + "boom-2.6.1" = self.by-version."boom"."2.6.1"; + "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; + "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hoek"."0.7.x" = + self.by-version."hoek"."0.7.6"; + by-version."hoek"."0.7.6" = self.buildNodePackage { + name = "hoek-0.7.6"; + version = "0.7.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + name = "hoek-0.7.6.tgz"; + sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = self.buildNodePackage { + name = "hoek-0.9.1"; + version = "0.9.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hoek"."2.x.x" = + self.by-version."hoek"."2.11.1"; + by-version."hoek"."2.11.1" = self.buildNodePackage { + name = "hoek-2.11.1"; + version = "2.11.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-2.11.1.tgz"; + name = "hoek-2.11.1.tgz"; + sha1 = "3839a8b72f86aade3312100afaf80648af155b38"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."http-errors"."~1.3.1" = + self.by-version."http-errors"."1.3.1"; + by-version."http-errors"."1.3.1" = self.buildNodePackage { + name = "http-errors-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + name = "http-errors-1.3.1.tgz"; + sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."http-signature"."~0.10.0" = + self.by-version."http-signature"."0.10.1"; + by-version."http-signature"."0.10.1" = self.buildNodePackage { + name = "http-signature-0.10.1"; + version = "0.10.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + name = "http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."iconv-lite"."0.4.7" = + self.by-version."iconv-lite"."0.4.7"; + by-version."iconv-lite"."0.4.7" = self.buildNodePackage { + name = "iconv-lite-0.4.7"; + version = "0.4.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz"; + name = "iconv-lite-0.4.7.tgz"; + sha1 = "89d32fec821bf8597f44609b4bc09bed5c209a23"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; + by-spec."ipaddr.js"."0.1.9" = + self.by-version."ipaddr.js"."0.1.9"; + by-version."ipaddr.js"."0.1.9" = self.buildNodePackage { + name = "ipaddr.js-0.1.9"; + version = "0.1.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz"; + name = "ipaddr.js-0.1.9.tgz"; + sha1 = "a9c78ccc12dc9010f296ab9aef2f61f432d69efa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isstream"."~0.1.1" = + self.by-version."isstream"."0.1.2"; + by-version."isstream"."0.1.2" = self.buildNodePackage { + name = "isstream-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + name = "isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-stringify-safe"."~3.0.0" = + self.by-version."json-stringify-safe"."3.0.0"; + by-version."json-stringify-safe"."3.0.0" = self.buildNodePackage { + name = "json-stringify-safe-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; + name = "json-stringify-safe-3.0.0.tgz"; + sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage { + name = "json-stringify-safe-5.0.0"; + version = "5.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."^3.1.0" = + self.by-version."lodash"."3.5.0"; + by-version."lodash"."3.5.0" = self.buildNodePackage { + name = "lodash-3.5.0"; + version = "3.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"; + name = "lodash-3.5.0.tgz"; + sha1 = "19bb3f4d51278f0b8c818ed145c74ecf9fe40e6d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."~1.3.1" = + self.by-version."lodash"."1.3.1"; + by-version."lodash"."1.3.1" = self.buildNodePackage { + name = "lodash-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; + name = "lodash-1.3.1.tgz"; + sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "lodash" = self.by-version."lodash"."1.3.1"; + by-spec."long-timeout"."~0.0.1" = + self.by-version."long-timeout"."0.0.2"; + by-version."long-timeout"."0.0.2" = self.buildNodePackage { + name = "long-timeout-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/long-timeout/-/long-timeout-0.0.2.tgz"; + name = "long-timeout-0.0.2.tgz"; + sha1 = "f36449ba89629d13a7a2b2523a4db9dd66e3ff68"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lru-cache"."2" = + self.by-version."lru-cache"."2.5.0"; + by-version."lru-cache"."2.5.0" = self.buildNodePackage { + name = "lru-cache-2.5.0"; + version = "2.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; + name = "lru-cache-2.5.0.tgz"; + sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lru-cache"."~2.5.0" = + self.by-version."lru-cache"."2.5.0"; + by-spec."media-typer"."0.3.0" = + self.by-version."media-typer"."0.3.0"; + by-version."media-typer"."0.3.0" = self.buildNodePackage { + name = "media-typer-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + name = "media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."merge-descriptors"."1.0.0" = + self.by-version."merge-descriptors"."1.0.0"; + by-version."merge-descriptors"."1.0.0" = self.buildNodePackage { + name = "merge-descriptors-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + name = "merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."method-override"."~2.3.2" = + self.by-version."method-override"."2.3.2"; + by-version."method-override"."2.3.2" = self.buildNodePackage { + name = "method-override-2.3.2"; + version = "2.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/method-override/-/method-override-2.3.2.tgz"; + name = "method-override-2.3.2.tgz"; + sha1 = "f2433fb27b6c087efb8812628727fb8cfd93a793"; + }; + deps = { + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."methods"."1.0.1" = + self.by-version."methods"."1.0.1"; + by-version."methods"."1.0.1" = self.buildNodePackage { + name = "methods-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + name = "methods-1.0.1.tgz"; + sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."methods"."~1.1.1" = + self.by-version."methods"."1.1.1"; + by-version."methods"."1.1.1" = self.buildNodePackage { + name = "methods-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; + name = "methods-1.1.1.tgz"; + sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."1.2.11" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = self.buildNodePackage { + name = "mime-1.2.11"; + version = "1.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."1.3.4" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = self.buildNodePackage { + name = "mime-1.3.4"; + version = "1.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."^1.2.11" = + self.by-version."mime"."1.3.4"; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-spec."mime"."~1.2.2" = + self.by-version."mime"."1.2.11"; + by-spec."mime"."~1.2.7" = + self.by-version."mime"."1.2.11"; + by-spec."mime-db".">= 1.1.2 < 2" = + self.by-version."mime-db"."1.8.0"; + by-version."mime-db"."1.8.0" = self.buildNodePackage { + name = "mime-db-1.8.0"; + version = "1.8.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"; + name = "mime-db-1.8.0.tgz"; + sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-db"."~1.8.0" = + self.by-version."mime-db"."1.8.0"; + by-spec."mime-types"."~1.0.1" = + self.by-version."mime-types"."1.0.2"; + by-version."mime-types"."1.0.2" = self.buildNodePackage { + name = "mime-types-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + name = "mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."~2.0.1" = + self.by-version."mime-types"."2.0.10"; + by-version."mime-types"."2.0.10" = self.buildNodePackage { + name = "mime-types-2.0.10"; + version = "2.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz"; + name = "mime-types-2.0.10.tgz"; + sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d"; + }; + deps = { + "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."~2.0.10" = + self.by-version."mime-types"."2.0.10"; + by-spec."mime-types"."~2.0.3" = + self.by-version."mime-types"."2.0.10"; + by-spec."minimatch"."0.3" = + self.by-version."minimatch"."0.3.0"; + by-version."minimatch"."0.3.0" = self.buildNodePackage { + name = "minimatch-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + name = "minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }; + deps = { + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."0.0.8" = + self.by-version."minimist"."0.0.8"; + by-version."minimist"."0.0.8" = self.buildNodePackage { + name = "minimist-0.0.8"; + version = "0.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + name = "minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.5.0" = + self.by-version."mkdirp"."0.5.0"; + by-version."mkdirp"."0.5.0" = self.buildNodePackage { + name = "mkdirp-0.5.0"; + version = "0.5.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + name = "mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."~0.3.5" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = self.buildNodePackage { + name = "mkdirp-0.3.5"; + version = "0.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."moment"."~2.1.0" = + self.by-version."moment"."2.1.0"; + by-version."moment"."2.1.0" = self.buildNodePackage { + name = "moment-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + name = "moment-2.1.0.tgz"; + sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "moment" = self.by-version."moment"."2.1.0"; + by-spec."morgan"."~1.5.2" = + self.by-version."morgan"."1.5.2"; + by-version."morgan"."1.5.2" = self.buildNodePackage { + name = "morgan-1.5.2"; + version = "1.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/morgan/-/morgan-1.5.2.tgz"; + name = "morgan-1.5.2.tgz"; + sha1 = "34c1a0e7c2d5ad3ed78f0ef3257b8ac7c35d7cff"; + }; + deps = { + "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.6.2" = + self.by-version."ms"."0.6.2"; + by-version."ms"."0.6.2" = self.buildNodePackage { + name = "ms-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + name = "ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.0" = + self.by-version."ms"."0.7.0"; + by-version."ms"."0.7.0" = self.buildNodePackage { + name = "ms-0.7.0"; + version = "0.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + name = "ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."multiparty"."3.3.2" = + self.by-version."multiparty"."3.3.2"; + by-version."multiparty"."3.3.2" = self.buildNodePackage { + name = "multiparty-3.3.2"; + version = "3.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + name = "multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + }; + deps = { + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."1.6.x" = + self.by-version."nan"."1.6.2"; + by-version."nan"."1.6.2" = self.buildNodePackage { + name = "nan-1.6.2"; + version = "1.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz"; + name = "nan-1.6.2.tgz"; + sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."~1.6.2" = + self.by-version."nan"."1.6.2"; + by-spec."nano"."^5.8.0" = + self.by-version."nano"."5.12.2"; + by-version."nano"."5.12.2" = self.buildNodePackage { + name = "nano-5.12.2"; + version = "5.12.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nano/-/nano-5.12.2.tgz"; + name = "nano-5.12.2.tgz"; + sha1 = "b51c9c5e4045c4a71fe3bf6a1f46f0ac2426a17c"; + }; + deps = { + "request-2.42.0" = self.by-version."request"."2.42.0"; + "follow-0.11.4" = self.by-version."follow"."0.11.4"; + "errs-0.3.2" = self.by-version."errs"."0.3.2"; + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "nano" = self.by-version."nano"."5.12.2"; + by-spec."native-or-bluebird"."~1.1.2" = + self.by-version."native-or-bluebird"."1.1.2"; + by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage { + name = "native-or-bluebird-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"; + name = "native-or-bluebird-1.1.2.tgz"; + sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."negotiator"."0.5.1" = + self.by-version."negotiator"."0.5.1"; + by-version."negotiator"."0.5.1" = self.buildNodePackage { + name = "negotiator-0.5.1"; + version = "0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz"; + name = "negotiator-0.5.1.tgz"; + sha1 = "498f661c522470153c6086ac83019cb3eb66f61c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-dogstatsd"."0.0.5" = + self.by-version."node-dogstatsd"."0.0.5"; + by-version."node-dogstatsd"."0.0.5" = self.buildNodePackage { + name = "node-dogstatsd-0.0.5"; + version = "0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-dogstatsd/-/node-dogstatsd-0.0.5.tgz"; + name = "node-dogstatsd-0.0.5.tgz"; + sha1 = "5b1bc12e7c2f1cab65c6081f43cee27eb359316e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ "linux" "darwin" "freebsd" ]; + cpu = [ ]; + }; + "node-dogstatsd" = self.by-version."node-dogstatsd"."0.0.5"; + by-spec."node-persist"."0.0.2" = + self.by-version."node-persist"."0.0.2"; + by-version."node-persist"."0.0.2" = self.buildNodePackage { + name = "node-persist-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-persist/-/node-persist-0.0.2.tgz"; + name = "node-persist-0.0.2.tgz"; + sha1 = "a4999e81d5f3f605df267abf314b7f03b8e6823b"; + }; + deps = { + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "sugar-1.3.9" = self.by-version."sugar"."1.3.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "node-persist" = self.by-version."node-persist"."0.0.2"; + by-spec."node-schedule"."^0.1.13" = + self.by-version."node-schedule"."0.1.16"; + by-version."node-schedule"."0.1.16" = self.buildNodePackage { + name = "node-schedule-0.1.16"; + version = "0.1.16"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-schedule/-/node-schedule-0.1.16.tgz"; + name = "node-schedule-0.1.16.tgz"; + sha1 = "1bbc74bd03141b9bb8c1135978d3b63995ddbf94"; + }; + deps = { + "cron-parser-0.3.6" = self.by-version."cron-parser"."0.3.6"; + "long-timeout-0.0.2" = self.by-version."long-timeout"."0.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "node-schedule" = self.by-version."node-schedule"."0.1.16"; + by-spec."node-statsd"."^0.1.0" = + self.by-version."node-statsd"."0.1.1"; + by-version."node-statsd"."0.1.1" = self.buildNodePackage { + name = "node-statsd-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-statsd/-/node-statsd-0.1.1.tgz"; + name = "node-statsd-0.1.1.tgz"; + sha1 = "27a59348763d0af7a037ac2a031fef3f051013d3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "node-statsd" = self.by-version."node-statsd"."0.1.1"; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = self.buildNodePackage { + name = "node-uuid-1.4.3"; + version = "1.4.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.2.0" = + self.by-version."oauth-sign"."0.2.0"; + by-version."oauth-sign"."0.2.0" = self.buildNodePackage { + name = "oauth-sign-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + name = "oauth-sign-0.2.0.tgz"; + sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.4.0" = + self.by-version."oauth-sign"."0.4.0"; + by-version."oauth-sign"."0.4.0" = self.buildNodePackage { + name = "oauth-sign-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + name = "oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.6.0" = + self.by-version."oauth-sign"."0.6.0"; + by-version."oauth-sign"."0.6.0" = self.buildNodePackage { + name = "oauth-sign-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; + name = "oauth-sign-0.6.0.tgz"; + sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."on-finished"."~2.2.0" = + self.by-version."on-finished"."2.2.0"; + by-version."on-finished"."2.2.0" = self.buildNodePackage { + name = "on-finished-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz"; + name = "on-finished-2.2.0.tgz"; + sha1 = "e6ba6a09a3482d6b7969bc3da92c86f0a967605e"; + }; + deps = { + "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."on-headers"."~1.0.0" = + self.by-version."on-headers"."1.0.0"; + by-version."on-headers"."1.0.0" = self.buildNodePackage { + name = "on-headers-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz"; + name = "on-headers-1.0.0.tgz"; + sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."options".">=0.0.5" = + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = self.buildNodePackage { + name = "options-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parseurl"."~1.3.0" = + self.by-version."parseurl"."1.3.0"; + by-version."parseurl"."1.3.0" = self.buildNodePackage { + name = "parseurl-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; + name = "parseurl-1.3.0.tgz"; + sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pause"."0.0.1" = + self.by-version."pause"."0.0.1"; + by-version."pause"."0.0.1" = self.buildNodePackage { + name = "pause-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + name = "pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pkginfo"."0.3.x" = + self.by-version."pkginfo"."0.3.0"; + by-version."pkginfo"."0.3.0" = self.buildNodePackage { + name = "pkginfo-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."posix"."^2.0.0" = + self.by-version."posix"."2.0.0"; + by-version."posix"."2.0.0" = self.buildNodePackage { + name = "posix-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz"; + name = "posix-2.0.0.tgz"; + sha1 = "90fd0ec73968d805c890b61ae6cc95ae5803a87d"; + }; + deps = { + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "posix" = self.by-version."posix"."2.0.0"; + by-spec."proxy-addr"."~1.0.7" = + self.by-version."proxy-addr"."1.0.7"; + by-version."proxy-addr"."1.0.7" = self.buildNodePackage { + name = "proxy-addr-1.0.7"; + version = "1.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz"; + name = "proxy-addr-1.0.7.tgz"; + sha1 = "6e2655aa9c56b014f09734a7e6d558cc77751939"; + }; + deps = { + "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; + "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.3.2"; + by-version."punycode"."1.3.2" = self.buildNodePackage { + name = "punycode-1.3.2"; + version = "1.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + name = "punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."q"."~1.0.0" = + self.by-version."q"."1.0.1"; + by-version."q"."1.0.1" = self.buildNodePackage { + name = "q-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz"; + name = "q-1.0.1.tgz"; + sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "q" = self.by-version."q"."1.0.1"; + by-spec."qs"."0.6.6" = + self.by-version."qs"."0.6.6"; + by-version."qs"."0.6.6" = self.buildNodePackage { + name = "qs-0.6.6"; + version = "0.6.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."2.4.1" = + self.by-version."qs"."2.4.1"; + by-version."qs"."2.4.1" = self.buildNodePackage { + name = "qs-2.4.1"; + version = "2.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz"; + name = "qs-2.4.1.tgz"; + sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."~0.5.4" = + self.by-version."qs"."0.5.6"; + by-version."qs"."0.5.6" = self.buildNodePackage { + name = "qs-0.5.6"; + version = "0.5.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + name = "qs-0.5.6.tgz"; + sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."~1.2.0" = + self.by-version."qs"."1.2.2"; + by-version."qs"."1.2.2" = self.buildNodePackage { + name = "qs-1.2.2"; + version = "1.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; + name = "qs-1.2.2.tgz"; + sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."~2.3.1" = + self.by-version."qs"."2.3.3"; + by-version."qs"."2.3.3" = self.buildNodePackage { + name = "qs-2.3.3"; + version = "2.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + name = "qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."range-parser"."~1.0.2" = + self.by-version."range-parser"."1.0.2"; + by-version."range-parser"."1.0.2" = self.buildNodePackage { + name = "range-parser-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; + name = "range-parser-1.0.2.tgz"; + sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."raw-body"."1.3.3" = + self.by-version."raw-body"."1.3.3"; + by-version."raw-body"."1.3.3" = self.buildNodePackage { + name = "raw-body-1.3.3"; + version = "1.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz"; + name = "raw-body-1.3.3.tgz"; + sha1 = "8841af3f64ad50a351dc77f229118b40c28fa58c"; + }; + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."1.0.27-1" = + self.by-version."readable-stream"."1.0.27-1"; + by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { + name = "readable-stream-1.0.27-1"; + version = "1.0.27-1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + name = "readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."~1.0.26" = + self.by-version."readable-stream"."1.0.33"; + by-version."readable-stream"."1.0.33" = self.buildNodePackage { + name = "readable-stream-1.0.33"; + version = "1.0.33"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; + name = "readable-stream-1.0.33.tgz"; + sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."~1.1.8" = + self.by-version."readable-stream"."1.1.13"; + by-version."readable-stream"."1.1.13" = self.buildNodePackage { + name = "readable-stream-1.1.13"; + version = "1.1.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; + name = "readable-stream-1.1.13.tgz"; + sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."~1.1.9" = + self.by-version."readable-stream"."1.1.13"; + by-spec."redis"."^0.10.1" = + self.by-version."redis"."0.10.3"; + by-version."redis"."0.10.3" = self.buildNodePackage { + name = "redis-0.10.3"; + version = "0.10.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + name = "redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "redis" = self.by-version."redis"."0.10.3"; + by-spec."reduce-component"."1.0.1" = + self.by-version."reduce-component"."1.0.1"; + by-version."reduce-component"."1.0.1" = self.buildNodePackage { + name = "reduce-component-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + name = "reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."request"."2.16.x" = + self.by-version."request"."2.16.6"; + by-version."request"."2.16.6" = self.buildNodePackage { + name = "request-2.16.6"; + version = "2.16.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; + name = "request-2.16.6.tgz"; + sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; + }; + deps = { + "form-data-0.0.10" = self.by-version."form-data"."0.0.10"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "hawk-0.10.2" = self.by-version."hawk"."0.10.2"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0"; + "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0"; + "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0"; + "forever-agent-0.2.0" = self.by-version."forever-agent"."0.2.0"; + "tunnel-agent-0.2.0" = self.by-version."tunnel-agent"."0.2.0"; + "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0"; + "qs-0.5.6" = self.by-version."qs"."0.5.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."request"."^2.34.0" = + self.by-version."request"."2.53.0"; + by-version."request"."2.53.0" = self.buildNodePackage { + name = "request-2.53.0"; + version = "2.53.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz"; + name = "request-2.53.0.tgz"; + sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c"; + }; + deps = { + "bl-0.9.4" = self.by-version."bl"."0.9.4"; + "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; + "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "request" = self.by-version."request"."2.53.0"; + by-spec."request"."^2.44.0" = + self.by-version."request"."2.53.0"; + by-spec."request"."~2.42.0" = + self.by-version."request"."2.42.0"; + by-version."request"."2.42.0" = self.buildNodePackage { + name = "request-2.42.0"; + version = "2.42.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz"; + name = "request-2.42.0.tgz"; + sha1 = "572bd0148938564040ac7ab148b96423a063304a"; + }; + deps = { + "bl-0.9.4" = self.by-version."bl"."0.9.4"; + "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "qs-1.2.2" = self.by-version."qs"."1.2.2"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + }; + optionalDependencies = { + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; + "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."response-time"."~2.3.0" = + self.by-version."response-time"."2.3.0"; + by-version."response-time"."2.3.0" = self.buildNodePackage { + name = "response-time-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz"; + name = "response-time-2.3.0.tgz"; + sha1 = "27cf2194fa373ef02c04781287416a3138060b68"; + }; + deps = { + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ripple-lib"."0.12.0" = + self.by-version."ripple-lib"."0.12.0"; + by-version."ripple-lib"."0.12.0" = self.buildNodePackage { + name = "ripple-lib-0.12.0"; + version = "0.12.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.0.tgz"; + name = "ripple-lib-0.12.0.tgz"; + sha1 = "8bbefa8250bf09e148c4997c27bbca70c7030b55"; + }; + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "bignumber.js-2.0.3" = self.by-version."bignumber.js"."2.0.3"; + "extend-1.2.1" = self.by-version."extend"."1.2.1"; + "lodash-3.5.0" = self.by-version."lodash"."3.5.0"; + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "ripple-wallet-generator-1.0.1" = self.by-version."ripple-wallet-generator"."1.0.1"; + "ws-0.7.1" = self.by-version."ws"."0.7.1"; + "superagent-0.18.2" = self.by-version."superagent"."0.18.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "ripple-lib" = self.by-version."ripple-lib"."0.12.0"; + by-spec."ripple-wallet-generator"."1.0.1" = + self.by-version."ripple-wallet-generator"."1.0.1"; + by-version."ripple-wallet-generator"."1.0.1" = self.buildNodePackage { + name = "ripple-wallet-generator-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.1.tgz"; + name = "ripple-wallet-generator-1.0.1.tgz"; + sha1 = "fd9311c0c620c1bd51808a76a3f2a946293d459a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rndm"."~1.1.0" = + self.by-version."rndm"."1.1.0"; + by-version."rndm"."1.1.0" = self.buildNodePackage { + name = "rndm-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"; + name = "rndm-1.1.0.tgz"; + sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."scmp"."1.0.0" = + self.by-version."scmp"."1.0.0"; + by-version."scmp"."1.0.0" = self.buildNodePackage { + name = "scmp-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"; + name = "scmp-1.0.0.tgz"; + sha1 = "a0b272c3fc7292f77115646f00618b0262514e04"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."send"."0.12.2" = + self.by-version."send"."0.12.2"; + by-version."send"."0.12.2" = self.buildNodePackage { + name = "send-0.12.2"; + version = "0.12.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.12.2.tgz"; + name = "send-0.12.2.tgz"; + sha1 = "ba6785e47ab41aa0358b9da401ab22ff0f58eab6"; + }; + deps = { + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."serve-favicon"."~2.2.0" = + self.by-version."serve-favicon"."2.2.0"; + by-version."serve-favicon"."2.2.0" = self.buildNodePackage { + name = "serve-favicon-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz"; + name = "serve-favicon-2.2.0.tgz"; + sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858"; + }; + deps = { + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."serve-index"."~1.6.3" = + self.by-version."serve-index"."1.6.3"; + by-version."serve-index"."1.6.3" = self.buildNodePackage { + name = "serve-index-1.6.3"; + version = "1.6.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.3.tgz"; + name = "serve-index-1.6.3.tgz"; + sha1 = "639056494ea59470a2c9518c28e7f225a342fd79"; + }; + deps = { + "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; + "batch-0.5.2" = self.by-version."batch"."0.5.2"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."serve-static"."~1.9.2" = + self.by-version."serve-static"."1.9.2"; + by-version."serve-static"."1.9.2" = self.buildNodePackage { + name = "serve-static-1.9.2"; + version = "1.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.2.tgz"; + name = "serve-static-1.9.2.tgz"; + sha1 = "069fa32453557b218ec2e39140c82d8905d5672c"; + }; + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.12.2" = self.by-version."send"."0.12.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sigmund"."~1.0.0" = + self.by-version."sigmund"."1.0.0"; + by-version."sigmund"."1.0.0" = self.buildNodePackage { + name = "sigmund-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; + name = "sigmund-1.0.0.tgz"; + sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sntp"."0.1.x" = + self.by-version."sntp"."0.1.4"; + by-version."sntp"."0.1.4" = self.buildNodePackage { + name = "sntp-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + name = "sntp-0.1.4.tgz"; + sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + }; + deps = { + "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = self.buildNodePackage { + name = "sntp-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sntp"."1.x.x" = + self.by-version."sntp"."1.0.9"; + by-version."sntp"."1.0.9" = self.buildNodePackage { + name = "sntp-1.0.9"; + version = "1.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + name = "sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + deps = { + "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stack-trace"."0.0.x" = + self.by-version."stack-trace"."0.0.9"; + by-version."stack-trace"."0.0.9" = self.buildNodePackage { + name = "stack-trace-0.0.9"; + version = "0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."statuses"."1" = + self.by-version."statuses"."1.2.1"; + by-version."statuses"."1.2.1" = self.buildNodePackage { + name = "statuses-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + name = "statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stream-counter"."~0.2.0" = + self.by-version."stream-counter"."0.2.0"; + by-version."stream-counter"."0.2.0" = self.buildNodePackage { + name = "stream-counter-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + name = "stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }; + deps = { + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.31"; + by-version."string_decoder"."0.10.31" = self.buildNodePackage { + name = "string_decoder-0.10.31"; + version = "0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stringstream"."~0.0.4" = + self.by-version."stringstream"."0.0.4"; + by-version."stringstream"."0.0.4" = self.buildNodePackage { + name = "stringstream-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"; + name = "stringstream-0.0.4.tgz"; + sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sugar"."~1.3.8" = + self.by-version."sugar"."1.3.9"; + by-version."sugar"."1.3.9" = self.buildNodePackage { + name = "sugar-1.3.9"; + version = "1.3.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sugar/-/sugar-1.3.9.tgz"; + name = "sugar-1.3.9.tgz"; + sha1 = "f879c6c87721252b51fd0b6520412d98d83cb179"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."superagent"."^0.18.0" = + self.by-version."superagent"."0.18.2"; + by-version."superagent"."0.18.2" = self.buildNodePackage { + name = "superagent-0.18.2"; + version = "0.18.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz"; + name = "superagent-0.18.2.tgz"; + sha1 = "9afc6276a9475f4bdcd535ac6a0685ebc4b560eb"; + }; + deps = { + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; + "methods-1.0.1" = self.by-version."methods"."1.0.1"; + "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; + "extend-1.2.1" = self.by-version."extend"."1.2.1"; + "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; + "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."0.12.1"; + by-version."tough-cookie"."0.12.1" = self.buildNodePackage { + name = "tough-cookie-0.12.1"; + version = "0.12.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; + name = "tough-cookie-0.12.1.tgz"; + sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + }; + deps = { + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tunnel-agent"."~0.2.0" = + self.by-version."tunnel-agent"."0.2.0"; + by-version."tunnel-agent"."0.2.0" = self.buildNodePackage { + name = "tunnel-agent-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; + name = "tunnel-agent-0.2.0.tgz"; + sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tunnel-agent"."~0.4.0" = + self.by-version."tunnel-agent"."0.4.0"; + by-version."tunnel-agent"."0.4.0" = self.buildNodePackage { + name = "tunnel-agent-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; + name = "tunnel-agent-0.4.0.tgz"; + sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."type-is"."~1.6.1" = + self.by-version."type-is"."1.6.1"; + by-version."type-is"."1.6.1" = self.buildNodePackage { + name = "type-is-1.6.1"; + version = "1.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz"; + name = "type-is-1.6.1.tgz"; + sha1 = "49addecb0f6831cbc1d34ba929f0f3a4f21b0f2e"; + }; + deps = { + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uid-safe"."1.1.0" = + self.by-version."uid-safe"."1.1.0"; + by-version."uid-safe"."1.1.0" = self.buildNodePackage { + name = "uid-safe-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; + name = "uid-safe-1.1.0.tgz"; + sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232"; + }; + deps = { + "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; + "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uid-safe"."~1.1.0" = + self.by-version."uid-safe"."1.1.0"; + by-spec."ultron"."1.0.x" = + self.by-version."ultron"."1.0.1"; + by-version."ultron"."1.0.1" = self.buildNodePackage { + name = "ultron-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"; + name = "ultron-1.0.1.tgz"; + sha1 = "c9d8d86c9cf2823028eb45629ab725897dd65dc5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."~1.4.4" = + self.by-version."underscore"."1.4.4"; + by-version."underscore"."1.4.4" = self.buildNodePackage { + name = "underscore-1.4.4"; + version = "1.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."~1.7.0" = + self.by-version."underscore"."1.7.0"; + by-version."underscore"."1.7.0" = self.buildNodePackage { + name = "underscore-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + name = "underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utf-8-validate"."1.0.x" = + self.by-version."utf-8-validate"."1.0.1"; + by-version."utf-8-validate"."1.0.1" = self.buildNodePackage { + name = "utf-8-validate-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz"; + name = "utf-8-validate-1.0.1.tgz"; + sha1 = "d15eb67e28f6bb93c9401eeb7eac7030a183e8d1"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utils-merge"."1.0.0" = + self.by-version."utils-merge"."1.0.0"; + by-version."utils-merge"."1.0.0" = self.buildNodePackage { + name = "utils-merge-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."vary"."~1.0.0" = + self.by-version."vary"."1.0.0"; + by-version."vary"."1.0.0" = self.buildNodePackage { + name = "vary-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; + name = "vary-1.0.0.tgz"; + sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."vhost"."~3.0.0" = + self.by-version."vhost"."3.0.0"; + by-version."vhost"."3.0.0" = self.buildNodePackage { + name = "vhost-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz"; + name = "vhost-3.0.0.tgz"; + sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."winston"."~0.7.2" = + self.by-version."winston"."0.7.3"; + by-version."winston"."0.7.3" = self.buildNodePackage { + name = "winston-0.7.3"; + version = "0.7.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz"; + name = "winston-0.7.3.tgz"; + sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "request-2.16.6" = self.by-version."request"."2.16.6"; + "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "winston" = self.by-version."winston"."0.7.3"; + by-spec."ws"."~0.7.1" = + self.by-version."ws"."0.7.1"; + by-version."ws"."0.7.1" = self.buildNodePackage { + name = "ws-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ws/-/ws-0.7.1.tgz"; + name = "ws-0.7.1.tgz"; + sha1 = "8f1c7864ca08081be3cd0ac330df0d29c5fcd0da"; + }; + deps = { + "options-0.0.6" = self.by-version."options"."0.0.6"; + "ultron-1.0.1" = self.by-version."ultron"."1.0.1"; + }; + optionalDependencies = { + "bufferutil-1.0.1" = self.by-version."bufferutil"."1.0.1"; + "utf-8-validate-1.0.1" = self.by-version."utf-8-validate"."1.0.1"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/servers/x11/xorg/libxkbfile-clang36.patch b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch new file mode 100644 index 000000000000..65bf2ea7437e --- /dev/null +++ b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch @@ -0,0 +1,11 @@ +--- libxkbfile-1.0.8/src/cout.c 2012-03-07 20:37:23.000000000 -0800 ++++ libxkbfile-1.0.8/src/cout.c 2015-03-24 20:51:11.000000000 -0700 +@@ -45,7 +45,7 @@ + { + register int i,nOut; + +- if ((!xkb)||(!xkb->names)||(!xkb->names->vmods)) ++ if ((!xkb)||(!xkb->names)) + return False; + for (i=nOut=0;i<XkbNumVirtualMods;i++) { + if (xkb->names->vmods[i]!=None) { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bf1242828762..61c1391ae09e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -79,6 +79,10 @@ in nativeBuildInputs = [ args.python ]; }; + libxkbfile = attrs: attrs // { + patches = lib.optional (stdenv.cc.cc.isClang or false) ./libxkbfile-clang36.patch; + }; + libpciaccess = attrs : attrs // { patches = [ ./libpciaccess-apple.patch ]; }; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 67882b1a02a3..684a06eff4a0 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -14,11 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; name = "prosody-${version}"; + src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "001fgslg3h7zfrfpkmqixnz5ircq6l0kr4wci5aj0i3nk6rrjjyx"; + sha256 = "0wbq4ps69l09fjb5dfjzab6i30hzpi4bvyj5kc44gf70arf42w4l"; }; communityModules = fetchhg { diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix new file mode 100644 index 000000000000..3849c96ec131 --- /dev/null +++ b/pkgs/shells/xonsh/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, python3Packages}: + +python3Packages.buildPythonPackage rec { + name = "xonsh-${version}"; + version = "0.1.3"; + + # The logo xonsh prints during build contains unicode characters, and this + # fails because locales have not been set up in the build environment. + # We can fix this on Linux by setting: + # export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + # but this would not be a cross platform solution, so it's simpler to just + # patch the setup.py script to not print the logo during build. + prePatch = '' + substituteInPlace setup.py --replace "print(logo)" "" + ''; + + propagatedBuildInputs = [ python3Packages.ply ]; + + src = fetchurl { + url = "https://github.com/scopatz/xonsh/archive/${version}.zip"; + sha256 = "0p2d7p892w77ii8yy51vpw7jlz2y53k8g61m7l8bar3hr3qrl306"; + }; + + meta = with stdenv.lib; { + description = "A Python-ish, BASHwards-compatible shell"; + homepage = "http://xonsh.org"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index c415a297d845..d4ffc81c0332 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -64,7 +64,9 @@ rec { name = "stdenv-darwin-boot-1"; inherit system config; - inherit (stage0.stdenv) shell initialPath fetchurlBoot; + inherit (stage0.stdenv) shell fetchurlBoot; + + initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ]; preHook = preHook + "\n" + '' export NIX_LDFLAGS_AFTER+=" -L/usr/lib" @@ -82,7 +84,7 @@ rec { cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "${buildTools.tools}/Library/Developer/CommandLineTools/usr"; + outPath = nativePrefix; }; }; }; @@ -126,7 +128,7 @@ rec { nativeTools = false; nativeLibc = true; binutils = pkgs.darwin.cctools; - cc = pkgs.llvmPackages.clang; + cc = pkgs.llvmPackages.clang-unwrapped; coreutils = pkgs.coreutils; shell = "${pkgs.bash}/bin/bash"; extraPackages = [ pkgs.libcxx ]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 751366e38d23..6960c84ba5e3 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -69,8 +69,6 @@ let isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; - unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); - defaultNativeBuildInputs = extraBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh ../../build-support/setup-hooks/compress-man-pages.sh @@ -83,19 +81,30 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. - mkDerivation = attrs: + mkDerivation = + { buildInputs ? [] + , nativeBuildInputs ? [] + , propagatedBuildInputs ? [] + , propagatedNativeBuildInputs ? [] + , crossConfig ? null + , meta ? {} + , passthru ? {} + , pos ? null # position used in error messages and for meta.position + , ... } @ attrs: let - pos = - if attrs.meta.description or null != null then - unsafeGetAttrPos "description" attrs.meta + pos' = + if pos != null then + pos + else if attrs.meta.description or null != null then + builtins.unsafeGetAttrPos "description" attrs.meta else - unsafeGetAttrPos "name" attrs; - pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»"; + builtins.unsafeGetAttrPos "name" attrs; + pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»"; throwEvalHelp = unfreeOrBroken: whatIsWrong: assert builtins.elem unfreeOrBroken ["Unfree" "Broken" "blacklisted"]; - throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos'} ${whatIsWrong}, refusing to evaluate." + throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${whatIsWrong}, refusing to evaluate." + (lib.strings.optionalString (unfreeOrBroken != "blacklisted") '' For `nixos-rebuild` you can set @@ -121,14 +130,8 @@ let assert licenseAllowed attrs; lib.addPassthru (derivation ( - (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) - // (let - buildInputs = attrs.buildInputs or []; - nativeBuildInputs = attrs.nativeBuildInputs or []; - propagatedBuildInputs = attrs.propagatedBuildInputs or []; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; - crossConfig = attrs.crossConfig or null; - in + (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos"]) + // { builder = attrs.realBuilder or shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; @@ -144,7 +147,7 @@ let nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []); propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (if crossConfig == null then propagatedBuildInputs else []); - }))) ( + })) ( { # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not @@ -152,15 +155,15 @@ let # include it in the result, it *is* available to nix-env for # queries. We also a meta.position attribute here to # identify the source location of the package. - meta = attrs.meta or {} // (if pos != null then { - position = pos.file + ":" + (toString pos.line); + meta = meta // (if pos' != null then { + position = pos'.file + ":" + toString pos'.line; } else {}); - passthru = attrs.passthru or {}; + inherit passthru; } // # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the # derivation (e.g., in assertions). - (attrs.passthru or {})); + passthru); # The stdenv that we are producing. result = diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 2332cd1bc510..167c710dd264 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: stdenv.mkDerivation rec { - name = "vdpauinfo-0.9"; + name = "vdpauinfo-1.0"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "1qy84clsz3l3hvhaxw01rl4bjqlsaml5l63rc43vck6vh8vgwh50"; + sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; }; buildInputs = [ pkgconfig libvdpau ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 1d11a8ab4789..eb0d3a3bd833 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - version = "5.1.7"; + version = "5.2.7"; in stdenv.mkDerivation { name = "unrar-${version}"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc"; + sha256 = "1b1ggrqn020pvvh2ia98alqxpl1q3x65cb6zzqwv91rpjiz7a57g"; }; preBuild = '' @@ -23,10 +23,12 @@ stdenv.mkDerivation { $out/share/doc/unrar ''; + setupHook = ./setup-hook.sh; + meta = with stdenv.lib; { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; - license = licenses.unfreeRedistributable; + license = licenses.gpl2; maintainers = [ maintainers.emery ]; platforms = platforms.all; }; diff --git a/pkgs/tools/archivers/unrar/setup-hook.sh b/pkgs/tools/archivers/unrar/setup-hook.sh new file mode 100644 index 000000000000..41d6a5cd217b --- /dev/null +++ b/pkgs/tools/archivers/unrar/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnrar) +_tryUnrar() { + if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi + unrar x "$curSrc" >/dev/null +} diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index fa492835e059..5342b4f489dc 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,39 +1,78 @@ -{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, readline, openssl, python -, ncurses ? null -, sqlite ? null, postgresql ? null, mysql ? null, libcap ? null -, zlib ? null, lzo ? null, acl ? null, ceph ? null +{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool +, readline ? null, openssl ? null, python ? null, ncurses ? null +, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null +, acl ? null, glusterfs ? null, ceph ? null, libcap ? null }: assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; +let + withGlusterfs = "\${with_glusterfs_directory}"; +in stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "14.2.3"; + version = "14.2.4"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; name = "${name}-src"; - sha256 = "04z6nwlnk6kk5ghbdw5g34mkypmpk4qpkd08cjxwblg8sdj4j8fl"; + sha256 = "0shb91pawdgrn6rb4np3zyyxv36899nvwf8jaihkg0wvb01viqzr"; }; buildInputs = [ pkgconfig nettools gettext readline openssl python - ncurses sqlite postgresql mysql libcap zlib lzo acl ceph + ncurses sqlite postgresql mysql zlib lzo acl glusterfs ceph libcap ]; + postPatch = '' + sed -i 's,\(-I${withGlusterfs}/include\),\1/glusterfs,' configure + ''; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" "--exec-prefix=\${out}" - "--with-openssl=${openssl}" - "--with-python=${python}" - "--with-readline=${readline}" + "--enable-lockmgr" + "--enable-dynamic-storage-backends" + "--with-basename=nixos" # For reproducible builds since it uses the hostname otherwise + "--with-hostname=nixos" # For reproducible builds since it uses the hostname otherwise + "--with-working-dir=/var/lib/bareos" + "--with-bsrdir=/var/lib/bareos" + "--with-logdir=/var/log/bareos" + "--with-pid-dir=/var/run/bareos" + "--with-subsys-dir=/var/run/bareos" "--enable-ndmp" "--enable-lmdb" - ] ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" + "--enable-batch-insert" + "--enable-dynamic-cats-backends" + "--enable-sql-pooling" + "--enable-scsi-crypto" + ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline}" ] + ++ optional (python != null) "--with-python=${python}" + ++ optional (openssl != null) "--with-openssl=${openssl}" + ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (mysql != null) "--with-mysql=${mysql}"; + ++ optional (mysql != null) "--with-mysql=${mysql}" + ++ optional (zlib != null) "--with-zlib=${zlib}" + ++ optional (lzo != null) "--with-lzo=${lzo}" + ++ optional (acl != null) "--enable-acl" + ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}" + ++ optional (ceph != null) "--with-cephfs=${ceph}"; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + rm -rf /tmp /var + ''; meta = with stdenv.lib; { homepage = http://www.bareos.org/; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index c09ee6a52f79..573c4b58d60d 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, openssl }: stdenv.mkDerivation rec { - version = "3.48.20"; + version = "3.48.21"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "129cpf324ihqxc8mvvkqjfanl17g60zfiqy1zx8ri56dkrg52mii"; + sha256 = "10p4gf8y9h7mxkqlbs3hqgvmvbgvcbax8jp1whbw4yidwahn06w7"; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index e5a4f83ab0f8..229b0512679b 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bluedevil"; - version = "1.3.1"; + version = "2.1.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0di3hwgqzhx51x172wnbccf9f84cg69mab83qkcif0v3gv3pzy4f"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi"; }; buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ]; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index b8db8d9e52ad..d1e0e8e430b5 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.19"; in +let version = "3.19.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1j1ni8baw6pgjh85jkdys8pzq870xy7z2n7ngn9r7g2f47bnafdj"; + sha256 = "1nw8rsc0dc5k6hrg03m1c65n4d0f7rfs1fjv96xqhqg0wykn5214"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 4583dc1ba778..81a3b46cacb7 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"; in +let version = "1.8.1"; in stdenv.mkDerivation rec { name = "encfs-${version}"; src = fetchFromGitHub { - sha256 = "1dp3558x9v5hqnjnrlnd0glrkcc23anl2mxhjirhhw8dyh1lzl5z"; + sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 3e483a293649..02087ff97b25 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,9 +1,11 @@ {stdenv, fetchurl, help2man}: -stdenv.mkDerivation { - name = "fatsort"; +stdenv.mkDerivation rec { + version = "1.3.365"; + name = "fatsort-${version}"; + src = fetchurl { - url = mirror://sourceforge/fatsort/fatsort-1.3.365.tar.gz; + url = "mirror://sourceforge/fatsort/${name}.tar.gz"; sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; }; @@ -11,10 +13,11 @@ stdenv.mkDerivation { buildInputs = [ help2man ]; - meta = { + meta = with stdenv.lib; { homepage = http://fatsort.sourceforge.net/; - description = "Sorts FAT partition table, for devices that don't do sorting of files."; - maintainers = [ stdenv.lib.maintainers.kovirobi ]; - license = stdenv.lib.licenses.gpl2; + description = "Sorts FAT partition table, for devices that don't do sorting of files"; + maintainers = [ maintainers.kovirobi ]; + license = licenses.gpl2; + inherit version; }; } diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix new file mode 100644 index 000000000000..cf2c5598d2a9 --- /dev/null +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk2 }: + +stdenv.mkDerivation rec { + version = "2.1.11"; + name = "ggobi-${version}"; + + src = fetchurl { + url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2"; + sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7"; + }; + + buildInputs = [ pkgconfig libxml2 gtk2 ]; + + configureFlags = "--with-all-plugins"; + + meta = with stdenv.lib; { + description = "Visualization program for exploring high-dimensional data"; + homepage = http://www.ggobi.org/; + license = licenses.cpl10; + platforms = platforms.linux; + maintainers = [ maintainers.michelk ]; + }; +} diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index de380222a668..9e6c31c055fd 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.7"; name = "grc-${version}"; src = fetchurl { - url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.tar.gz"; - sha256 = "1p6xffp5mmnaw9llvrd4rc7zd4l7b1m62dlmn3c8p1ina831yn52"; + url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.orig.tar.gz"; + sha256 = "01hpvs5915ajcswm7kg4167qsa9kbg0snxxj5k3ymkz6c567dp70"; }; installPhase = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index f6332874b3ac..d6d8fa084be1 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, python, zip, pandoc }: +{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: let - version = "2015.03.09"; + version = "2015.03.24"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0mxpm79xdzzckc5rysjx17pxm9bldk7s13im7l9xd4pjrhy411xz"; + sha256 = "1m462hcgizdp59s9h62hjwhq4vjrgmck23x2bh5jvb9vjpcfqjxv"; }; - buildInputs = [ python ]; + buildInputs = [ python makeWrapper ]; nativeBuildInputs = [ zip pandoc ]; patchPhase = '' @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) ''; + postInstall = '' + # ffmpeg is used for post-processing and fixups + wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin" + ''; + meta = { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index b0af961c733b..e602ee5f4126 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let - version = "15"; # see ${src}/util/version/Version.h - date = "20150207"; + version = "16"; # see ${src}/util/version/Version.h + date = "20150308"; in stdenv.mkDerivation { name = "cjdns-${version}-${date}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; - rev = "0fc585e15e25b1bd39be24a534f47bb966485a4a"; - sha256 = "090zx30bgfk6wyh10wbjqpkvjq9l30jc7fh2iagajsmpjs9iipqm"; + rev = "dc7eaf676cb83f13ba3e76a1bd0f2e093e6d6e1b"; + sha256 = "1llhv9kflh4rzv9b9qq9zhrckcc6a7xs0dp147adwmaxqjj8v601"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 91cd8274039e..4bf321d1ac03 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper, coreutils, gnused }: +{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper +, coreutils, gnused, bind, openldap ? null +}: stdenv.mkDerivation rec { name = "dhcp-${version}"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; - sha256 = "1w4s7sni1m9223ya8m2a64lr62845c6xlraprjf8zfx6lylbqv16"; + sha256 = "0rc156qqv7293yi69gxvvc8s4cp7fspwl12iqkf6r7vmb2rwjik2"; }; patches = @@ -32,10 +34,31 @@ stdenv.mkDerivation rec { # due to an uninitialized variable. CFLAGS = "-g -O2 -Wall"; - buildInputs = [ perl makeWrapper ]; + buildInputs = [ perl makeWrapper openldap ]; + + configureFlags = [ + "--with-libbind=${bind}" + "--enable-failover" + "--enable-execute" + "--enable-tracing" + "--enable-delayed-ack" + "--enable-dhcpv6" + "--enable-paranoia" + "--enable-early-chroot" + "--sysconfdir=/etc" + "--localstatedir=/var" + ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + + installFlags = [ "DESTDIR=\${out}" ]; postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + cp client/scripts/linux $out/sbin/dhclient-script substituteInPlace $out/sbin/dhclient-script \ --replace /sbin/ip ${iproute}/sbin/ip diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 8c5896561fcd..95700cb38064 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.6.7"; + name = "dhcpcd-6.8.1"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "1aydp26xsn9y6acg5zmcz6pp6parywnmhcvp9ipf54vbac53mya3"; + sha256 = "10mg68yxvl4kn1ya8ziifg2dm71c10r12sg7y7k1k0vafazhrdi7"; }; - patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; - buildInputs = [ pkgconfig udev ]; - configureFlags = "--sysconfdir=/etc"; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch b/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch deleted file mode 100644 index 066ea67db9ee..000000000000 --- a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN dhcpcd-6.1.0-old/if-linux.c dhcpcd-6.1.0/if-linux.c ---- dhcpcd-6.1.0-old/if-linux.c 2013-09-20 12:27:24.000000000 +0200 -+++ dhcpcd-6.1.0/if-linux.c 2013-12-13 09:50:24.183694744 +0100 -@@ -86,7 +86,7 @@ if_init(struct interface *iface) - - fp = fopen(path, "w"); - if (fp == NULL) -- return errno == ENOENT ? 0 : -1; -+ return (errno == ENOENT || errno == EROFS) ? 0 : -1; - n = fprintf(fp, "1"); - fclose(fp); - return n == -1 ? -1 : 0; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 58e238c3c025..4119afa5228a 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,19 +1,20 @@ -{ stdenv, pkgs, fetchurl }: +{ stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { - version = "1.5.11"; + majorVersion = "1.5"; + version = "${majorVersion}.11"; name = "haproxy-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/1.5/src/${name}.tar.gz"; + url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz"; sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; - buildInputs = [ ]; + buildInputs = [ openssl ]; # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux2628 PREFIX=$out" + export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes" ''; meta = { @@ -29,9 +30,6 @@ stdenv.mkDerivation rec { homepage = http://haproxy.1wt.eu; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; - /* TODO license = [ - stdenv.lib.licenses.gpl2 - stdenv.lib.licenses.lgpl21 - ];*/ + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 0640f55bc9eb..b044b5268734 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ModemManager-${version}"; - version = "1.2.0"; + version = "1.4.6"; src = fetchurl { url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; - sha256 = "1g08ciyhys9bi5m45z30kln17zni4r07i5byjaglmwq6np1xincb"; + sha256 = "1kd5nn5rm88c8rgmzwy2fsf3cr7fai7r85mi61kcby0hcgsapv8c"; }; nativeBuildInputs = [ intltool pkgconfig ]; @@ -17,9 +17,25 @@ stdenv.mkDerivation rec { "--with-polkit" "--with-udev-base-dir=$(out)/lib/udev" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--sysconfdir=/etc" + "--localstatedir=/var" ]; + installFlags = [ "DESTDIR=\${out}" ]; + + preInstall = '' + mkdir -p $out/etc/systemd/system + ''; + postInstall = '' + mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system + rm -rf $out/$out/etc + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/ModemManager.service \ diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index c463c94d6109..af5155695f48 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,49 +1,29 @@ -x@{builderDefsPackage, ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{stdenv, fetchurl, ncurses, autoconf +, withGtk ? false, gtk ? null}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="mtr"; - version="0.85"; - name="${baseName}-${version}"; +assert withGtk -> gtk != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + baseName="mtr"; + version="0.86"; + name="${baseName}-${version}"; + + src = fetchurl { url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz"; - hash="1jqrz8mil3lraaqgc87dyvx8d4bf3vq232pfx9mksxnkbphp4qvd"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "01lcy89q3i9g4kz4liy6m7kcq1zyvmbc63rqidgw67341f94inf5"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + configureFlags = optionalString (!withGtk) "--without-gtk"; - patches = [ ./edd425.patch ]; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doPatch" "doMakeInstall"]; + buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk; meta = { + homepage = http://www.bitwizard.nl/mtr/; description = "A network diagnostics tool"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - unix; - license = a.lib.licenses.gpl2; - }; - passthru = { - updateInfo = { - downloadPage = "ftp://ftp.bitwizard.nl/mtr/"; - }; + maintainers = [ maintainers.koral maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.gpl2; }; -}) x +} diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index dffafe5c8169..b16aa46cc753 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.8"; + name = "nbd-3.10"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1qnkzrnc9m4n814ciqh95q9j8l7d6yd7sn36q8yn0dmi1rvj78j8"; + sha256 = "1kj772zv6s3rjmvr0gi3yhagzlq2nmv5n5gfhrjphv5bcxx3mibg"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 23b45358594a..be853dad841a 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -10,22 +10,22 @@ stdenv.mkDerivation rec { geoLiteCity = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz"; - sha256 = "1sqskc8nh9k46nif4i6abjil9nfl4x6na4gadzbxp0929lbzyh0f"; + sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a"; }; geoLiteCityV6 = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"; - sha256 = "1427zljjhbixjcihinj7l79v1daii7ikcmxgkmwdp4rbr25qxlhz"; + sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd"; }; geoIPASNum = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz"; - sha256 = "1rh2920sdciqn3pifl4rz0jl3m32ww4gjx495p5xd6ldpy95gn31"; + sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p"; }; geoIPASNumV6 = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"; - sha256 = "1064arl40c80kwhbdylhwk6gn2xs36dr0aq3634i1rdpd4jm1a41"; + sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d"; }; src = fetchurl { diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 167fea806220..55147464416d 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,15 +5,13 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "5.7p3"; + version = "5.7p4"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a"; + sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9"; }; - patches = [ ./no-install.patch ]; - configureFlags = [ "--with-privsep-path=${privsepPath}" "--with-privsep-user=${privsepUser}" @@ -23,6 +21,16 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + meta = with stdenv.lib; { homepage = "http://www.openntpd.org/"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/openntpd/no-install.patch b/pkgs/tools/networking/openntpd/no-install.patch deleted file mode 100644 index 0194e414062b..000000000000 --- a/pkgs/tools/networking/openntpd/no-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 81549cf..1262bbf 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1740,21 +1740,6 @@ uninstall-man: uninstall-man5 uninstall-man8 - - install-exec-hook: - @ln -f "$(DESTDIR)$(sbindir)/ntpd" "$(DESTDIR)$(sbindir)/ntpctl" -- @if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \ -- fi -- @if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/run"; \ -- fi -- @if [ ! -d "$(DESTDIR)$(localstatedir)/db" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/db"; \ -- fi -- @if [ ! -f "$(DESTDIR)$(sysconfdir)/ntpd.conf" ]; then \ -- $(INSTALL) -m 644 "$(srcdir)/ntpd.conf" "$(DESTDIR)$(sysconfdir)/ntpd.conf"; \ -- else \ -- echo; \ -- echo " $(DESTDIR)$(sysconfdir)/ntpd.conf already exists, install will not overwrite"; \ -- fi - @if [ ! -d "$(PRIVSEP_PATH)" ]; then \ - echo; \ - echo " Please created a privilege separation directory for ntpd." ; \ diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 179908a1007c..231d7e293b82 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.6.2"; + name = "tcpdump-4.7.3"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1f701387jyxq7rjhv4hiig3b3g55m4b4403rd0zncv1sx3cf8kjj"; + sha256 = "1kla3l7lja8cfwimp512x7z176x2dsy03ih6g8gd95p95ijzp1qz"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index ed9b6d56edb4..93c5988b55d4 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.57b"; + version = "1.58b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "05dwh2kgz31702y339bvbs0b3ffadxgxk8cqqhs2i0ggx5bnl5p4"; + sha256 = "1szggm4x9i9bsrcb99s5vbgncagp7jvhz8cg9amkx7p6mp2x4pld"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h index 7d5a47669e49..c6ebc873ae09 100644 --- a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h +++ b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h @@ -69,9 +69,10 @@ abi_ulong afl_entry_point, /* ELF entry point (_start) */ afl_start_code, /* .text start pointer */ afl_end_code; /* .text end pointer */ -/* Set on the child in forkserver mode: */ +/* Set in the child process in forkserver mode: */ static unsigned char afl_fork_child; +unsigned int afl_forksrv_pid; /* Instrumentation ratio: */ @@ -158,6 +159,8 @@ static void afl_forkserver(CPUArchState *env) { if (write(FORKSRV_FD + 1, tmp, 4) != 4) return; + afl_forksrv_pid = getpid(); + /* All right, let's await orders... */ while (1) { diff --git a/pkgs/tools/security/afl/qemu-patches/syscall.patch b/pkgs/tools/security/afl/qemu-patches/syscall.patch new file mode 100644 index 000000000000..c8ffb61ba2cf --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/syscall.patch @@ -0,0 +1,25 @@ +--- qemu-2.2.0/linux-user/syscall.c.orig 2014-12-09 14:45:43.000000000 +0000 ++++ qemu-2.2.0/linux-user/syscall.c 2015-03-27 06:33:00.736000000 +0000 +@@ -227,7 +227,21 @@ + _syscall3(int,sys_rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,uinfo) + _syscall3(int,sys_syslog,int,type,char*,bufp,int,len) + #if defined(TARGET_NR_tgkill) && defined(__NR_tgkill) +-_syscall3(int,sys_tgkill,int,tgid,int,pid,int,sig) ++ ++extern unsigned int afl_forksrv_pid; ++ ++static int sys_tgkill(int tgid, int pid, int sig) { ++ ++ /* Workaround for -lpthread to make abort() work properly, without ++ killing the forkserver due to a prematurely cached PID. */ ++ ++ if (afl_forksrv_pid && afl_forksrv_pid == pid && sig == SIGABRT) ++ pid = tgid = getpid(); ++ ++ return syscall(__NR_sys_tgkill, pid, tgid, sig); ++ ++} ++ + #endif + #if defined(TARGET_NR_tkill) && defined(__NR_tkill) + _syscall2(int,sys_tkill,int,tid,int,sig) diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 929f9fba9a61..441d64415cbd 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ./qemu-patches/cpu-exec.patch ./qemu-patches/no-etc-install.patch ./qemu-patches/translate-all.patch + ./qemu-patches/syscall.patch ]; preConfigure = '' diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 4bd0587135cf..88f6e359d2b7 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, gtk2, nssTools, pcsclite, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite +, pkgconfig }: +let version = "4.1.2"; in stdenv.mkDerivation rec { - name = "${package}-${build}"; - package = "eid-mw-4.0.6-1620"; - build = "tcm406-258906"; + name = "eid-mw-${version}"; - src = fetchurl { - url = "http://eid.belgium.be/en/binaries/${package}.tar_${build}.gz"; - sha256 = "1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2"; + src = fetchFromGitHub { + sha256 = "034ar1v2qamdyq71nklh1nvqbmw6ryz63jdwnnc873f639mf5w94"; + rev = "v${version}"; + repo = "eid-mw"; + owner = "Fedict"; }; - buildInputs = [ gtk2 pcsclite pkgconfig ]; + buildInputs = [ autoreconfHook gtk2 pcsclite pkgconfig ]; - unpackPhase = "tar -xzf ${src} --strip-components=1"; + doCheck = true; postInstall = '' install -D ${./eid-nssdb.in} $out/bin/eid-nssdb @@ -20,8 +22,6 @@ stdenv.mkDerivation rec { --replace "modutil" "${nssTools}/bin/modutil" ''; - doCheck = true; - meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index bd81b61e12ad..632edaedd2ef 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,10 +1,14 @@ -{ fetchurl, stdenv, pkgconfig, glib -, useGtk ? !stdenv.isDarwin, gtk -, useNcurses ? true, ncurses -, useQt4 ? false, qt4 }: - -assert useGtk || useNcurses || useQt4; - +{ fetchurl, stdenv, pkgconfig +, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null +}: + +let + mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; + mkEnable = mkFlag "enable" "disable"; + mkWith = mkFlag "with" "without"; + hasX = gtk2 != null || qt4 != null; +in +with stdenv.lib; stdenv.mkDerivation rec { name = "pinentry-0.9.0"; @@ -13,16 +17,16 @@ stdenv.mkDerivation rec { sha256 = "1awhajq21hcjgqfxg9czaxg555gij4bba6axrwg8w6lfmc3ml14h"; }; - buildInputs = let opt = stdenv.lib.optional; in [] - ++ opt useGtk glib - ++ opt useGtk gtk - ++ opt useNcurses ncurses - ++ opt useQt4 qt4; + buildInputs = [ libcap gtk2 ncurses qt4 ]; - configureFlags = [ "--disable-pinentry-gtk" "--disable-pinentry-qt" ] - ++ (if useGtk || useQt4 then ["--with-x"] else ["--without-x"]) - ++ (if useGtk then ["--enable-pinentry-gtk2"] else ["--disable-pinentry-gtk"]) - ++ (if useQt4 then ["--enable-pinentry-qt4"] else ["--disable-pinentry-qt4"]); + configureFlags = [ + (mkWith (libcap != null) "libcap") + (mkWith (hasX) "x") + (mkEnable (ncurses != null) "pinentry-curses") + (mkEnable true "pinentry-tty") + (mkEnable (gtk2 != null) "pinentry-gtk2") + (mkEnable (qt4 != null) "pinentry-qt4") + ]; nativeBuildInputs = [ pkgconfig ]; @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; license = stdenv.lib.licenses.gpl2Plus; - + platforms = stdenv.lib.platforms.all; longDescription = '' Pinentry provides a console and a GTK+ GUI that allows users to enter a passphrase when `gpg' or `gpg2' is run and needs it. diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 3a710d564065..b6ae48c5d833 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.12"; + name = "sudo-1.8.13"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1c7kqhyps5hw38vl7a50f8gqz57mc4npi9l1clkikbg83n252fqn"; + sha256 = "09asw1hpxc39a6hhydr8n33m2pni1b5m37vaj7b00761ybnyax73"; }; configureFlags = [ diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 54a76280a1cc..db3fe3197fa5 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { - name = "tor-0.2.5.10"; + name = "tor-0.2.5.11"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0fx8qnwh2f8ykfx0np4hyznjfi4xfy96z59pk96y3zyjvjjh5pdk"; + sha256 = "0sb7ai8r9c0nvdagjrbfqpri6x4njfxv954fxrjv46rzkkpgmq5f"; }; # Note: torsocks is specified as a dependency, as the distributed diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 750ab3708729..3e6e50281118 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.4"; + version = "4.0.5"; 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 - "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else - "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185"; + "0w1vq2fvk0ik503vz02znk80ywpnsybx0sc6906q7sbk3i7ggxp1" else + "1yljz43kyl6pmri1xnxmfxh6nphczvwgbrdgdsimc05zsfbrh363"; }; patchPhase = '' diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 0fe4cbc986c1..b8c92eeab567 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-0.8.8"; + name = "gptfdisk-1.0.0"; src = fetchurl { url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; - sha256 = "16myqa72mp0wyhca8il299h1gd6k6sr7m52qcr97j840wk0fjcac"; + sha256 = "0v0xl0mzwabdf9yisgsvkhpyi48kbik35c6df42gr6d78dkrarjv"; }; buildInputs = [ libuuid popt icu ncurses ]; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index ba17d1865db0..ae3bb94fb902 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}: -let release = "0.24.1"; in +let release = "0.29.1"; in stdenv.mkDerivation { name = "silver-searcher-${release}"; src = fetchgit { url = "https://github.com/ggreer/the_silver_searcher.git"; rev = "refs/tags/${release}"; - sha256 = "1cwav217mkbwyg8isiak0wynydiil2j9gy4sx79harbcql0f3nl3"; + sha256 = "05508c2714d356464a0de6f41a6a8408ccd861b967e968302c4b72feade89581"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 803b44e92746..6331aa8cadd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -396,9 +396,9 @@ let inherit lib; }; - makeInitrd = {contents, compressor ? "gzip -9n"}: + makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: import ../build-support/kernel/make-initrd.nix { - inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor; + inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor prepend; }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; @@ -1407,6 +1407,8 @@ let gftp = callPackage ../tools/networking/gftp { }; + ggobi = callPackage ../tools/graphics/ggobi { }; + gifsicle = callPackage ../tools/graphics/gifsicle { }; gitlab = callPackage ../applications/version-management/gitlab { @@ -1735,7 +1737,7 @@ let kexectools = callPackage ../os-specific/linux/kexectools { }; - keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; + #keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; keychain = callPackage ../tools/misc/keychain { }; @@ -2362,7 +2364,10 @@ let philter = callPackage ../tools/networking/philter { }; - pinentry = callPackage ../tools/security/pinentry { }; + pinentry = callPackage ../tools/security/pinentry { + libcap = if stdenv.isDarwin then null else libcap; + qt4 = null; + }; pius = callPackage ../tools/security/pius { }; @@ -3236,6 +3241,8 @@ let rush = callPackage ../shells/rush { }; + xonsh = callPackage ../shells/xonsh { }; + zsh = callPackage ../shells/zsh { }; @@ -3318,7 +3325,7 @@ let compcert = callPackage ../development/compilers/compcert {}; - cryptol = haskell-ng.packages.ghc763.cryptol; + cryptol = haskellngPackages.cryptol; cython = pythonPackages.cython; cython3 = python3Packages.cython; @@ -3853,6 +3860,8 @@ let mitscheme = callPackage ../development/compilers/mit-scheme { }; + mkcl = callPackage ../development/compilers/mkcl {}; + mlton = callPackage ../development/compilers/mlton { }; mono = callPackage ../development/compilers/mono { @@ -4482,6 +4491,10 @@ let luarocks = luaPackages.luarocks; + toluapp = callPackage ../development/tools/toluapp { + lua = lua5_1; # doesn't work with any other :( + }; + ### END OF LUA lush2 = callPackage ../development/interpreters/lush {}; @@ -4816,6 +4829,8 @@ let bam = callPackage ../development/tools/build-managers/bam {}; + bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; }; + binutils = if stdenv.isDarwin then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;} else callPackage ../development/tools/misc/binutils { @@ -5481,8 +5496,6 @@ let cln = callPackage ../development/libraries/cln { }; - clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; - clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; clucene_core_1 = callPackage ../development/libraries/clucene-core { }; @@ -6064,6 +6077,8 @@ let jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jbigkit = callPackage ../development/libraries/jbigkit { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; @@ -6301,6 +6316,8 @@ let libfprint = callPackage ../development/libraries/libfprint/master.nix { }; + libfpx = callPackage ../development/libraries/libfpx { }; + libgadu = callPackage ../development/libraries/libgadu { }; libgdata = gnome3.libgdata; @@ -6332,7 +6349,7 @@ let libechonest = callPackage ../development/libraries/libechonest { }; - libev = builderDefsPackage ../development/libraries/libev { }; + libev = callPackage ../development/libraries/libev { }; libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; libevent = callPackage ../development/libraries/libevent { }; @@ -6654,9 +6671,7 @@ let libqalculate = callPackage ../development/libraries/libqalculate { }; - librsvg = callPackage ../development/libraries/librsvg { - gtk2 = null; gtk3 = null; # neither gtk version by default - }; + librsvg = callPackage ../development/libraries/librsvg { }; librsync = callPackage ../development/libraries/librsync { }; @@ -6691,6 +6706,8 @@ let libstatgrab = callPackage ../development/libraries/libstatgrab { }; + libsvm = callPackage ../development/libraries/libsvm { }; + libtar = callPackage ../development/libraries/libtar { }; libtasn1 = callPackage ../development/libraries/libtasn1 { }; @@ -7354,7 +7371,7 @@ let openglSupport = mesaSupported; alsaSupport = (!stdenv.isDarwin); x11Support = true; - pulseaudioSupport = true; + pulseaudioSupport = (!stdenv.isDarwin); # resolve the unrecognized -fpascal-strings option error stdenv = if stdenv.isDarwin @@ -8296,11 +8313,13 @@ let bluez = null; avahi = null; }; + pulseaudioFull = pulseaudio.override { bluez = bluez5; avahi = avahi; jackaudioSupport = true; x11Support = true; + useSystemd = stdenv.isLinux; }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; @@ -8442,6 +8461,8 @@ let boost = boost155; }; + ripple-data-api = callPackage ../servers/rippled/data-api.nix { }; + s6 = callPackage ../servers/s6 { }; spamassassin = callPackage ../servers/mail/spamassassin { @@ -8595,8 +8616,6 @@ let afuse = callPackage ../os-specific/linux/afuse { }; - amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { }; - autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { }; _915resolution = callPackage ../os-specific/linux/915resolution { }; @@ -8626,7 +8645,7 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; alsaOss = callPackage ../os-specific/linux/alsa-oss { }; - microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { }; + microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; @@ -8659,6 +8678,9 @@ let bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); + # Needed for LibreOffice + bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); + bluez = bluez4; inherit (pythonPackages) bedup; @@ -8669,6 +8691,8 @@ let busybox = callPackage ../os-specific/linux/busybox { }; + cgmanager = callPackage ../os-specific/linux/cgmanager { }; + checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; checksec = callPackage ../os-specific/linux/checksec { }; @@ -8685,7 +8709,9 @@ let criu = callPackage ../os-specific/linux/criu { }; - cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { + libgcrypt = libgcrypt_1_6; + }; cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; @@ -9673,6 +9699,8 @@ let mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; + mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { }; + nafees = callPackage ../data/fonts/nafees { }; numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; @@ -10777,12 +10805,44 @@ let AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { - tetex = null; + imagemagick_light = imagemagick.override { + libcl = null; + perl = null; + jemalloc = null; + bzip2 = null; + zlib = null; + libX11 = null; + libXext = null; + libXt = null; + dejavu_fonts = null; + fftw = null; + libfpx = null; + djvulibre = null; + fontconfig = null; + freetype = null; + ghostscript = null; + graphviz = null; + jbigkit = null; + libjpeg = null; + lcms2 = null; + openjpeg = null; + liblqr1 = null; + xz = null; + openexr = null; + pango = null; + libpng = null; librsvg = null; + libtiff = null; + libwebp = null; + libxml2 = null; }; - imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { }); + imagemagick = callPackage ../applications/graphics/ImageMagick { + ghostscript = if stdenv.isDarwin then null else ghostscript; + perl = null; # Currently Broken + }; + + imagemagickBig = imagemagick; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { @@ -10936,6 +10996,7 @@ let harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + bluez5 = bluez5_28; }; liferea = callPackage ../applications/networking/newsreaders/liferea { @@ -11185,6 +11246,8 @@ let withSidebar = true; }; + mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { }; + panamax_api = callPackage ../applications/networking/cluster/panamax/api { ruby = ruby_2_1; }; @@ -13204,6 +13267,8 @@ let abc-verifier = callPackage ../applications/science/logic/abc {}; + abella = callPackage ../applications/science/logic/abella {}; + alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; coq = callPackage ../applications/science/logic/coq { @@ -13294,6 +13359,8 @@ let iprover = callPackage ../applications/science/logic/iprover {}; + lean = callPackage ../applications/science/logic/lean {}; + leo2 = callPackage ../applications/science/logic/leo2 {}; logisim = callPackage ../applications/science/logic/logisim {}; @@ -13504,7 +13571,9 @@ let beep = callPackage ../misc/beep { }; - cups = callPackage ../misc/cups { libusb = libusb1; }; + cups = callPackage ../misc/cups { + libusb = libusb1; + }; cups_filters = callPackage ../misc/cups/filters.nix { }; @@ -13692,6 +13761,8 @@ let phabricator = callPackage ../misc/phabricator { }; + physlock = callPackage ../misc/screensavers/physlock { }; + pjsip = callPackage ../applications/networking/pjsip { }; polytable = callPackage ../tools/typesetting/tex/polytable { }; @@ -13712,7 +13783,7 @@ let retroarch = retroarchBare; }); - rssglx = callPackage ../misc/screensavers/rss-glx { }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; runit = callPackage ../tools/system/runit { }; @@ -14003,6 +14074,8 @@ let nfsUtils = nfs-utils; # added 2014-12-06 buildbotSlave = buildbot-slave; # added 2014-12-09 cool-old-term = cool-retro-term; # added 2015-01-31 + rssglx = rss-glx; #added 2015-03-25 + opentsdb = callPackage ../tools/misc/opentsdb {}; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a5a087e16add..4b23992d12a1 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -454,6 +454,7 @@ let self = _self // overrides; pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; + propagatedUserEnvPkgs = [ external.ghc-mod ]; fileSpecs = [ "elisp/*.el" ]; meta = { license = bsd3; }; }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 4f9f6947c98d..5a63be2e9c69 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -626,33 +626,16 @@ let self = _self // overrides; _self = with self; { }; hologram = buildGoPackage rec { - rev = "6e81a11091f59a9392e424d8f1c42b4b813c4bff"; + rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/AdRoll/hologram"; src = fetchFromGitHub { inherit rev; owner = "copumpkin"; repo = "hologram"; - sha256 = "1rpnc8sv9mwm9r9yfh8h2zxczznmvlhasrz55bcifmk4sym4ywq7"; + sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - preBuild = '' - cd "go/src/$goPackagePath" - - govers -d -m code.google.com/p/goprotobuf github.com/golang/protobuf - - # Work around `go install` assuming containing directory is the executable name we want - for i in */bin; do - mv "$i" "$(dirname "$i")/$(dirname "$i")" - done - - # Generate protobuf definitions and static assets - sed -i '1s|^|SHELL = ${stdenv.shell}\n|' Makefile - make protocol/hologram.pb.go - make transport/remote/bindata.go - ''; - - buildInputs = [ pkgs.protobuf crypto protobuf goamz rgbterm go-bindata - go-homedir ldap g2s gox govers ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; }; httprouter = buildGoPackage rec { @@ -1026,14 +1009,14 @@ let self = _self // overrides; _self = with self; { }; rgbterm = buildGoPackage rec { - rev = "9e3d038e1b8341ed7416c841a884cab4a3487941"; + rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/aybabtme/rgbterm"; src = fetchFromGitHub { inherit rev; owner = "aybabtme"; repo = "rgbterm"; - sha256 = "1pfg56pkm9clzd3c1s0czvydw1k35jggz9ydv8x2dbns3f7qn2ph"; + sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c01b3b59ee0f..b1e7e2b3352b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3952,6 +3952,7 @@ let django_1_7 = buildPythonPackage rec { name = "Django-${version}"; version = "1.7.7"; + disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; @@ -5139,6 +5140,22 @@ let }; }; + gspread = buildPythonPackage rec { + version = "0.2.3"; + name = "gspread-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/gspread/${name}.tar.gz"; + md5 = "5a71e4e3fc509dc1c4d34722f102dec1"; + }; + + meta = { + description = "Google Spreadsheets client library"; + homepage = "https://github.com/burnash/gspread"; + license = licenses.mit; + }; + }; + gyp = buildPythonPackage rec { rev = "1977"; name = "gyp-r${rev}"; @@ -6885,7 +6902,7 @@ let src = pkgs.notmuch.src; - sourceRoot = "${pkgs.notmuch.name}/bindings/python"; + sourceRoot = "${pkgs.notmuch.src.name}/bindings/python"; buildInputs = with self; [ python pkgs.notmuch ]; @@ -7760,6 +7777,27 @@ let }; + + praw = pythonPackages.buildPythonPackage rec { + name = "praw-2.1.21"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/praw/praw-2.1.21.tar.gz"; + md5 = "3b0388c9105662f8be8f1a4d3a38216d"; + }; + + propagatedBuildInputs = with pythonPackages; [ update_checker six mock flake8 ]; + + # can't find the tests module? + doCheck = false; + + meta = with stdenv.lib; { + description = "Python Reddit API wrapper"; + homepage = http://praw.readthedocs.org/; + license = licenses.gpl3; + }; + }; + prettytable = buildPythonPackage rec { name = "prettytable-0.7.1"; @@ -8365,6 +8403,33 @@ let }; }; + + pyenchant = pythonPackages.buildPythonPackage rec { + name = "pyenchant-1.6.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyenchant/pyenchant-1.6.6.tar.gz"; + md5 = "9f5acfd87d04432bf8df5f9710a17358"; + }; + + propagatedBuildInputs = with pythonPackages; [ pkgs.enchant ]; + + patchPhase = let + path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; + in '' + sed -i "${path_hack_script}" enchant/_enchant.py + ''; + + # dictionaries needed for tests + doCheck = false; + + meta = with stdenv.lib; { + description = "pyenchant: Python bindings for the Enchant spellchecker"; + homepage = https://pythonhosted.org/pyenchant/; + license = licenses.lgpl21; + }; + }; + pyfeed = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; @@ -8421,6 +8486,24 @@ let }; }; + + pygeoip = pythonPackages.buildPythonPackage rec { + name = "pygeoip-0.3.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.3.2.tar.gz"; + md5 = "861664f8be3bed44820356539f2ea5b6"; + }; + + propagatedBuildInputs = with pythonPackages; [ ]; + + meta = with stdenv.lib; { + description = "Pure Python GeoIP API"; + homepage = https://github.com/appliedsec/pygeoip; + license = licenses.lgpl3Plus; + }; + }; + pyglet = buildPythonPackage rec { name = "pyglet-1.1.4"; @@ -11504,6 +11587,26 @@ let }; + + update_checker = pythonPackages.buildPythonPackage rec { + name = "update_checker-0.11"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/u/update_checker/update_checker-0.11.tar.gz"; + md5 = "1daa54bac316be6624d7ee77373144bb"; + }; + + propagatedBuildInputs = with pythonPackages; [ requests2 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A python module that will check for package updates"; + homepage = https://github.com/bboe/update_checker; + license = licenses.bsd2; + }; + }; + urlgrabber = buildPythonPackage rec { name = "urlgrabber-3.9.1"; disabled = isPy3k; @@ -11859,6 +11962,24 @@ let }; + + willie = pythonPackages.buildPythonPackage rec { + name = "willie-5.2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/willie/willie-5.2.0.tar.gz"; + md5 = "a19f8c34e10e3c2d0d915c894224e521"; + }; + + propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; + + meta = with stdenv.lib; { + description = "Willie is a simple, lightweight, open source, easy-to-use IRC utility bot, written in Python."; + homepage = http://willie.dftba.net/; + license = licenses.efl20; + }; + }; + wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; name = nameFromURL url ".tar"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f2c3f88e6bda..cb469e613056 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -147,7 +147,6 @@ let pciutils = linux; pdf2xml = all; php = linux; - pinentry = linux; pltScheme = linux; pmccabe = linux; ppl = all; |