diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:07:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:09:03 +0200 |
| commit | 6b27ceb006ace21f9157034ac743242a0147eeec (patch) | |
| tree | de8c80579090028b8a918796fd7a8eda3c4cecf0 | |
| parent | 14c038dd0390a9b24969f0138356b5c7520b9fdf (diff) | |
| parent | b3bcb59bd5fddc3c0f74bbe120de561bbea29878 (diff) | |
| download | nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.gz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.bz2 nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.lz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.xz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.zst nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.zip | |
Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e34.
526 files changed, 5887 insertions, 4414 deletions
diff --git a/doc/default.nix b/doc/default.nix index 6a44587a31b1..076703213e48 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation { outputFile = "./languages-frameworks/haskell.xml"; } + toDocbook { - inputFile = ./../pkgs/development/idris-modules/README.md; + inputFile = ../pkgs/development/idris-modules/README.md; outputFile = "languages-frameworks/idris.xml"; } + toDocbook { - inputFile = ./../pkgs/development/r-modules/README.md; + inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; } + '' diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 151412a9400e..a9c42cfef08b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -309,6 +309,7 @@ pxc = "Patrick Callahan <patrick.callahan@latitudeengineering.com>"; qknight = "Joachim Schiele <js@lastlog.de>"; ragge = "Ragnar Dahlen <r.dahlen@gmail.com>"; + ralith = "Benjamin Saunders <ben.e.saunders@gmail.com>"; rardiol = "Ricardo Ardissone <ricardo.ardissone@gmail.com>"; rasendubi = "Alexey Shmalko <rasen.dubi@gmail.com>"; raskin = "Michael Raskin <7c6f434c@mail.ru>"; diff --git a/lib/strings.nix b/lib/strings.nix index 7109bd4ec6e1..5e5f7b378667 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -203,13 +203,21 @@ rec { */ escape = list: replaceChars list (map (c: "\\${c}") list); - /* Escape all characters that have special meaning in the Bourne shell. + /* Quote string to be used safely within the Bourne shell. Example: - escapeShellArg "so([<>])me" - => "so\\(\\[\\<\\>\\]\\)me" + escapeShellArg "esc'ape\nme" + => "'esc'\\''ape\nme'" */ - escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]"); + escapeShellArg = arg: "'${replaceStrings ["'"] ["'\\''"] (toString arg)}'"; + + /* Quote all arguments to be safely passed to the Bourne shell. + + Example: + escapeShellArgs ["one" "two three" "four'five"] + => "'one' 'two three' 'four'\\''five'" + */ + escapeShellArgs = concatMapStringsSep " " escapeShellArg; /* Obsolete - use replaceStrings instead. */ replaceChars = builtins.replaceStrings or ( diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 093e9bcbf104..f9f57424f7d0 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,6 +1,6 @@ { nixpkgs }: -with import ./../.. { }; +with import ../.. { }; with lib; stdenv.mkDerivation { diff --git a/lib/types.nix b/lib/types.nix index 91b39f3a9cf8..83f624e6b448 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -100,6 +100,10 @@ rec { in if isDerivation res then res else toDerivation res; }; + shellPackage = package // { + check = x: (package.check x) && (hasAttr "shellPath" x); + }; + path = mkOptionType { name = "path"; # Hacky: there is no ‘isPath’ primop. diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 7b8be2050c13..871fbb121d03 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -8,4 +8,10 @@ rec { replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] (if hasPrefix "/" s then substring 1 (stringLength s) s else s); + # Returns a system path for a given shell package + toShellPath = shell: + if types.shellPackage.check shell then + "/run/current-system/sw${shell.shellPath}" + else + shell; } diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 9642981803bf..f458bc39adaa 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -1,7 +1,7 @@ # This module defines a global environment configuration and # a common configuration for all shells. -{ config, lib, pkgs, ... }: +{ config, lib, utils, pkgs, ... }: with lib; @@ -135,13 +135,13 @@ in environment.shells = mkOption { default = []; - example = [ "/run/current-system/sw/bin/zsh" ]; + example = literalExample "[ pkgs.bashInteractive pkgs.zsh ]"; description = '' A list of permissible login shells for user accounts. No need to mention <literal>/bin/sh</literal> here, it is placed into this list implicitly. ''; - type = types.listOf types.path; + type = types.listOf (types.either types.shellPackage types.path); }; }; @@ -158,7 +158,7 @@ in environment.etc."shells".text = '' - ${concatStringsSep "\n" cfg.shells} + ${concatStringsSep "\n" (map utils.toShellPath cfg.shells)} /bin/sh ''; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 8231907d7999..277a4264137b 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -1,9 +1,8 @@ -{ config, lib, pkgs, ... }: +{ config, lib, utils, pkgs, ... }: with lib; let - ids = config.ids; cfg = config.users; @@ -103,7 +102,7 @@ let }; home = mkOption { - type = types.str; + type = types.path; default = "/var/empty"; description = "The user's home directory."; }; @@ -118,8 +117,10 @@ let }; shell = mkOption { - type = types.str; - default = "/run/current-system/sw/bin/nologin"; + type = types.either types.shellPackage types.path; + default = pkgs.nologin; + defaultText = "pkgs.nologin"; + example = literalExample "pkgs.bashInteractive"; description = "The path to the user's shell."; }; @@ -359,11 +360,12 @@ let spec = pkgs.writeText "users-groups.json" (builtins.toJSON { inherit (cfg) mutableUsers; - users = mapAttrsToList (n: u: + users = mapAttrsToList (_: u: { inherit (u) - name uid group description home shell createHome isSystemUser + name uid group description home createHome isSystemUser password passwordFile hashedPassword initialPassword initialHashedPassword; + shell = utils.toShellPath u.shell; }) cfg.users; groups = mapAttrsToList (n: g: { inherit (g) name gid; @@ -373,6 +375,12 @@ let }) cfg.groups; }); + systemShells = + let + shells = mapAttrsToList (_: u: u.shell) cfg.users; + in + filter types.shellPackage.check shells; + in { ###### interface @@ -477,6 +485,9 @@ in { }; }; + # Install all the user shells + environment.systemPackages = systemShells; + users.groups = { root.gid = ids.gids.root; wheel.gid = ids.gids.wheel; diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index c23d7e5b509d..7962be137875 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -91,12 +91,10 @@ ln -s /run $mountPoint/var/run rm -f $mountPoint/etc/{resolv.conf,hosts} cp -Lf /etc/resolv.conf /etc/hosts $mountPoint/etc/ -if [ -e "$SSL_CERT_FILE" ]; then - cp -Lf "$SSL_CERT_FILE" "$mountPoint/tmp/ca-cert.crt" - export SSL_CERT_FILE=/tmp/ca-cert.crt - # For Nix 1.7 - export CURL_CA_BUNDLE=/tmp/ca-cert.crt -fi +cp -Lf "@cacert@" "$mountPoint/tmp/ca-cert.crt" +export SSL_CERT_FILE=/tmp/ca-cert.crt +# For Nix 1.7 +export CURL_CA_BUNDLE=/tmp/ca-cert.crt if [ -n "$runChroot" ]; then if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index b8fd9deaf1e4..d8622b510522 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -23,6 +23,7 @@ let inherit (pkgs) perl pathsFromGraph; nix = config.nix.package.out; + cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; nixClosure = pkgs.runCommand "closure" { exportReferencesGraph = ["refs" config.nix.package.out]; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 61c49f07abbb..8da421447624 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -268,6 +268,8 @@ nzbget = 245; mosquitto = 246; toxvpn = 247; + squeezelite = 248; + turnserver = 249; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -506,6 +508,8 @@ nzbget = 245; mosquitto = 246; #toxvpn = 247; # unused + #squeezelite = 248; #unused + turnserver = 249; # 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 51c43b8c7c3b..be72c0ef29c0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -110,6 +110,7 @@ ./services/audio/liquidsoap.nix ./services/audio/mpd.nix ./services/audio/mopidy.nix + ./services/audio/squeezelite.nix ./services/backup/almir.nix ./services/backup/bacula.nix ./services/backup/crashplan.nix @@ -316,6 +317,7 @@ ./services/networking/cntlm.nix ./services/networking/connman.nix ./services/networking/consul.nix + ./services/networking/coturn.nix ./services/networking/ddclient.nix ./services/networking/dhcpcd.nix ./services/networking/dhcpd.nix @@ -413,6 +415,7 @@ ./services/networking/wicd.nix ./services/networking/wpa_supplicant.nix ./services/networking/xinetd.nix + ./services/networking/xl2tpd.nix ./services/networking/zerobin.nix ./services/networking/zerotierone.nix ./services/networking/znc.nix @@ -459,6 +462,7 @@ ./services/web-servers/lighttpd/cgit.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix + ./services/web-servers/lighttpd/inginious.nix ./services/web-servers/nginx/default.nix ./services/web-servers/phpfpm.nix ./services/web-servers/shellinabox.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index e4e264ec0036..c09bcfb70e24 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -200,7 +200,7 @@ in # Configuration for readline in bash. environment.etc."inputrc".source = ./inputrc; - users.defaultUserShell = mkDefault "/run/current-system/sw/bin/bash"; + users.defaultUserShell = mkDefault pkgs.bashInteractive; environment.pathsToLink = optionals cfg.enableCompletion [ "/etc/bash_completion.d" diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 566398d839fd..6398509357a6 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -1,6 +1,6 @@ # Configuration for the pwdutils suite of tools: passwd, useradd, etc. -{ config, lib, pkgs, ... }: +{ config, lib, utils, pkgs, ... }: with lib; @@ -43,13 +43,13 @@ in users.defaultUserShell = lib.mkOption { description = '' This option defines the default shell assigned to user - accounts. This must not be a store path, since the path is + accounts. This can be either a full system path or a shell package. + + This must not be a store path, since the path is used outside the store (in particular in /etc/passwd). - Rather, it should be the path of a symlink that points to the - actual shell in the Nix store. ''; - example = "/run/current-system/sw/bin/zsh"; - type = types.path; + example = literalExample "pkgs.zsh"; + type = types.either types.path types.shellPackage; }; }; @@ -60,7 +60,9 @@ in config = { environment.systemPackages = - lib.optional config.users.mutableUsers pkgs.shadow; + lib.optional config.users.mutableUsers pkgs.shadow ++ + lib.optional (types.shellPackage.check config.users.defaultUserShell) + config.users.defaultUserShell; environment.etc = [ { # /etc/login.defs: global configuration for pwdutils. You @@ -74,7 +76,7 @@ in '' GROUP=100 HOME=/home - SHELL=${config.users.defaultUserShell} + SHELL=${utils.toShellPath config.users.defaultUserShell} ''; target = "default/useradd"; } diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index ef6da788e619..f646602221a4 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -187,7 +187,7 @@ in script = '' cd '${cpath}' set +e - simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline} + simp_le ${escapeShellArgs cmdline} EXITCODE=$? set -e echo "$EXITCODE" > /tmp/lastExitCode diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix new file mode 100644 index 000000000000..f1a60be992d8 --- /dev/null +++ b/nixos/modules/services/audio/squeezelite.nix @@ -0,0 +1,67 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + uid = config.ids.uids.squeezelite; + cfg = config.services.squeezelite; + +in { + + ###### interface + + options = { + + services.squeezelite= { + + enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; + + dataDir = mkOption { + default = "/var/lib/squeezelite"; + type = types.str; + description = '' + The directory where Squeezelite stores its name file. + ''; + }; + + extraArguments = mkOption { + default = ""; + type = types.str; + description = '' + Additional command line arguments to pass to Squeezelite. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.squeezelite= { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "sound.target" ]; + description = "Software Squeezebox emulator"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R squeezelite ${cfg.dataDir}"; + serviceConfig = { + ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${cfg.dataDir}/player-name ${cfg.extraArguments}"; + User = "squeezelite"; + PermissionsStartOnly = true; + }; + }; + + users.extraUsers.squeezelite= { + inherit uid; + group = "nogroup"; + extraGroups = [ "audio" ]; + description = "Squeezelite user"; + home = "${cfg.dataDir}"; + }; + + }; + +} diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index af996758f41f..f065208ddfc1 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -101,7 +101,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.opendkim}/bin/opendkim ${concatMapStringsSep " " escapeShellArg args}"; + ExecStart = "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}"; User = cfg.user; Group = cfg.group; RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim"; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 0ae0516769c0..1a95e2d9367d 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -5,17 +5,31 @@ with lib; let cfg = config.services.matrix-synapse; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; + mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${if r.compress then "true" else "false"}}''; + mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${if l.tls then "true" else "false"}, x_forwarded: ${if l.x_forwarded then "true" else "false"}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; configFile = pkgs.writeText "homeserver.yaml" '' tls_certificate_path: "${cfg.tls_certificate_path}" +${optionalString (cfg.tls_private_key_path != null) '' tls_private_key_path: "${cfg.tls_private_key_path}" +''} tls_dh_params_path: "${cfg.tls_dh_params_path}" no_tls: ${if cfg.no_tls then "true" else "false"} +${optionalString (cfg.bind_port != null) '' bind_port: ${toString cfg.bind_port} +''} +${optionalString (cfg.unsecure_port != null) '' unsecure_port: ${toString cfg.unsecure_port} +''} +${optionalString (cfg.bind_host != null) '' bind_host: "${cfg.bind_host}" +''} server_name: "${cfg.server_name}" pid_file: "/var/run/matrix-synapse.pid" web_client: ${if cfg.web_client then "true" else "false"} +${optionalString (cfg.public_baseurl != null) '' +public_baseurl: "${cfg.public_baseurl}" +''} +listeners: [${concatStringsSep "," (map mkListener cfg.listeners)}] database: { name: "${cfg.database_type}", args: { @@ -24,21 +38,41 @@ database: { )} } } +event_cache_size: "${cfg.event_cache_size}" +verbose: ${cfg.verbose} log_file: "/var/log/matrix-synapse/homeserver.log" log_config: "${logConfigFile}" +rc_messages_per_second: ${cfg.rc_messages_per_second} +rc_message_burst_count: ${cfg.rc_message_burst_count} +federation_rc_window_size: ${cfg.federation_rc_window_size} +federation_rc_sleep_limit: ${cfg.federation_rc_sleep_limit} +federation_rc_sleep_delay: ${cfg.federation_rc_sleep_delay} +federation_rc_reject_limit: ${cfg.federation_rc_reject_limit} +federation_rc_concurrent: ${cfg.federation_rc_concurrent} media_store_path: "/var/lib/matrix-synapse/media" +uploads_path: "/var/lib/matrix-synapse/uploads" +max_upload_size: "${cfg.max_upload_size}" +max_image_pixels: "${cfg.max_image_pixels}" +dynamic_thumbnails: ${if cfg.dynamic_thumbnails then "true" else "false"} +url_preview_enabled: False recaptcha_private_key: "${cfg.recaptcha_private_key}" recaptcha_public_key: "${cfg.recaptcha_public_key}" enable_registration_captcha: ${if cfg.enable_registration_captcha then "true" else "false"} -turn_uris: ${if (length cfg.turn_uris) == 0 then "[]" else ("\n" + (concatStringsSep "\n" (map (s: "- " + s) cfg.turn_uris)))} +turn_uris: ${builtins.toJSON cfg.turn_uris} turn_shared_secret: "${cfg.turn_shared_secret}" enable_registration: ${if cfg.enable_registration then "true" else "false"} -${optionalString (cfg.registration_shared_secret != "") '' +${optionalString (cfg.registration_shared_secret != null) '' registration_shared_secret: "${cfg.registration_shared_secret}" ''} +recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify" +turn_user_lifetime: "${cfg.turn_user_lifetime}" +user_creation_max_duration: ${cfg.user_creation_max_duration} +bcrypt_rounds: ${cfg.bcrypt_rounds} +allow_guest_access: {if cfg.allow_guest_access then "true" else "false"} enable_metrics: ${if cfg.enable_metrics then "true" else "false"} report_stats: ${if cfg.report_stats then "true" else "false"} signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key" +key_refresh_interval: "${cfg.key_refresh_interval}" perspectives: servers: { ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' @@ -52,6 +86,8 @@ perspectives: '') cfg.servers)} } } +app_service_config_files: ${builtins.toJSON cfg.app_service_config_files} + ${cfg.extraConfig} ''; in { @@ -73,53 +109,65 @@ in { Don't bind to the https port ''; }; - tls_certificate_path = mkOption { - type = types.path; - default = "/var/lib/matrix-synapse/homeserver.tls.crt"; + bind_port = mkOption { + type = types.nullOr types.int; + default = null; + example = 8448; description = '' - PEM encoded X509 certificate for TLS + DEPRECATED: Use listeners instead. + The port to listen for HTTPS requests on. + For when matrix traffic is sent directly to synapse. ''; }; - tls_private_key_path = mkOption { - type = types.path; - default = "/var/lib/matrix-synapse/homeserver.tls.key"; + unsecure_port = mkOption { + type = types.nullOr types.int; + default = null; + example = 8008; description = '' - PEM encoded private key for TLS + DEPRECATED: Use listeners instead. + The port to listen for HTTP requests on. + For when matrix traffic passes through loadbalancer that unwraps TLS. ''; }; - tls_dh_params_path = mkOption { - type = types.path; - default = "/var/lib/matrix-synapse/homeserver.tls.dh"; + bind_host = mkOption { + type = types.nullOr types.str; + default = null; description = '' - PEM dh parameters for ephemeral keys + DEPRECATED: Use listeners instead. + Local interface to listen on. + The empty string will cause synapse to listen on all interfaces. ''; }; - bind_port = mkOption { - type = types.int; - default = 8448; + tls_certificate_path = mkOption { + type = types.str; + default = "/var/lib/matrix-synapse/homeserver.tls.crt"; description = '' - The port to listen for HTTPS requests on. - For when matrix traffic is sent directly to synapse. + PEM encoded X509 certificate for TLS. + You can replace the self-signed certificate that synapse + autogenerates on launch with your own SSL certificate + key pair + if you like. Any required intermediary certificates can be + appended after the primary certificate in hierarchical order. ''; }; - unsecure_port = mkOption { - type = types.int; - default = 8008; + tls_private_key_path = mkOption { + type = types.nullOr types.str; + default = "/var/lib/matrix-synapse/homeserver.tls.key"; + example = null; description = '' - The port to listen for HTTP requests on. - For when matrix traffic passes through loadbalancer that unwraps TLS. + PEM encoded private key for TLS. Specify null if synapse is not + speaking TLS directly. ''; }; - bind_host = mkOption { + tls_dh_params_path = mkOption { type = types.str; - default = ""; + default = "/var/lib/matrix-synapse/homeserver.tls.dh"; description = '' - Local interface to listen on. - The empty string will cause synapse to listen on all interfaces. + PEM dh parameters for ephemeral keys ''; }; server_name = mkOption { type = types.str; + example = "example.com"; description = '' The domain name of the server, with optional explicit port. This is used by remote servers to connect to this server, @@ -134,6 +182,145 @@ in { Whether to serve a web client from the HTTP/HTTPS root resource. ''; }; + public_baseurl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com:8448/"; + description = '' + The public-facing base URL for the client API (not including _matrix/...) + ''; + }; + listeners = mkOption { + type = types.listOf (types.submodule { + options = { + port = mkOption { + type = types.int; + example = 8448; + description = '' + The port to listen for HTTP(S) requests on. + ''; + }; + bind_address = mkOption { + type = types.str; + default = ""; + example = "203.0.113.42"; + description = '' + Local interface to listen on. + The empty string will cause synapse to listen on all interfaces. + ''; + }; + type = mkOption { + type = types.str; + default = "http"; + description = '' + Type of listener. + ''; + }; + tls = mkOption { + type = types.bool; + default = true; + description = '' + Whether to listen for HTTPS connections rather than HTTP. + ''; + }; + x_forwarded = mkOption { + type = types.bool; + default = false; + description = '' + Use the X-Forwarded-For (XFF) header as the client IP and not the + actual client IP. + ''; + }; + resources = mkOption { + type = types.listOf (types.submodule { + options = { + names = mkOption { + type = types.listOf types.str; + description = '' + List of resources to host on this listener. + ''; + example = ["client" "webclient" "federation"]; + }; + compress = mkOption { + type = types.bool; + description = '' + Should synapse compress HTTP responses to clients that support it? + This should be disabled if running synapse behind a load balancer + that can do automatic compression. + ''; + }; + }; + }); + description = '' + List of HTTP resources to serve on this listener. + ''; + }; + }; + }); + default = [{ + port = 8448; + bind_address = ""; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ + { names = ["client" "webclient"]; compress = true; } + { names = ["federation"]; compress = false; } + ]; + }]; + description = '' + List of ports that Synapse should listen on, their purpose and their configuration. + ''; + }; + verbose = mkOption { + type = types.str; + default = "0"; + description = "Logging verbosity level."; + }; + rc_messages_per_second = mkOption { + type = types.str; + default = "0.2"; + description = "Number of messages a client can send per second"; + }; + rc_message_burst_count = mkOption { + type = types.str; + default = "10.0"; + description = "Number of message a client can send before being throttled"; + }; + federation_rc_window_size = mkOption { + type = types.str; + default = "1000"; + description = "The federation window size in milliseconds"; + }; + federation_rc_sleep_limit = mkOption { + type = types.str; + default = "10"; + description = '' + The number of federation requests from a single server in a window + before the server will delay processing the request. + ''; + }; + federation_rc_sleep_delay = mkOption { + type = types.str; + default = "500"; + description = '' + The duration in milliseconds to delay processing events from + remote servers by if they go over the sleep limit. + ''; + }; + federation_rc_reject_limit = mkOption { + type = types.str; + default = "50"; + description = '' + The maximum number of concurrent federation requests allowed + from a single server + ''; + }; + federation_rc_concurrent = mkOption { + type = types.str; + default = "3"; + description = "The number of federation requests to concurrently process from a single server"; + }; database_type = mkOption { type = types.enum [ "sqlite3" "psycopg2" ]; default = "sqlite3"; @@ -150,6 +337,11 @@ in { Arguments to pass to the engine. ''; }; + event_cache_size = mkOption { + type = types.str; + default = "10K"; + description = "Number of events to cache in memory."; + }; recaptcha_private_key = mkOption { type = types.str; default = ""; @@ -187,6 +379,11 @@ in { The shared secret used to compute passwords for the TURN server ''; }; + turn_user_lifetime = mkOption { + type = types.str; + default = "1h"; + description = "How long generated TURN credentials last"; + }; enable_registration = mkOption { type = types.bool; default = false; @@ -195,8 +392,8 @@ in { ''; }; registration_shared_secret = mkOption { - type = types.str; - default = ""; + type = types.nullOr types.str; + default = null; description = '' If set, allows registration by anyone who also has the shared secret, even if registration is otherwise disabled. @@ -216,7 +413,7 @@ in { ''; }; servers = mkOption { - type = types.attrs; + type = types.attrsOf (types.attrsOf types.str); default = { "matrix.org" = { "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; @@ -226,6 +423,69 @@ in { The trusted servers to download signing keys from. ''; }; + max_upload_size = mkOption { + type = types.str; + default = "10M"; + description = "The largest allowed upload size in bytes"; + }; + max_image_pixels = mkOption { + type = types.str; + default = "32M"; + description = "Maximum number of pixels that will be thumbnailed"; + }; + dynamic_thumbnails = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate new thumbnails on the fly to precisely match + the resolution requested by the client. If true then whenever + a new resolution is requested by the client the server will + generate a new thumbnail. If false the server will pick a thumbnail + from a precalculated list. + ''; + }; + user_creation_max_duration = mkOption { + type = types.str; + default = "1209600000"; + description = '' + Sets the expiry for the short term user creation in + milliseconds. The default value is two weeks. + ''; + }; + bcrypt_rounds = mkOption { + type = types.str; + default = "12"; + description = '' + Set the number of bcrypt rounds used to generate password hash. + Larger numbers increase the work factor needed to generate the hash. + ''; + }; + allow_guest_access = mkOption { + type = types.bool; + default = false; + description = '' + Allows users to register as guests without a password/email/etc, and + participate in rooms hosted on this server which have been made + accessible to anonymous users. + ''; + }; + key_refresh_interval = mkOption { + type = types.str; + default = "1d"; + description = '' + How long key response published by this server is valid for. + Used to set the valid_until_ts in /key/v2 APIs. + Determines how quickly servers will query to check which keys + are still valid. + ''; + }; + app_service_config_files = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + A list of application service config file to use + ''; + }; extraConfig = mkOption { type = types.lines; default = ""; @@ -265,7 +525,7 @@ in { mkdir -p /var/lib/matrix-synapse chmod 700 /var/lib/matrix-synapse chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse - ${cfg.package}/bin/homeserver --config-path ${configFile} --generate-keys + ${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse/ --generate-keys ''; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index b7d14e90a2b7..c846ffd04551 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -152,8 +152,6 @@ let }; }; - mkShellStr = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - certtool = "${pkgs.gnutls.bin}/bin/certtool"; nixos-taskserver = pkgs.buildPythonPackage { diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix new file mode 100644 index 000000000000..14e6932d868b --- /dev/null +++ b/nixos/modules/services/networking/coturn.nix @@ -0,0 +1,327 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.coturn; + pidfile = "/run/turnserver/turnserver.pid"; + configFile = pkgs.writeText "turnserver.conf" '' +listening-port=${toString cfg.listening-port} +tls-listening-port=${toString cfg.tls-listening-port} +alt-listening-port=${toString cfg.alt-listening-port} +alt-tls-listening-port=${toString cfg.alt-tls-listening-port} +${concatStringsSep "\n" (map (x: "listening-ip=${x}") cfg.listening-ips)} +${concatStringsSep "\n" (map (x: "relay-ip=${x}") cfg.relay-ips)} +min-port=${toString cfg.min-port} +max-port=${toString cfg.max-port} +${lib.optionalString cfg.lt-cred-mech "lt-cred-mech"} +${lib.optionalString cfg.no-auth "no-auth"} +${lib.optionalString cfg.use-auth-secret "use-auth-secret"} +${lib.optionalString (cfg.static-auth-secret != null) ("static-auth-secret=${cfg.static-auth-secret}")} +realm=${cfg.realm} +${lib.optionalString cfg.no-udp "no-udp"} +${lib.optionalString cfg.no-tcp "no-tcp"} +${lib.optionalString cfg.no-tls "no-tls"} +${lib.optionalString cfg.no-dtls "no-dtls"} +${lib.optionalString cfg.no-udp-relay "no-udp-relay"} +${lib.optionalString cfg.no-tcp-relay "no-tcp-relay"} +${lib.optionalString (cfg.cert != null) "cert=${cfg.cert}"} +${lib.optionalString (cfg.pkey != null) "pkey=${cfg.pkey}"} +${lib.optionalString (cfg.dh-file != null) ("dh-file=${cfg.dh-file}")} +no-stdout-log +syslog +pidfile=${pidfile} +${lib.optionalString cfg.secure-stun "secure-stun"} +${lib.optionalString cfg.no-cli "no-cli"} +cli-ip=${cfg.cli-ip} +cli-port=${toString cfg.cli-port} +${lib.optionalString (cfg.cli-password != null) ("cli-password=${cfg.cli-password}")} +${cfg.extraConfig} +''; +in { + options = { + services.coturn = { + enable = mkEnableOption "coturn TURN server"; + listening-port = mkOption { + type = types.int; + default = 3478; + description = '' + TURN listener port for UDP and TCP. + Note: actually, TLS and DTLS sessions can connect to the + "plain" TCP and UDP port(s), too - if allowed by configuration. + ''; + }; + tls-listening-port = mkOption { + type = types.int; + default = 5349; + description = '' + TURN listener port for TLS. + Note: actually, "plain" TCP and UDP sessions can connect to the TLS and + DTLS port(s), too - if allowed by configuration. The TURN server + "automatically" recognizes the type of traffic. Actually, two listening + endpoints (the "plain" one and the "tls" one) are equivalent in terms of + functionality; but we keep both endpoints to satisfy the RFC 5766 specs. + For secure TCP connections, we currently support SSL version 3 and + TLS version 1.0, 1.1 and 1.2. + For secure UDP connections, we support DTLS version 1. + ''; + }; + alt-listening-port = mkOption { + type = types.int; + default = cfg.listening-port + 1; + defaultText = "listening-port + 1"; + description = '' + Alternative listening port for UDP and TCP listeners; + default (or zero) value means "listening port plus one". + This is needed for RFC 5780 support + (STUN extension specs, NAT behavior discovery). The TURN Server + supports RFC 5780 only if it is started with more than one + listening IP address of the same family (IPv4 or IPv6). + RFC 5780 is supported only by UDP protocol, other protocols + are listening to that endpoint only for "symmetry". + ''; + }; + alt-tls-listening-port = mkOption { + type = types.int; + default = cfg.tls-listening-port + 1; + defaultText = "tls-listening-port + 1"; + description = '' + Alternative listening port for TLS and DTLS protocols. + ''; + }; + listening-ips = mkOption { + type = types.listOf types.str; + default = []; + example = [ "203.0.113.42" "2001:DB8::42" ]; + description = '' + Listener IP addresses of relay server. + If no IP(s) specified in the config file or in the command line options, + then all IPv4 and IPv6 system IPs will be used for listening. + ''; + }; + relay-ips = mkOption { + type = types.listOf types.str; + default = []; + example = [ "203.0.113.42" "2001:DB8::42" ]; + description = '' + Relay address (the local IP address that will be used to relay the + packets to the peer). + Multiple relay addresses may be used. + The same IP(s) can be used as both listening IP(s) and relay IP(s). + + If no relay IP(s) specified, then the turnserver will apply the default + policy: it will decide itself which relay addresses to be used, and it + will always be using the client socket IP address as the relay IP address + of the TURN session (if the requested relay address family is the same + as the family of the client socket). + ''; + }; + min-port = mkOption { + type = types.int; + default = 49152; + description = '' + Lower bound of UDP relay endpoints + ''; + }; + max-port = mkOption { + type = types.int; + default = 65535; + description = '' + Upper bound of UDP relay endpoints + ''; + }; + lt-cred-mech = mkOption { + type = types.bool; + default = false; + description = '' + Use long-term credential mechanism. + ''; + }; + no-auth = mkOption { + type = types.bool; + default = false; + description = '' + This option is opposite to lt-cred-mech. + (TURN Server with no-auth option allows anonymous access). + If neither option is defined, and no users are defined, + then no-auth is default. If at least one user is defined, + in this file or in command line or in usersdb file, then + lt-cred-mech is default. + ''; + }; + use-auth-secret = mkOption { + type = types.bool; + default = false; + description = '' + TURN REST API flag. + Flag that sets a special authorization option that is based upon authentication secret. + This feature can be used with the long-term authentication mechanism, only. + This feature purpose is to support "TURN Server REST API", see + "TURN REST API" link in the project's page + https://github.com/coturn/coturn/ + + This option is used with timestamp: + + usercombo -> "timestamp:userid" + turn user -> usercombo + turn password -> base64(hmac(secret key, usercombo)) + + This allows TURN credentials to be accounted for a specific user id. + If you don't have a suitable id, the timestamp alone can be used. + This option is just turning on secret-based authentication. + The actual value of the secret is defined either by option static-auth-secret, + or can be found in the turn_secret table in the database. + ''; + }; + static-auth-secret = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + 'Static' authentication secret value (a string) for TURN REST API only. + If not set, then the turn server + will try to use the 'dynamic' value in turn_secret table + in user database (if present). The database-stored value can be changed on-the-fly + by a separate program, so this is why that other mode is 'dynamic'. + ''; + }; + realm = mkOption { + type = types.str; + default = config.networking.hostName; + example = "example.com"; + description = '' + The default realm to be used for the users when no explicit + origin/realm relationship was found in the database, or if the TURN + server is not using any database (just the commands-line settings + and the userdb file). Must be used with long-term credentials + mechanism or with TURN REST API. + ''; + }; + cert = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/fullchain.pem"; + description = '' + Certificate file in PEM format. + ''; + }; + pkey = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/key.pem"; + description = '' + Private key file in PEM format. + ''; + }; + dh-file = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Use custom DH TLS key, stored in PEM format in the file. + ''; + }; + secure-stun = mkOption { + type = types.bool; + default = false; + description = '' + Require authentication of the STUN Binding request. + By default, the clients are allowed anonymous access to the STUN Binding functionality. + ''; + }; + no-cli = mkOption { + type = types.bool; + default = false; + description = '' + Turn OFF the CLI support. + ''; + }; + cli-ip = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Local system IP address to be used for CLI server endpoint. + ''; + }; + cli-port = mkOption { + type = types.int; + default = 5766; + description = '' + CLI server port. + ''; + }; + cli-password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + CLI access password. + For the security reasons, it is recommended to use the encrypted + for of the password (see the -P command in the turnadmin utility). + ''; + }; + no-udp = mkOption { + type = types.bool; + default = false; + description = "Disable UDP client listener"; + }; + no-tcp = mkOption { + type = types.bool; + default = false; + description = "Disable TCP client listener"; + }; + no-tls = mkOption { + type = types.bool; + default = false; + description = "Disable TLS client listener"; + }; + no-dtls = mkOption { + type = types.bool; + default = false; + description = "Disable DTLS client listener"; + }; + no-udp-relay = mkOption { + type = types.bool; + default = false; + description = "Disable UDP relay endpoints"; + }; + no-tcp-relay = mkOption { + type = types.bool; + default = false; + description = "Disable TCP relay endpoints"; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional configuration options"; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers = [ + { name = "turnserver"; + uid = config.ids.uids.turnserver; + description = "coturn TURN server user"; + } ]; + users.extraGroups = [ + { name = "turnserver"; + gid = config.ids.gids.turnserver; + members = [ "turnserver" ]; + } ]; + + systemd.services.coturn = { + description = "coturn TURN server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + unitConfig = { + Documentation = "man:coturn(1) man:turnadmin(1) man:turnserver(1)"; + }; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.coturn}/bin/turnserver -c ${configFile}"; + RuntimeDirectory = "turnserver"; + User = "turnserver"; + Group = "turnserver"; + Restart = "on-abort"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 9868f303ab2b..8ecc16257db8 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -13,7 +13,7 @@ let ectl = ''${cfg.package}/bin/ejabberdctl ${if cfg.configFile == null then "" else "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"''; - dumps = lib.concatMapStringsSep " " lib.escapeShellArg cfg.loadDumps; + dumps = lib.escapeShellArgs cfg.loadDumps; in { diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index efed604d3dda..513e6174752c 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -16,7 +16,7 @@ with lib; clientIpRange = mkOption { type = types.string; description = "The range from which client IPs are drawn."; - default = "10.124.142.2-11"; + default = "10.124.124.2-11"; }; maxClients = mkOption { diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix new file mode 100644 index 000000000000..5e006c13f0d0 --- /dev/null +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -0,0 +1,143 @@ +{ config, stdenv, pkgs, lib, ... }: + +with lib; + +{ + options = { + services.xl2tpd = { + enable = mkEnableOption "Whether xl2tpd should be run on startup."; + + serverIp = mkOption { + type = types.string; + description = "The server-side IP address."; + default = "10.125.125.1"; + }; + + clientIpRange = mkOption { + type = types.string; + description = "The range from which client IPs are drawn."; + default = "10.125.125.2-11"; + }; + + extraXl2tpOptions = mkOption { + type = types.lines; + description = "Adds extra lines to the xl2tpd configuration file."; + default = ""; + }; + + extraPppdOptions = mkOption { + type = types.lines; + description = "Adds extra lines to the pppd options file."; + default = ""; + example = '' + ms-dns 8.8.8.8 + ms-dns 8.8.4.4 + ''; + }; + }; + }; + + config = mkIf config.services.xl2tpd.enable { + systemd.services.xl2tpd = let + cfg = config.services.xl2tpd; + + # Config files from https://help.ubuntu.com/community/L2TPServer + xl2tpd-conf = pkgs.writeText "xl2tpd.conf" '' + [global] + ipsec saref = no + + [lns default] + local ip = ${cfg.serverIp} + ip range = ${cfg.clientIpRange} + pppoptfile = ${pppd-options} + length bit = yes + + ; Extra + ${cfg.extraXl2tpOptions} + ''; + + pppd-options = pkgs.writeText "ppp-options-xl2tpd.conf" '' + refuse-pap + refuse-chap + refuse-mschap + require-mschap-v2 + # require-mppe-128 + asyncmap 0 + auth + crtscts + idle 1800 + mtu 1200 + mru 1200 + lock + hide-password + local + # debug + name xl2tpd + # proxyarp + lcp-echo-interval 30 + lcp-echo-failure 4 + + # Extra: + ${cfg.extraPppdOptions} + ''; + + xl2tpd-ppp-wrapped = pkgs.stdenv.mkDerivation { + name = "xl2tpd-ppp-wrapped"; + phases = [ "installPhase" ]; + buildInputs = with pkgs; [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + + makeWrapper ${pkgs.ppp}/sbin/pppd $out/bin/pppd \ + --set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/etc/ppp=/etc/xl2tpd/ppp" + + makeWrapper ${pkgs.xl2tpd}/bin/xl2tpd $out/bin/xl2tpd \ + --set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "${pkgs.ppp}/sbin/pppd=$out/bin/pppd" + ''; + }; + in { + description = "xl2tpd server"; + + requires = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + mkdir -p -m 700 /etc/xl2tpd + + pushd /etc/xl2tpd > /dev/null + + mkdir -p -m 700 ppp + + [ -f ppp/chap-secrets ] || cat > ppp/chap-secrets << EOF + # Secrets for authentication using CHAP + # client server secret IP addresses + #username xl2tpd password * + EOF + + chown root.root ppp/chap-secrets + chmod 600 ppp/chap-secrets + + # The documentation says this file should be present but doesn't explain why and things work even if not there: + [ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets + chown root.root l2tp-secrets + chmod 600 l2tp-secrets + + popd > /dev/null + + mkdir -p /run/xl2tpd + chown root.root /run/xl2tpd + chmod 700 /run/xl2tpd + ''; + + serviceConfig = { + ExecStart = "${xl2tpd-ppp-wrapped}/bin/xl2tpd -D -c ${xl2tpd-conf} -s /etc/xl2tpd/l2tp-secrets -p /run/xl2tpd/pid -C /run/xl2tpd/control"; + KillMode = "process"; + Restart = "on-success"; + Type = "simple"; + PIDFile = "/run/xl2tpd/pid"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix new file mode 100644 index 000000000000..43deccb6aef8 --- /dev/null +++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix @@ -0,0 +1,262 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.services.lighttpd.inginious; + inginious = pkgs.inginious; + execName = "inginious-${if cfg.useLTI then "lti" else "webapp"}"; + + inginiousConfigFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "inginious.yaml" '' + # Backend; can be: + # - "local" (run containers on the same machine) + # - "remote" (connect to distant docker daemon and auto start agents) (choose this if you use boot2docker) + # - "remote_manual" (connect to distant and manually installed agents) + backend: "${cfg.backendType}" + + ## TODO (maybe): Add an option for the "remote" backend in this NixOS module. + # List of remote docker daemon to which the backend will try + # to connect (backend: remote only) + #docker_daemons: + # - # Host of the docker daemon *from the webapp* + # remote_host: "some.remote.server" + # # Port of the distant docker daemon *from the webapp* + # remote_docker_port: "2375" + # # A mandatory port used by the backend and the agent that will be automatically started. + # # Needs to be available on the remote host, and to be open in the firewall. + # remote_agent_port: "63456" + # # Does the remote docker requires tls? Defaults to false. + # # Parameter can be set to true or path to the certificates + # #use_tls: false + # # Link to the docker daemon *from the host that runs the docker daemon*. Defaults to: + # #local_location: "unix:///var/run/docker.sock" + # # Path to the cgroups "mount" *from the host that runs the docker daemon*. Defaults to: + # #cgroups_location: "/sys/fs/cgroup" + # # Name that will be used to reference the agent + # #"agent_name": "inginious-agent" + + # List of remote agents to which the backend will try + # to connect (backend: remote_manual only) + # Example: + #agents: + # - host: "192.168.59.103" + # port: 5001 + agents: + ${lib.concatMapStrings (agent: + " - host: \"${agent.host}\"\n" + + " port: ${agent.port}\n" + ) cfg.remoteAgents} + + # Location of the task directory + tasks_directory: "${cfg.tasksDirectory}" + + # Super admins: list of user names that can do everything in the backend + superadmins: + ${lib.concatMapStrings (x: " - \"${x}\"\n") cfg.superadmins} + + # Aliases for containers + # Only containers listed here can be used by tasks + containers: + ${lib.concatStrings (lib.mapAttrsToList (name: fullname: + " ${name}: \"${fullname}\"\n" + ) cfg.containers)} + + # Use single minified javascript file (production) or multiple files (dev) ? + use_minified_js: true + + ## TODO (maybe): Add NixOS options for these parameters. + + # MongoDB options + #mongo_opt: + # host: localhost + # database: INGInious + + # Disable INGInious? + #maintenance: false + + #smtp: + # sendername: 'INGInious <no-reply@inginious.org>' + # host: 'smtp.gmail.com' + # port: 587 + # username: 'configme@gmail.com' + # password: 'secret' + # starttls: True + + ## NixOS extra config + + ${cfg.extraConfig} + ''; +in +{ + options.services.lighttpd.inginious = { + enable = mkEnableOption "INGInious, an automated code testing and grading system."; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + example = literalExample ''pkgs.writeText "configuration.yaml" "# custom config options ...";''; + description = ''The path to an INGInious configuration file.''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + # Load the dummy auth plugin. + plugins: + - plugin_module: inginious.frontend.webapp.plugins.auth.demo_auth + users: + # register the user "test" with the password "someverycomplexpassword" + test: someverycomplexpassword + ''; + description = ''Extra option in YaML format, to be appended to the config file.''; + }; + + tasksDirectory = mkOption { + type = types.path; + default = "${inginious}/lib/python2.7/site-packages/inginious/tasks"; + example = "/var/lib/INGInious/tasks"; + description = '' + Path to the tasks folder. + Defaults to the provided test tasks folder (readonly). + ''; + }; + + useLTI = mkOption { + type = types.bool; + default = false; + description = ''Whether to start the LTI frontend in place of the webapp.''; + }; + + superadmins = mkOption { + type = types.uniq (types.listOf types.str); + default = [ "admin" ]; + example = [ "john" "pepe" "emilia" ]; + description = ''List of user logins allowed to administrate the whole server.''; + }; + + containers = mkOption { + type = types.attrsOf types.str; + default = { + default = "ingi/inginious-c-default"; + }; + example = { + default = "ingi/inginious-c-default"; + sekexe = "ingi/inginious-c-sekexe"; + java = "ingi/inginious-c-java"; + oz = "ingi/inginious-c-oz"; + pythia1compat = "ingi/inginious-c-pythia1compat"; + }; + description = '' + An attrset describing the required containers + These containers will be available in INGInious using their short name (key) + and will be automatically downloaded before INGInious starts. + ''; + }; + + hostPattern = mkOption { + type = types.str; + default = "^inginious."; + example = "^inginious.mydomain.xyz$"; + description = '' + The domain that serves INGInious. + INGInious uses absolute paths which makes it difficult to relocate in its own subdir. + The default configuration will serve INGInious when the server is accessed with a hostname starting with "inginious.". + If left blank, INGInious will take the precedence over all the other lighttpd sites, which is probably not what you want. + ''; + }; + + backendType = mkOption { + type = types.enum [ "local" "remote_manual" ]; # TODO: support backend "remote" + default = "local"; + description = '' + Select how INGINious accesses to grading containers. + The default "local" option ensures that Docker is started and provisioned. + Fore more information, see http://inginious.readthedocs.io/en/latest/install_doc/config_reference.html + Not all backends are supported. Use services.inginious.configFile for full flexibility. + ''; + }; + + remoteAgents = mkOption { + type = types.listOf (types.attrsOf types.str); + default = []; + example = [ { host = "192.0.2.25"; port = "1345"; } ]; + description = ''A list of remote agents, used only when services.inginious.backendType is "remote_manual".''; + }; + }; + + config = mkIf cfg.enable ( + mkMerge [ + # For a local install, we need docker. + (mkIf (cfg.backendType == "local") { + virtualisation.docker = { + enable = true; + # We need docker to listen on port 2375. + extraOptions = "-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"; + storageDriver = mkDefault "overlay"; + socketActivation = false; + }; + + users.extraUsers."lighttpd".extraGroups = [ "docker" ]; + + # Ensure that docker has pulled the required images. + systemd.services.inginious-prefetch = { + script = let + images = lib.unique ( + [ "centos" "ingi/inginious-agent" ] + ++ lib.mapAttrsToList (_: image: image) cfg.containers + ); + in lib.concatMapStrings (image: '' + ${pkgs.docker}/bin/docker pull ${image} + '') images; + + serviceConfig.Type = "oneshot"; + wants = [ "docker.service" ]; + after = [ "docker.service" ]; + wantedBy = [ "lighttpd.service" ]; + before = [ "lighttpd.service" ]; + }; + }) + + # Common + { + # To access inginous tools (like inginious-test-task) + environment.systemPackages = [ inginious ]; + + services.mongodb.enable = true; + + services.lighttpd.enable = true; + services.lighttpd.enableModules = [ "mod_access" "mod_alias" "mod_fastcgi" "mod_redirect" "mod_rewrite" ]; + services.lighttpd.extraConfig = '' + $HTTP["host"] =~ "${cfg.hostPattern}" { + fastcgi.server = ( "/${execName}" => + (( + "socket" => "/run/lighttpd/inginious-fastcgi.socket", + "bin-path" => "${inginious}/bin/${execName} --config=${inginiousConfigFile}", + "max-procs" => 1, + "bin-environment" => ( "REAL_SCRIPT_NAME" => "" ), + "check-local" => "disable" + )) + ) + url.rewrite-once = ( + "^/.well-known/.*" => "$0", + "^/static/.*" => "$0", + "^/.*$" => "/${execName}$0", + "^/favicon.ico$" => "/static/common/favicon.ico", + ) + alias.url += ( + "/static/webapp/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/webapp/static/", + "/static/common/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/common/static/" + ) + } + ''; + + systemd.services.lighttpd.preStart = '' + mkdir -p /run/lighttpd + chown lighttpd.lighttpd /run/lighttpd + ''; + + systemd.services.lighttpd.wants = [ "mongodb.service" "docker.service" ]; + systemd.services.lighttpd.after = [ "mongodb.service" "docker.service" ]; + } + ]); +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 700faad0c695..68579a1af836 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -119,6 +119,7 @@ in { services.telepathy.enable = mkDefault true; networking.networkmanager.enable = mkDefault true; services.upower.enable = config.powerManagement.enable; + services.dbus.packages = mkIf config.services.printing.enable [ pkgs.system-config-printer ]; hardware.bluetooth.enable = mkDefault true; fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 4c4e3d967988..634d2a39576a 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -33,6 +33,14 @@ in default = false; description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon)."; }; + + extraSessionCommands = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands executed just before XFCE is started. + ''; + }; }; }; @@ -45,6 +53,8 @@ in bgSupport = true; start = '' + ${cfg.extraSessionCommands} + # Set GTK_PATH so that GTK+ can find the theme engines. export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index aea0a8986786..cfe9439b688c 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -15,12 +15,21 @@ let If left at the default value, $HOME/.i3/config will be used. ''; }; + extraSessionCommands = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands executed just before i3 is started. + ''; + }; }; i3config = name: pkg: cfg: { services.xserver.windowManager.session = [{ inherit name; start = '' + ${cfg.extraSessionCommands} + ${pkg}/bin/i3 ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\"" } & diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 076bbca850d9..3d8f29c80f95 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -669,6 +669,7 @@ in "systemd/logind.conf".text = '' [Login] + KillUserProcesses=no ${config.services.logind.extraConfig} ''; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index dd351306cb63..cf8232c36154 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -111,15 +111,17 @@ in fileSystems = mkOption { default = {}; - example = { - "/".device = "/dev/hda1"; - "/data" = { - device = "/dev/hda2"; - fsType = "ext3"; - options = [ "data=journal" ]; - }; - "/bigdisk".label = "bigdisk"; - }; + example = literalExample '' + { + "/".device = "/dev/hda1"; + "/data" = { + device = "/dev/hda2"; + fsType = "ext3"; + options = [ "data=journal" ]; + }; + "/bigdisk".label = "bigdisk"; + } + ''; type = types.loaOf types.optionSet; options = [ fileSystemOpts ]; description = '' diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 845f14352f3d..9d76b890872a 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -47,7 +47,7 @@ in # TODO(wkennington): Add lvm2 and thin-provisioning-tools path = with pkgs; [ acl rsync gnutar xz btrfs-progs ]; - serviceConfig.ExecStart = "@${pkgs.lxd}/bin/lxd lxd --syslog --group lxd"; + serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; serviceConfig.Type = "simple"; serviceConfig.KillMode = "process"; # when stopping, leave the containers alone }; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 7e0c245d3579..5286362b50f5 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; - description = "command-line utility to get CDDB discid information from a CD-ROM disc"; + description = "Command-line utility to get CDDB discid information from a CD-ROM disc"; longDescription = '' cd-discid is a backend utility to get CDDB discid information diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 4aba1a530757..826ba186cef0 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -93,13 +93,13 @@ in stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; - rev = "0306cc74c5073a85cf8619c61da5b94a3f863eaa"; - sha256 = "18w9mznb843nzkrcqvshfha51mlpdl92zlvb5wfc5dpgrbf37728"; + rev = "v${version}"; + sha256 = "0xd96py21bl869qlv1353zw7xsgq6v5s8szr0ldr63zj5fgc2ps5"; }; patches = [ ./option-debugging.patch ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index afca63a2a8a2..664d80490f2a 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; meta = { - description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; + description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = http://www.csounds.com/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 09bb75b2e411..87f79583c3b0 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }: stdenv.mkDerivation rec { - name = "pianobar-2015.11.22"; + name = "pianobar-2016.06.02"; src = fetchurl { url = "http://6xq.net/projects/pianobar/${name}.tar.bz2"; - sha256 = "0arjvs31d108l1mn2k2hxbpg3mxs47vqzxm0lzdpfcjvypkckyr3"; + sha256 = "0n9544bfsdp04xqcjm4nhfvp357dx0c3gpys0rjkq09nzv8b1vy6"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index b851517b8724..692938884b63 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; - description = "graphical frontend to LinuxSampler"; + description = "Graphical frontend to LinuxSampler"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index b746cccd113d..37815412fc35 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libpng libsamplerate libsndfile zlib ]; meta = with stdenv.lib; { - description = "multi-effects processor emulating a guitar effects pedalboard"; + description = "Multi-effects processor emulating a guitar effects pedalboard"; homepage = http://rakarrack.sourceforge.net; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 7b4c1143fb4c..91e8f1be6ece 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "modern tracker-based DAW"; + description = "Modern tracker-based DAW"; homepage = http://www.renoise.com/; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 7976a7bf6789..d1de6f1abd49 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - description = "minimal loop based midi sequencer"; + description = "Minimal loop based midi sequencer"; homepage = "http://www.filter24.org/seq24"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index 12ef79d746ec..8645251b384d 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac ]; meta = { - description = "multi-purpose WAVE data processing and reporting utility"; + description = "Multi-purpose WAVE data processing and reporting utility"; homepage = http://www.etree.org/shnutils/shntool/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index d6db4403d772..706848b992af 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.28.89.gf959d4ce-37"; + version = "1.0.32.94.g8a839395-32"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "06v6fmjn0zi1riqhbmwkrq4m1q1vs95p348i8c12hqvsrp0g2qy5"; + sha256 = "1341v1j9xwj8pwmhl3q7znj3c27x1v4l61khczrgxbrfb56kina1"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix new file mode 100644 index 000000000000..20f6271c7adf --- /dev/null +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }: + +stdenv.mkDerivation { + name = "squeezelite-git-2016-05-27"; + + src = fetchFromGitHub { + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "e37ed17fed9e11a7346cbe9f1e1deeccc051f42e"; + sha256 = "15ihx2dbp4kr6k6r50g9q5npqad5zyv8nqf5cr37bhg964syvbdm"; + }; + + buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ]; + + installPhase = '' + mkdir -p $out/bin + cp squeezelite $out/bin + ''; + + meta = with stdenv.lib; { + description = "Lightweight headless squeezebox client emulator"; + homepage = https://github.com/ralph-irving/squeezelite; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index c4ed20defd68..96da8ad8c557 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "classic-analog (VCOs-VCF-VCA) style software synthesizer"; + description = "Classic-analog (VCOs-VCF-VCA) style software synthesizer"; longDescription = '' Xsynth-DSSI is a classic-analog (VCOs-VCF-VCA) style software synthesizer which operates as a plugin for the DSSI Soft Synth diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index ab7eb10798d7..0ec399407758 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ]; meta = with stdenv.lib; { - description = "high quality software synthesizer based on ZynAddSubFX"; + description = "High quality software synthesizer based on ZynAddSubFX"; longDescription = '' Yoshimi delivers the same synthesizer capabilities as ZynAddSubFX along with very good Jack and Alsa midi/audio diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix index a47f04472ec7..c324e395fa9e 100644 --- a/pkgs/applications/editors/emacs-modes/logito/default.nix +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "tiny logging framework for Emacs"; + description = "Tiny logging framework for Emacs"; homepage = https://github.com/sigma/logito; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 2e657b69b501..d6e627c71969 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -28303,12 +28303,12 @@ helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20160603.611"; + version = "20160614.832"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "3db706c9147a54a618bdb6e5de827d931d8ae9a6"; - sha256 = "0b9nd668p5lya214hyc0lv9pbmxjfy4ls1yhljr6j71qsfl0mjva"; + rev = "f41141a93aa6c03ffb9fdb294b3caa19803b1d72"; + sha256 = "0z7vhidjb3fzy28kjg6v73sxd7fgdhxcmqx5qypv3czdjcl5911x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-projectile"; diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix index 77bfedf62748..a5633cdfabaa 100644 --- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix +++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "an emacs library to access metaweblog based weblogs"; + description = "An emacs library to access metaweblog based weblogs"; homepage = https://github.com/punchagan/metaweblog; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index 0d2fcf097863..f5aeb35d1840 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (require 'session) (add-hook 'after-init-hook 'session-initialize) */ - description = "small session management for emacs"; + description = "Small session management for emacs"; homepage = http://emacs-session.sourceforge.net/; license = "GPL"; }; diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 556b333ce757..170a12d6d695 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip, jdk }: +, coreutils, gnugrep, which, git, python, unzip }: -{ name, product, version, build, src, wmClass, meta } @ attrs: +{ name, product, version, build, src, wmClass, jdk, meta } @ attrs: with stdenv.lib; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 5abbcb37042f..6ef4edb53620 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -12,7 +12,7 @@ let buildAndroidStudio = { name, version, build, src, license, description, wmClass }: let drv = (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "Studio"; meta = with stdenv.lib; { homepage = https://developer.android.com/sdk/installing/studio.html; @@ -31,13 +31,14 @@ let buildInputs = x.buildInputs ++ [ makeWrapper ]; installPhase = x.installPhase + '' wrapProgram "$out/bin/android-studio" \ - --set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/" + --set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/" \ + --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" # Gradle installs libnative-platform.so in ~/.gradle, that requires libstdc++.so.6 ''; }); buildClion = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/clion/"; @@ -53,7 +54,7 @@ let buildIdea = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/idea/"; @@ -70,7 +71,7 @@ let buildRubyMine = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/ruby/"; @@ -83,7 +84,7 @@ let buildPhpStorm = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/phpstorm/"; @@ -100,7 +101,7 @@ let buildWebStorm = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/webstorm/"; @@ -117,7 +118,7 @@ let buildPycharm = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/pycharm/"; @@ -146,16 +147,16 @@ in { - android-studio = let buildNumber = "143.2821654"; in buildAndroidStudio rec { + android-studio = let buildNumber = "143.2915827"; in buildAndroidStudio rec { name = "android-studio-${version}"; - version = "2.1.1.0"; + version = "2.1.2.0"; build = "AI-${buildNumber}"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${buildNumber}-linux.zip"; - sha256 = "1zxxzyhny7j4vzlydrhwz3g8l8zcml84mhkcf5ckx8xr50j3m101"; + sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams"; }; wmClass = "jetbrains-studio"; }; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 9b87f13d623d..108b7cceb4e2 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "the next generation code editor"; + description = "The next generation code editor"; homepage = http://www.lighttable.com/; license = licenses.gpl3; maintainers = [ maintainers.matejc ]; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 4e8324894abf..169e078edbd6 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "the nice editor"; + description = "The nice editor"; homepage = https://github.com/vigna/ne; longDescription = '' ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index f4d9d4ccdd58..eb6e1baccb59 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "texmaker"; - version = "4.4.1"; + version = "4.5"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; - sha256 = "1d5lb4sibdhvzgfr0zi48j92b4acvvvdy2biqi3jzjdnzy9r94w0"; + sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c"; }; buildInputs = [ qt4 poppler_qt4 zlib ]; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index a8f12bd4ece0..f412a9bada22 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,69 +1,158 @@ -{stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip}: +{ stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip }: let - buildInputs = [ - gtk glib pkgconfig unzip ncurses zip - ]; + # Textadept requires a whole bunch of external dependencies. + # The build system expects to be able to download them with wget. + # This expression gets Nix to fetch them instead. + + cached_url = url: sha256: fetchurl { inherit sha256 url; }; - get_url = url: sha256: '' - cp ${(cached_url url sha256)} $(basename ${(cached_url url sha256)} | sed -e 's@^[0-9a-z]\+-@@') - touch $(basename ${(cached_url url sha256)} | sed -e 's@^[0-9a-z]\+-@@') + + get_url = url: sha256: let + store_path = cached_url url sha256; + in '' + local_path=$(basename ${store_path} | sed -e 's@^[0-9a-z]\+-@@') + + # Copy the file from the Nix store and remove the hash part. + cp ${store_path} $local_path + + # Update its access and modified times. + touch $local_path ''; + cached_url_zip = url: sha256: fetchzip { inherit sha256 url; }; - get_url_zip = url: sha256: let zipdir = (cached_url_zip url sha256); in '' - ( d=$PWD; cd $TMPDIR; name=$(basename ${zipdir} .zip | sed -e 's/^[a-z0-9]*-//'); - cp -r ${zipdir} $name; chmod u+rwX -R $name; zip -r $d/$name.zip $name ) - touch $name + + get_url_zip = url: sha256: let + store_path = cached_url_zip url sha256; + in '' + ( + build_dir=$PWD + cd $TMPDIR + + local_path=$(basename ${store_path} .zip | sed -e 's/^[a-z0-9]*-//') + + cp -r ${store_path} $local_path + chmod u+rwX -R $local_path + zip -r $build_dir/$local_path.zip $local_path + touch $local_path + ) ''; + + + # These lists are taken from the Makefile. + scintilla_tgz = "scintilla365.tgz"; + scinterm_zip = "scinterm_1.8.zip"; + scintillua_zip = "scintillua_3.6.5-1.zip"; + lua_tgz = "lua-5.3.2.tar.gz"; + lpeg_tgz = "lpeg-1.0.0.tar.gz"; + lfs_zip = "v_1_6_3.zip"; + luautf8_zip = "0.1.1.zip"; + lspawn_zip = "lspawn_1.5.zip"; + luajit_tgz = "LuaJIT-2.0.3.tar.gz"; + libluajit_tgz = "libluajit_2.0.3.x86_64.tgz"; + gtdialog_zip = "gtdialog_1.2.zip"; + cdk_tgz = "cdk-5.0-20150928.tgz"; + termkey_tgz = "libtermkey-0.17.tar.gz"; + bombay_zip = "bombay.zip"; + + scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; + scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip; + gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip; + lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip; + + scintilla_url = "http://prdownloads.sourceforge.net/scintilla/" + scintilla_tgz; + lua_url = "http://www.lua.org/ftp/" + lua_tgz; + lpeg_url = "http://www.inf.puc-rio.br/~roberto/lpeg/" + lpeg_tgz; + lfs_url = "https://github.com/keplerproject/luafilesystem/archive/" + lfs_zip; + luautf8_url = "https://github.com/starwing/luautf8/archive/" + luautf8_zip; + luajit_url = "http://luajit.org/download/" + luajit_tgz; + libluajit_url = "http://foicica.com/textadept/download/" + libluajit_tgz; + cdk_url = "http://invisible-mirror.net/archives/cdk/" + cdk_tgz; + bombay_url = "http://foicica.com/hg/bombay/archive/tip.zip"; + termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz; + + + get_scintilla = get_url scintilla_url "1s5zbkn5f3vs8gbnjlkfzw4b137y12m3c89lyc4pmvqvrvxgyalj"; + get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi"; + get_scintillua = get_url scintillua_url "0s4q7a9mgvxh0msi18llkczhcgafaiizw9qm1p9w18r2a7wjq9wc"; + get_lua = get_url lua_url "13x6knpv5xsli0n2bib7g1nrga2iacy7qfy63i798dm94fxwfh67"; + get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; + get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; + get_luautf8_zip = get_url_zip luautf8_url "1dgmxdk88njpic4d4sn2wzlni4b6sfqcsmh2hrraxivpqf9ps7f7"; + get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi"; + get_luajit = get_url luajit_url "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"; + get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy"; + get_gtdialog = get_url gtdialog_url "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; + get_cdk = get_url cdk_url "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; + get_bombay = get_url_zip bombay_url "05fnh1imxdb4sb076fzqywqszp31whdbkzmpkqxc8q2r1m5vj3hg" + + "mv tip.zip bombay.zip\n"; + get_termkey = get_url termkey_url "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"; + + + get_deps = get_scintilla + + get_scinterm + + get_scintillua + + get_lua + + get_lpeg + + get_lfs + + get_luautf8_zip + + get_lspawn + + get_luajit + + get_libluajit + + get_gtdialog + + get_cdk + + get_bombay + + get_termkey; in -stdenv.mkDerivation rec{ - version = "8.2"; - scintillua_version = "3.6.0-1"; +stdenv.mkDerivation rec { + version = "8.7"; name = "textadept-${version}"; - inherit buildInputs; + + buildInputs = [ + gtk glib pkgconfig unzip ncurses zip + ]; + src = fetchhg { url = http://foicica.com/hg/textadept; rev = "textadept_${version}"; - sha256 = "1vb6a15fyk7ixcv5fy0g400lxbj6dp5ndbmyx53d28idbdkz9ap1"; + sha256 = "1gi73wk11w3rbkxqqdp8z9g83qiyhx6gxry221vxjxpqsl9pvhlf"; }; + preConfigure = '' cd src + + # Make a dummy wget. mkdir wget echo '#! ${stdenv.shell}' > wget/wget chmod a+x wget/wget export PATH="$PATH:$PWD/wget" - ${get_url http://prdownloads.sourceforge.net/scintilla/scintilla360.tgz "07ib4w3n9kqfaia2yngj2q7ab5r55zn0hccfzph6vas9hl8vk9zf"} - ${get_url http://foicica.com/scinterm/download/scinterm_1.6.zip "0ixwj9il6ri1xl4nvb6f108z4qhrahysza6frbbaqmbdz21hnmcl"} - ${get_url http://foicica.com/scintillua/download/scintillua_3.6.0-1.zip "0zk1ciyyi0d3dz4dzzq5fa74505pvqf0w5yszl7l29c1l4hkk561"} - ${get_url http://www.lua.org/ftp/lua-5.3.1.tar.gz "05xczy5ws6d7ic3f9h9djwg983bpa4pmds3698264bncssm6f9q7"} - ${get_url http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-0.12.2.tar.gz "01002avq90yc8rgxa5z9a1768jm054iid3pnfpywdcfij45jgbba"} - ${get_url_zip http://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"} - ${get_url http://foicica.com/lspawn/download/lspawn_1.2.zip "1fhfi274bxlsdvva5q5j0wv8hx68cmf3vnv9spllzad4jdvz82xv"} - ${get_url http://luajit.org/download/LuaJIT-2.0.3.tar.gz "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"} - ${get_url http://foicica.com/gtdialog/download/gtdialog_1.2.zip "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"} - ${get_url ftp://invisible-island.net/cdk/cdk-5.0-20150928.tgz "028da75d5f777a1c4184f88e34918bd273bd83bbe3c959bc11710c4f0ea2e448"} - mv cdk-*.tgz cdk.tar.gz - ${get_url_zip http://foicica.com/hg/bombay/archive/d704272c3629.zip "19dg3ky87rfy0a3319vmv18hgn9spplpznvlqnk3djh239ddpplw"} - mv d704*.zip bombay.zip - ${get_url http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.17.tar.gz "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"} + + ${get_deps} + + # Let the build system do whatever setup it needs to do with these files. make deps ''; + postBuild = '' make curses ''; + postInstall = '' make curses install PREFIX=$out MAKECMDGOALS=curses ''; - makeFlags = ["PREFIX=$(out)"]; - meta = { - inherit version; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { description = "An extensible text editor based on Scintilla with Lua scripting"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = "http://foicica.com/textadept"; + homepage = http://foicica.com/textadept; + license = licenses.mit; + maintainers = with maintainers; [ raskin mirrexagon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 4084018d1d53..74abc06bc4e3 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -174,7 +174,7 @@ rec { installPhase = "installPlugins gmic_gimp"; meta = { - description = "script language for image processing which comes with its open-source interpreter"; + description = "Script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.eu/gimp.shtml; license = stdenv.lib.licenses.cecill20; /* diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index d01b1a14018d..e951f3a7a937 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "viewnior-${version}"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "xsisqox"; repo = "Viewnior"; rev = name; - sha256 = "0y352hkkwmzb13a87vqgj1dpdn81qk94acby1a93xkqr1qs626lw"; + sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index f614eb0a1b5a..56d46088669d 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xournal.sourceforge.net/; - description = "note-taking application (supposes stylus)"; + description = "Note-taking application (supposes stylus)"; maintainers = [ stdenv.lib.maintainers.guibert ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index d55e22c5a3b8..9a13da677456 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "a generic, highly customizable, and efficient menu for the X Window System"; + description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = http://tools.suckless.org/dmenu; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 4cec2ca41b67..88475dd761e1 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.fetchmail.info/"; - description = "a full-featured remote-mail retrieval and forwarding utility"; + description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix new file mode 100644 index 000000000000..1b29def11ad8 --- /dev/null +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchzip, makeDesktopItem, makeWrapper +, jre }: + +stdenv.mkDerivation rec { + name = "ganttproject-bin-${version}"; + version = "2.7.2"; + + src = let build = "r1954"; in fetchzip { + sha256 = "0l655w6n88j7klz56af8xkpiv1pwlkfl5x1d33sqv9dnyisyw2hc"; + url = "https://dl.ganttproject.biz/ganttproject-${version}/" + + "ganttproject-${version}-${build}.zip"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = let + + desktopItem = makeDesktopItem { + name = "ganttproject"; + exec = "ganttproject"; + icon = "ganttproject"; + desktopName = "GanttProject"; + genericName = "Shedule and manage projects"; + comment = meta.description; + categories = "Office;Application;"; + }; + + in '' + mkdir -pv "$out/share/ganttproject" + cp -rv * "$out/share/ganttproject" + + mkdir -pv "$out/bin" + wrapProgram "$out/share/ganttproject/ganttproject" \ + --set JAVA_HOME "${jre}" + mv -v "$out/share/ganttproject/ganttproject" "$out/bin" + + install -v -Dm644 \ + plugins/net.sourceforge.ganttproject/data/resources/icons/ganttproject.png \ + "$out/share/pixmaps/ganttproject.png" + cp -rv "${desktopItem}/share/applications" "$out/share" + ''; + + meta = with stdenv.lib; { + description = "Project scheduling and management"; + homepage = https://www.ganttproject.biz/; + downloadPage = https://www.ganttproject.biz/download; + # GanttProject itself is GPL3+. All bundled libraries are declared + # ‘GPL3-compatible’. See ${downloadPage} for detailed information. + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 36840c656d34..be36eeceb6b6 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qt4, qmake4Hook, libXtst, libvorbis, hunspell -, libao, ffmpeg, libeb, lzo, xz, libtiff }: +{ stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell +, libao, ffmpeg, libeb, lzo, xz, libtiff +, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmakeHook }: stdenv.mkDerivation rec { - name = "goldendict-1.5.0.ec86515"; - src = fetchFromGitHub { - owner = "goldendict"; - repo = "goldendict"; - rev = "ec865158f5b7116f629e4d451a39ee59093eefa5"; - sha256 = "070majwxbn15cy7sbgz7ljl8rkn7vcgkm10884v97csln7bfzwhr"; + name = "goldendict-1.5.0.rc2"; + src = fetchurl { + url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz"; + sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw"; }; buildInputs = [ - pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb - lzo xz libtiff qmake4Hook + pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb + lzo xz libtiff qmakeHook ]; qmakeFlags = [ "CONFIG+=zim_support" ]; meta = { homepage = http://goldendict.org/; - description = "a feature-rich dictionary lookup program"; + description = "A feature-rich dictionary lookup program"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.astsmtl ]; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 4c0e091bf653..742bdaad9966 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; meta = { - description = "a ready to use set of digital camera software applications"; + description = "A ready to use set of digital camera software applications"; longDescription = '' A set of command line utilities for manipulating over 1400 different diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index ce8109717d44..08ae34f97055 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ]; meta = { - description = "a GTK enabled dropin replacement for xmessage"; + description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [jfb]; diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index e4b362ec25d4..d26ad94648aa 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.jbidwatcher.com/"; - description = "monitor and snipe Ebay auctions"; + description = "Monitor and snipe Ebay auctions"; license = "LGPL"; longDescription = '' diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix index 8fd043539698..fc55b275dd0a 100644 --- a/pkgs/applications/misc/multisync/default.nix +++ b/pkgs/applications/misc/multisync/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; # install.sh is not contained in the tar meta = { - description = "modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc"; + description = "Modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc"; }; } diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix new file mode 100644 index 000000000000..2b9b254f20bf --- /dev/null +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -0,0 +1,78 @@ +{ stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check +, libxml2, libidn, perl, nettools, perlPackages +, libXcursor, libXrandr, makeWrapper +, buildsystem +, nsgenbind +, libnsfb +, libwapcaplet +, libparserutils +, libcss +, libhubbub +, libdom +, libnsbmp +, libnsgif +, libnsutils +, libutf8proc +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${version}"; + version = "3.5"; + + # UIS incldue Framebuffer, and gtk, but + # Framebuffer is buggy. To enable, make sure + # to also build netsurf-libnsfb with ui=framebuffer + # and switch the ui here to framebuffer + ui = "gtk"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz"; + sha256 = "1k0x8mzgavfy7q9kywl6kzsc084g1xlymcnsxi5v6jp279nsdwwq"; + }; + + buildInputs = [ pkgconfig libpng openssl curl gtk2 check libxml2 libidn perl + nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper + buildsystem + nsgenbind + libnsfb + libwapcaplet + libparserutils + libcss + libhubbub + libdom + libnsbmp + libnsgif + libnsutils + libutf8proc + ]; + + preConfigure = '' + cat <<EOF > Makefile.conf + override NETSURF_GTK_RESOURCES := $out/share/Netsurf/${ui}/res + override NETSURF_USE_GRESOURCE := YES + EOF + ''; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + "TARGET=${ui}" + ]; + + installPhase = '' + mkdir -p $out/bin $out/share/Netsurf/${ui} + cmd=$(case "${ui}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac) + cp $cmd $out/bin/netsurf + wrapProgram $out/bin/netsurf --set NETSURFRES $out/share/Netsurf/${ui}/res + tar -hcf - ${ui}/res | (cd $out/share/Netsurf/ && tar -xvpf -) + ''; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "Free opensource web browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix new file mode 100644 index 000000000000..f64fbe8528b6 --- /dev/null +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + + name = "netsurf-buildsystem-${version}"; + version = "1.5"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz"; + sha256 = "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "Build system for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix new file mode 100644 index 000000000000..9db681bf5c19 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, perl +, buildsystem +, libwapcaplet +, libparserutils +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libcss"; + version = "0.6.0"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf"; + }; + + buildInputs = [ pkgconfig perl + buildsystem + libwapcaplet + libparserutils + ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "Cascading Style Sheets library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix new file mode 100644 index 000000000000..9287ee9a0841 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libdom/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, expat +, buildsystem +, libparserutils +, libwapcaplet +, libhubbub +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libdom"; + version = "0.3.0"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "1kk6qbqagx5ypiy9kf0059iqdzyz8fqaw336vzhb5gnrzjw3wv4a"; + }; + + buildInputs = [ pkgconfig expat + buildsystem + libparserutils + libwapcaplet + libhubbub + ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "Document Object Model library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix new file mode 100644 index 000000000000..ef319e950894 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, perl +, buildsystem +, libparserutils +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libhubbub"; + version = "0.3.3"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "101781iw32p47386fxqr01nrkywi12w17ajh02k2vlga4z8zyv86"; + }; + + buildInputs = [ pkgconfig perl + buildsystem + libparserutils + ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "HTML5 parser library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix new file mode 100644 index 000000000000..44f644e162b9 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libnsbmp"; + version = "0.1.3"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "0gmvzw1whh7553d6s98vr4ri2whjwrgggcq1z5b160gwjw20mzyy"; + }; + + buildInputs = [ pkgconfig + buildsystem + ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "BMP Decoder for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix new file mode 100644 index 000000000000..3e2346597fa4 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, ui? "gtk" +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libnsfb"; + version = "0.1.4"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "176f8why9gzbaca9nnxjqasl02qzc6g507z5w3dzkcjifnkz4mzl"; + }; + + buildInputs = [ pkgconfig buildsystem ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + "TARGET=${ui}" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "CSS parser and selection library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix new file mode 100644 index 000000000000..09ec6c6ecc34 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libnsgif"; + version = "0.1.3"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "1a4z45gh0fw4iybf34fig725av25h31ffk0azi0snzh4130cklnk"; + }; + + buildInputs = [ buildsystem pkgconfig]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "GIF Decoder for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix new file mode 100644 index 000000000000..9d931d6bea2e --- /dev/null +++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libnsutils"; + version = "0.0.2"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "03p4xmd08yhj70nyj7acjccmmshs59lv4n4zsqpsn5lgkwa23lzy"; + }; + + buildInputs = [ buildsystem pkgconfig]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "Generalised utility library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix new file mode 100644 index 000000000000..275c2cccaefa --- /dev/null +++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, perl +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libparserutils"; + version = "0.2.3"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5"; + }; + + buildInputs = [ buildsystem perl ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "Parser building library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix new file mode 100644 index 000000000000..b2057e1889fa --- /dev/null +++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libutf8proc"; + version = "1.3.1"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "0xf659y3c6ikjnip47r30wv796a34d71p6qhc4xjs64iqszm1sbq"; + }; + + buildInputs = [ buildsystem pkgconfig]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "UTF8 Processing library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix new file mode 100644 index 000000000000..edcc45ca0fa3 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libwapcaplet"; + version = "0.3.0"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "0cs1dd2afjgc3wf5gqg434hv6jdabrp9qvlpl4dp53nhkyfywna3"; + }; + + buildInputs = [ buildsystem ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "String internment library for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix new file mode 100644 index 000000000000..0985a1825201 --- /dev/null +++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl +, flex, bison +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-nsgenbind-${version}"; + version = "0.3"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${version}-src.tar.gz"; + sha256 = "16xsazly7gxwywmlkf2xix9b924sj3skhgdak7218l0nc62a08gg"; + }; + + buildInputs = [ buildsystem flex bison ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "http://www.netsurf-browser.org/"; + description = "Generator for JavaScript bindings for netsurf browser"; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix new file mode 100644 index 000000000000..a6bcff066262 --- /dev/null +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, electron } : + +stdenv.mkDerivation rec { + name = "nix-tour"; + + buildInputs = [ electron ]; + + version = "v0.0.1"; + + src = fetchgit { + url = "https://github.com/nixcloud/tour_of_nix"; + rev = "refs/tags/${version}"; + sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share + cp -R * $out/share + chmod 0755 $out/share/ -R + echo "#!${stdenv.shell}" > $out/bin/nix-tour + echo "cd $out/share/" >> $out/bin/nix-tour + echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour + chmod 0755 $out/bin/nix-tour + ''; + + meta = with stdenv.lib; { + description = "'the tour of nix' from nixcloud.io/tour as offline version"; + homepage = "https://nixcloud.io/tour"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ qknight ]; + }; + +} \ No newline at end of file diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 8a68bd7ccfb9..fdc4cd5b6d93 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [unzip]; meta = { - description = "open source Geographic Information System (GIS) written in the Java programming language"; + description = "Open source Geographic Information System (GIS) written in the Java programming language"; homepage = http://www.openjump.org/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index ee068e2045e0..11c090cc3891 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libX11, libxkbcommon, pango -, cairo, glib, libxcb, xcbutil, xcbutilwm, which, git, libstartup_notification +, cairo, glib, libxcb, xcbutil, xcbutilwm, libstartup_notification , i3Support ? false, i3 }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "1.1.0"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; - sha256 = "01jxml9vk4cw7pngpan7dipmb98s6ibh6f0023lw3hbgxy650637"; + sha256 = "1l8vl0mh7i0b1ycifqpg6392f5i4qxlv003m126skfk6fnlfq8hn"; }; preConfigure = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango - cairo libstartup_notification libxcb xcbutil xcbutilwm which git + cairo libstartup_notification libxcb xcbutil xcbutilwm ] ++ stdenv.lib.optional i3Support i3; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix new file mode 100644 index 000000000000..4908769bef6e --- /dev/null +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, undmg }: + +stdenv.mkDerivation rec { + name = "sequel-pro-${version}"; + version = "1.1.2"; + + src = fetchurl { + url = "https://github.com/sequelpro/sequelpro/releases/download/release-1.1.2/sequel-pro-1.1.2.dmg"; + sha256 = "1il7yc3f0yzxkra27bslnmka5ycxzx0q4m3xz2j9r7iyq5izsd3v"; + }; + + buildInputs = [ undmg ]; + installPhase = '' + mkdir -p "$out/Applications/Sequel Pro.app" + cp -R . "$out/Applications/Sequel Pro.app" + chmod +x "$out/Applications/Sequel Pro.app/Contents/MacOS/Sequel Pro" + ''; + + meta = { + description = "MySQL database management for Mac OS X"; + homepage = http://www.sequelpro.com/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index f7460618d964..85e6c07d670a 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/mjheagle8/tasknc"; - description = "a ncurses wrapper around taskwarrior"; + description = "A ncurses wrapper around taskwarrior"; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; # Cannot test others }; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index f11d5e6d7009..a7d288162e39 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.foolabs.com/xpdf/"; - description = "viewer for Portable Document Format (PDF) files"; + description = "Viewer for Portable Document Format (PDF) files"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4f4fbb8d3bf3..997551f3fae2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -57,7 +57,7 @@ let use_system_libevent = true; use_system_libexpat = true; # XXX: System libjpeg fails to link for version 52.0.2743.10 - use_system_libjpeg = upstream-info.version != "52.0.2743.10"; + use_system_libjpeg = versionOlder upstream-info.version "52.0.2743.10"; use_system_libpng = false; use_system_libwebp = true; use_system_libxml = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 073d75745021..55cc35c25925 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1sgfwh2b0aw6l5v4ggk7frcy306x3ygxk81p3h6zdy5s1rpf8hxj"; - sha256bin64 = "14qj8l5dapha87ndyzcs3spaxp3s9sapcjcplkisbivis09a29cb"; - version = "51.0.2704.63"; + sha256 = "00dll63b3z1ijj60m0h8y2ydmkf91hyr6h98rqp21w11c2xbwzis"; + sha256bin64 = "1cdfvi5af18mlhn2ax3shsdm4p4jkhs29v3d2gmkyldfvvixh3zc"; + version = "52.0.2743.41"; }; dev = { - sha256 = "1bbwbn0svgr2pfkza8pdq61bjzlj50axdm5bqqxi51hab51fc9ww"; - sha256bin64 = "1s02q72b84g9p5i7y1hh1c67qjb92934dqqwd7w6j0jz8ix71nzc"; - version = "52.0.2743.10"; + sha256 = "1pzcabdk7d9p4sc8wdpwvji9xvblsihpimnjh6n2jz5al9sm1q8j"; + sha256bin64 = "0k84hy4sj03h5bjciigagr83qf7yss22vj21fivgkvgasdmd12m8"; + version = "53.0.2767.4"; }; stable = { - sha256 = "1sgfwh2b0aw6l5v4ggk7frcy306x3ygxk81p3h6zdy5s1rpf8hxj"; - sha256bin64 = "1kjnxxf2ak8v1akzxz46r7a7r6bhxjb2y9fhr1fqvks3m4jc5zqw"; - version = "51.0.2704.63"; + sha256 = "0aypf5lhi2l7cn41xhq2ck6bjblapwv26nygvg2883hhqinmnwvn"; + sha256bin64 = "1c1796sd82l480xjdw7w46867w2phw3ng2dvdb6njsvpg299chi8"; + version = "51.0.2704.103"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index abe3a0711380..4da4c74d1c37 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pkgname = "conkeror"; - version = "1.0pre-20160130"; + version = "1.0.3"; name = "${pkgname}-${version}"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "3e4732cd0d15aa70121fe0a0403103b777c964bf"; - sha256 = "1299b1kdfd2vip3w02jzvj2i8scjpsvpx19d2c8ms2pizz7xxmp4"; + rev = "refs/tags/${version}"; + sha256 = "06fhfk8km3gd1lc19543zn0c71zfbn8wsalinvm1dbgi724f52pd"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix index 56147883f4be..1cbffdd25446 100644 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - description = "a WebKit KPart for Konqueror, Akregator and other KDE applications"; + description = "A WebKit KPart for Konqueror, Akregator and other KDE applications"; homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart; }; } diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 2777cb15fca9..163eb8cf5890 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation { --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/usr/share/:$out/share/:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ - --set LUA_PATH '"${luaKitPath};${luaPath};"' \ - --set LUA_CPATH '"${luaCPath};"' + --set LUA_PATH '${luaKitPath};${luaPath};' \ + --set LUA_CPATH '${luaCPath};' ''; } diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 6e94767c16e0..2812be0f1721 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good -, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: +, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }: -let version = "0.6.2"; in +let version = "0.7.0"; in buildPythonApplication rec { name = "qutebrowser-${version}"; @@ -10,13 +10,14 @@ buildPythonApplication rec { src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "16g7vlpvzkj94xk6fzl0jav2izfpvqn3zx9gydsk064cdxb02hrs"; + sha256 = "17xvv4h86frcn7zmi0y9gjsz2cazlb59v3dqi9mdc11w00b1cqbn"; }; # Needs tox doCheck = false; - buildInputs = [ wrapGAppsHook + buildInputs = [ wrapGAppsHook makeQtWrapper + qtmultimedia gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav glib_networking ]; @@ -24,8 +25,9 @@ buildPythonApplication rec { python pyyaml pyqt5 jinja2 pygments pypeg2 ]; - makeWrapperArgs = '' - --prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins" + postInstall = '' + mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath + makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser ''; meta = { diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 96d263a525e2..925fe19d72ec 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hadoop.apache.org/"; - description = "framework for distributed processing of large data sets across clusters of computers"; + description = "Framework for distributed processing of large data sets across clusters of computers"; license = stdenv.lib.licenses.asl20; longDescription = '' diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 7fa944d86c07..4b7b56c69eaf 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.17.0.1"; in +let version = "3.18.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0ai3a0nys3yjmlvlv57nli77x6x0a2r409b4f5w4kr9mi6f4z4a7"; + sha256 = "1qnpbx2684r529ldih6fi5anjlcgqn2xfcls0q38iadrk1qnqr1p"; }; configureFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix index 65f6cab6e81c..21f2afdde68b 100644 --- a/pkgs/applications/networking/instant-messengers/gale/default.nix +++ b/pkgs/applications/networking/instant-messengers/gale/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://gale.org/"; - description = "chat/messaging system (server and client)"; + description = "Chat/messaging system (server and client)"; platforms = platforms.all; license = licenses.gpl2Plus; }; diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 9c84e60601bb..b4403a780ed2 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -51,7 +51,7 @@ in mkTkabber (main // { for prog in $out/bin/*; do wrapProgram "$prog" \ --prefix PATH : "${tk}/bin" \ - --set TCLLIBPATH '"${tclLibPaths}"' \ + --set TCLLIBPATH '${tclLibPaths}' \ ${optionalString withSitePlugins '' --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins' ''} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb index 07374a827f2e..43b41658413e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb @@ -29,7 +29,7 @@ puts(<<"EOH") # This file is generated from generate_sources.rb. DO NOT EDIT. # Execute the following command to update the file. # -# ruby generate_sources.rb 45.1.0 > sources.nix +# ruby generate_sources.rb 45.1.1 > sources.nix { version = "#{version}"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 227babe397d4..7af00e17b37b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -1,7 +1,7 @@ # This file is generated from generate_sources.rb. DO NOT EDIT. # Execute the following command to update the file. # -# ruby generate_sources.rb 45.1.0 > sources.nix +# ruby generate_sources.rb 45.1.1 > sources.nix { version = "45.1.1"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index cd919566138c..09a5959890d7 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "45.1.0"; in +let version = "45.1.1"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha256 = "0293cwnqj4ys629ra87577c7snv4p8x2nbs1kzcnjpc96vjypsca"; + sha256 = "13kiida7smgl3bz1hx88hdvi2mj4z5b726gcw7nndxml60y10z8h"; }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix new file mode 100644 index 000000000000..892d9d8fa578 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchgit +, cmake +, qtbase +, qtwebkit +, makeQtWrapper +}: + +stdenv.mkDerivation rec { + name = "trojita-${version}"; + version = "0.7"; + + src = fetchgit { + url = "https://anongit.kde.org/trojita.git"; + rev = "065d527c63e8e4a3ca0df73994f848b52e14ed58"; + sha256 = "1zlwhir33hha2p3l08wnb4njnfdg69j88ycf1fa4q3x86qm3r7hw"; + }; + + buildInputs = [ + cmake + qtbase + qtwebkit + ]; + + nativeBuildInputs = [ + makeQtWrapper + ]; + + postInstall = '' + wrapQtProgram "$out/bin/trojita" + ''; + + + meta = { + description = "A Qt IMAP e-mail client"; + homepage = http://trojita.flaska.net/; + license = with lib.licenses; [ gpl2 gpl3 ]; + }; + +} diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 40aa32636297..9bad7a8b42a3 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "benchmark to measure the performance of many different types of networking"; + description = "Benchmark to measure the performance of many different types of networking"; homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 4114fbffa392..77fcb8ce7e91 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = http://furius.ca/beancount/; - description = "double-entry bookkeeping computer language"; + description = "Double-entry bookkeeping computer language"; longDescription = '' A double-entry bookkeeping computer language that lets you define financial transaction records in a text file, read them in memory, diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index e25457bc1cc0..176da6c1391d 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; name = "jabref-${version}"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar"; - sha256 = "19ms68d74xg8jg9n52gh2j7a89dl5pnib3vjsnih1j45hlmfg0ac"; + sha256 = "1pimjx1452z159hvi199n52j5vkdj5c59mns9mi5mqvwhgm9dghd"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 44135928a62a..ac90e0c4cb2b 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -2,7 +2,7 @@ , texinfo, gnused }: let - version = "3.1"; + version = "3.1.1"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/ledger/ledger.git"; rev = "refs/tags/v${version}"; - sha256 = "07r8ds4qdzgicfdf0ar3kp1zn09ami87jkrx1yn5k7hi8n4ns0ka"; + sha256 = "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 745dd7cc01ca..9c1e1b789900 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -251,5 +251,6 @@ in stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index e42c4f1a0a4a..b8ad900fb14a 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -251,6 +251,5 @@ in stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 71d0f923dbdc..f6a408d03842 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -9,7 +9,7 @@ bundlerEnv { gemset = ./gemset.nix; meta = { - description = "a simple command line time tracker written in ruby"; + description = "A simple command line time tracker written in ruby"; homepage = https://github.com/samg/timetrap; license = lib.licenses.mit; }; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix new file mode 100644 index 000000000000..5207245b0ba6 --- /dev/null +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, zlib, boost, glucose }: +stdenv.mkDerivation rec { + name = "aspino-2016-01-31"; + + src = fetchFromGitHub { + owner = "alviano"; + repo = "aspino"; + rev = "d28579b5967988b88bce6d9964a8f0a926286e9c"; + sha256 = "0r9dnkq3rldv5hhnmycmzqyg23hv5w3g3i5a00a8zalnzfiyirnq"; + }; + + buildInputs = [ zlib boost ]; + + preBuild = '' + cp ${glucose.src} patches/glucose-syrup.tgz + ./bootstrap.sh + ''; + + installPhase = '' + mkdir -p $out/bin + install -m0755 build/release/{aspino,fairino-{bs,ls,ps},maxino-2015-{k16,kdyn}} $out/bin + ''; + + meta = with stdenv.lib; { + description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose"; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + license = licenses.asl20; + homepage = http://alviano.net/software/maxino/; + }; +} diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix new file mode 100644 index 000000000000..5b318be16649 --- /dev/null +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, zlib }: +stdenv.mkDerivation rec { + name = "glucose-${version}"; + version = "4.0"; + + src = fetchurl { + url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz"; + sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld"; + }; + + buildInputs = [ zlib ]; + + sourceRoot = "glucose-syrup/simp"; + makeFlags = [ "r" ]; + installPhase = '' + install -Dm0755 glucose_release $out/bin/glucose + ''; + + meta = with stdenv.lib; { + description = "Modern, parallel SAT solver (sequential version)"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix new file mode 100644 index 000000000000..7604ebc1a3d9 --- /dev/null +++ b/pkgs/applications/science/logic/glucose/syrup.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, zlib }: +stdenv.mkDerivation rec { + name = "glucose-syrup-${version}"; + version = "4.0"; + + src = fetchurl { + url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz"; + sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld"; + }; + + buildInputs = [ zlib ]; + + sourceRoot = "glucose-syrup/parallel"; + makeFlags = [ "r" ]; + installPhase = '' + install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup + ''; + + meta = with stdenv.lib; { + description = "Modern, parallel SAT solver (parallel version)"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix index f9bdd9a6b3b9..59c6461f5b6c 100644 --- a/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/pkgs/applications/science/logic/ltl2ba/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "fast translation from LTL formulae to Buchi automata"; + description = "Fast translation from LTL formulae to Buchi automata"; homepage = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/minisat/clang.diff b/pkgs/applications/science/logic/minisat/clang.diff new file mode 100644 index 000000000000..5b5072c71f3f --- /dev/null +++ b/pkgs/applications/science/logic/minisat/clang.diff @@ -0,0 +1,45 @@ +diff -aur minisat/core/SolverTypes.h minisat.clang/core/SolverTypes.h +--- minisat/core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200 ++++ minisat.clang/core/SolverTypes.h 2016-05-13 12:14:50.759671959 +0200 +@@ -47,7 +47,7 @@ + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ //friend Lit mkLit(Var var, bool sign = false); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -55,7 +55,7 @@ + }; + + +-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } ++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } + inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } + inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } + inline bool sign (Lit p) { return p.x & 1; } +diff -aur minisat/utils/Options.h minisat.clang/utils/Options.h +--- minisat/utils/Options.h 2010-07-10 18:07:36.000000000 +0200 ++++ minisat.clang/utils/Options.h 2016-05-13 12:14:50.759671959 +0200 +@@ -282,15 +282,15 @@ + if (range.begin == INT64_MIN) + fprintf(stderr, "imin"); + else +- fprintf(stderr, "%4"PRIi64, range.begin); ++ fprintf(stderr, "%4" PRIi64, range.begin); + + fprintf(stderr, " .. "); + if (range.end == INT64_MAX) + fprintf(stderr, "imax"); + else +- fprintf(stderr, "%4"PRIi64, range.end); ++ fprintf(stderr, "%4" PRIi64, range.end); + +- fprintf(stderr, "] (default: %"PRIi64")\n", value); ++ fprintf(stderr, "] (default: %" PRIi64 ")\n", value); + if (verbose){ + fprintf(stderr, "\n %s\n", description); + fprintf(stderr, "\n"); +Only in minisat.clang/utils: Options.o +Only in minisat.clang/utils: System.o diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index c821020b7381..3ed055cc0936 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; }; + patches = stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; + buildInputs = [ zlib ]; - sourceRoot = "minisat/simp"; + preBuild = "cd simp"; makeFlags = [ "r" "MROOT=.." ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index 24da52b9d07c..2bb2b911d491 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, bison, flex }: let baseVersion="3"; - minorVersion="7"; + minorVersion="9"; + + extraTools = "FLOTTER prolog2dfg dfg2otter dfg2dimacs dfg2tptp" + + " dfg2ascii dfg2dfg tptp2dfg dimacs2dfg pgen rescmp"; in stdenv.mkDerivation rec { @@ -11,16 +14,28 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.spass-prover.org/download/sources/spass${baseVersion}${minorVersion}.tgz"; - sha256 = "1k5a98kr3vzga54zs7slwwaaf6v6agk1yfcayd8bl55q15g7xihk"; + sha256 = "11cyn3kcff4r79rsw2s0xm6rdb8bi0kpkazv2b48jhcms7xw75qp"; }; + sourceRoot = "."; + + nativeBuildInputs = [ bison flex ]; + + buildPhase = '' + make RM="rm -f" proparser.c ${extraTools} opt + ''; + installPhase = '' + mkdir -p $out/bin + install -m0755 SPASS ${extraTools} $out/bin/ + ''; + meta = with stdenv.lib; { - description = "An automated theorem preover for FOL"; + description = "Automated theorem prover for first-order logic"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.bsd2; downloadPage = "http://www.spass-prover.org/download/index.html"; }; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index f3cd8ab69271..e9a89bc0dc6d 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz" ]; - sha256 = "17wl80mnm91jp3npdjzfbb8ds45f2gni250jlfw0d91i1476wcl3"; + sha256 = "0xy4cqniyx9fv8r9mc5q5b7xl163pkr9hcmpq6gkls2a0pvg07w9"; }; buildInputs = [ tcsh yap perl patchelf ]; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index c8b388a06b78..5a6d3dd54043 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp msieve $out/bin/''; meta = { - description = "a C library implementing a suite of algorithms to factor large integers"; + description = "A C library implementing a suite of algorithms to factor large integers"; license = stdenv.lib.licenses.publicDomain; homepage = http://msieve.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index 4a126797d697..6ced805b3115 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/pspp/"; - description = "a free replacement for SPSS, a program for statistical analysis of sampled data"; + description = "A free replacement for SPSS, a program for statistical analysis of sampled data"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 6bc5d874bc0d..fe13a9aebbcd 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }: +{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { - url = "mirror://sourceforge/qalculate/${name}.tar.gz"; - sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4"; + url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; + sha256 = "15ci0p7jlikk2rira6ykgrmcdvgpxzprpqmkdxx6hsg4pvzrj54s"; }; - nativeBuildInputs = [ intltool pkgconfig ]; - buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; + buildInputs = [ libqalculate gtk3 ]; meta = with stdenv.lib; { description = "The ultimate desktop calculator"; - homepage = http://qalculate.sourceforge.net; + homepage = http://qalculate.github.io; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 66292499f2b4..56ae454831b1 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,30 +1,22 @@ { stdenv, fetchurl, qt, cmake }: stdenv.mkDerivation rec { - name = "speedcrunch-0.11-alpha"; + name = "speedcrunch-${version}"; + version = "0.11"; src = fetchurl { - url = "http://speedcrunch.googlecode.com/files/${name}.tar.gz"; - sha256 = "c6d6328e0c018cd8b98a0e86fb6c49fedbab5dcc831b47fbbc1537730ff80882"; + url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz"; + sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd"; }; - patches = [./speedcrunch-0.11-alpha-dso_linking.patch]; - buildInputs = [cmake qt]; dontUseCmakeBuildDir = true; - cmakeDir = "../src"; - - preConfigure = '' - mkdir -p build - cd build - ''; - - buildFlags = "VERBOSE=1"; + cmakeDir = "src"; meta = with stdenv.lib; { - homepage = "http://speedcrunch.digitalfanatics.org"; + homepage = http://speedcrunch.org; license = licenses.gpl2Plus; description = "A fast power user calculator"; longDescription = '' @@ -33,6 +25,8 @@ stdenv.mkDerivation rec { precisions, unlimited variable storage, intelligent automatic completion full keyboard-friendly and more than 15 built-in math function. ''; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/math/speedcrunch/speedcrunch-0.11-alpha-dso_linking.patch b/pkgs/applications/science/math/speedcrunch/speedcrunch-0.11-alpha-dso_linking.patch deleted file mode 100644 index 1b03c16b63d1..000000000000 --- a/pkgs/applications/science/math/speedcrunch/speedcrunch-0.11-alpha-dso_linking.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up speedcrunch-0.11-alpha/src/CMakeLists.txt.dso_linking speedcrunch-0.11-alpha/src/CMakeLists.txt ---- speedcrunch-0.11-alpha/src/CMakeLists.txt.dso_linking 2009-11-04 15:37:15.000000000 -0600 -+++ speedcrunch-0.11-alpha/src/CMakeLists.txt 2010-06-25 13:25:07.133460528 -0500 -@@ -54,6 +54,10 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX ) - SET(QT_USE_QTNETWORK TRUE) - #SET(QT_USE_QTXML TRUE) - find_package(Qt4 REQUIRED) -+if (Q_WS_X11) -+ find_package(X11 REQUIRED) -+endif (Q_WS_X11) -+ - include(${QT_USE_FILE}) - - # build everything -@@ -80,7 +84,7 @@ ENDIF( APPLE ) - - ADD_CUSTOM_TARGET( confclean COMMAND rm -rf Makefile CMakeFiles/ CMakeCache.txt cmake_install.cmake DartTestfile.txt install_manifest.txt ) - --TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES}) -+TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} ${X11_X11_LIB} ) - # only needed for static builds when directx is enabled in qt and you - # get a linker error because of missing a directx function - #IF(WIN32) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 37e9c9c858f1..81f5accd4780 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "provides full ground station support and configuration for the PX4 and APM Flight Stacks"; + description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = http://qgroundcontrol.org/; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/version-management/bazaar/add_certificates.patch b/pkgs/applications/version-management/bazaar/add_certificates.patch index 332f42aa89cc..18fac36daec5 100644 --- a/pkgs/applications/version-management/bazaar/add_certificates.patch +++ b/pkgs/applications/version-management/bazaar/add_certificates.patch @@ -1,11 +1,11 @@ -diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py ---- orig/bzrlib/transport/http/_urllib2_wrappers.py 2013-07-27 13:50:53.000000000 +0200 -+++ bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py 2014-02-04 18:34:15.838622492 +0100 -@@ -86,6 +86,7 @@ - u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD +diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py +--- orig/bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-02-01 20:49:17.000000000 +0100 ++++ bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-06-18 23:15:21.089511349 +0200 +@@ -95,6 +95,7 @@ + u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25 - u'/etc/openssl/certs/ca-certificates.crt', # Solaris + u'/etc/openssl/certs/ca-certificates.crt', # Solaris + u'@certPath@', - ] - def default_ca_certs(): - if sys.platform == 'win32': + ] + + diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 28406cecbb00..29dee3f03c57 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "2.6"; + version = "2.7"; release = ".0"; name = "bazaar-${version}${release}"; src = fetchurl { - url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509"; + url = "https://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; + sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 8e537c32313c..5ce665dda0f0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.agwa.name/projects/git-crypt"; - description = "transparent file encryption in git"; + description = "Transparent file encryption in git"; longDescription = '' git-crypt enables transparent encryption and decryption of files in a git repository. Files which you choose to protect are encrypted when diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 86a11d04ed7d..e90fc9ad2580 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/felipec/git-remote-hg"; - description = "semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; + description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; license = licenses.gpl2; maintainers = [ maintainers.garbas ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 1e372c928f88..ade9ac1312a7 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = "http://josefsson.org/git2cl/"; - description = "convert git logs to GNU style ChangeLog files"; + description = "Convert git logs to GNU style ChangeLog files"; }; } diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index b8967323c988..15c38da28c9d 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.5.6"; + version = "3.6.0"; src = fetchurl { - sha256 = "0wm6hqaq6ydbvvd0fqkfydxd5h7gf4di7lvq63xgxl4z40jqc25n"; + sha256 = "1hvf4s6f2qc5z10p2q8mdyagx8dnwpsbrgg0is56hm1k80r58yj8"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! - url = "http://download.clipgrab.de/${name}.tar.gz"; + url = "https://download.clipgrab.org/${name}.tar.gz"; }; buildInputs = [ ffmpeg qt4 ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { exec = name; icon = name; desktopName = "ClipGrab"; - comment = "A friendly downloader for YouTube and other sites"; + comment = meta.description; genericName = "Web video downloader"; categories = "Qt;AudioVideo;Audio;Video"; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { Dailymotion and many other online video sites. It converts downloaded videos to MPEG4, MP3 or other formats in just one easy step. ''; - homepage = http://clipgrab.org/; + homepage = https://clipgrab.org/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 46b5712ca9a4..6a13bcc015a9 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { + ":" + stdenv.cc.cc + "/lib64"; meta = with stdenv.lib; { - description = "convert blu-ray and dvd to mkv"; + description = "Convert blu-ray and dvd to mkv"; longDescription = '' makemkv is a one-click QT application that transcodes an encrypted blu-ray or DVD disc into a more portable set of mkv files, preserving diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index ade840dc0218..527d31004b01 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s"; meta = with stdenv.lib; { - description = "screencast video catpuring tool"; + description = "Screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 77263293847c..2385fd3c41fe 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -8,11 +8,11 @@ assert gestures -> libstroke != null; stdenv.mkDerivation rec { - name = "fvwm-2.6.5"; + name = "fvwm-2.6.6"; src = fetchurl { - url = "ftp://ftp.fvwm.org/pub/fvwm/version-2/${name}.tar.bz2"; - sha256 = "1ks8igvmzm0m0sra05k8xzc8vkqy3gv1qskl6davw1irqnarjm11"; + url = "https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/${name}.tar.gz"; + sha256 = "c5de085ff25b2128a401a80225481e63335f815f84eea139f80a5f66e606dc2c"; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 4060b9887f79..6a5e4564122d 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -35,9 +35,9 @@ buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/qtile \ - --set QTILE_WRAPPER '"$0"' \ - --set QTILE_SAVED_PYTHONPATH '"$PYTHONPATH"' \ - --set QTILE_SAVED_PATH '"$PATH"' + --set QTILE_WRAPPER '$0' \ + --set QTILE_SAVED_PYTHONPATH '$PYTHONPATH' \ + --set QTILE_SAVED_PATH '$PATH' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index bfbeb9739f1c..91ee7dedb5db 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -1,24 +1,42 @@ { stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop -, extraModulePaths ? [] }: +, extraModulePaths ? [] +, version }: let - version = "0.9.9"; contrib = (fetchgit { url = "https://github.com/stumpwm/stumpwm-contrib.git"; rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f"; sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; }); + versionSpec = { + "latest" = { + name = "0.9.9"; + rev = "refs/tags/0.9.9"; + sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; + patches = [ ./fix-module-path.patch ]; + }; + "git" = { + name = "git-20160617"; + rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a"; + sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; + patches = []; + }; + }.${version}; in stdenv.mkDerivation rec { - name = "stumpwm-${version}"; + name = "stumpwm-${versionSpec.name}"; src = fetchgit { url = "https://github.com/stumpwm/stumpwm"; - rev = "refs/tags/${version}"; - sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; + rev = "${versionSpec.rev}"; + sha256 = "${versionSpec.sha256}"; }; + # NOTE: The patch needs an update for the next release. + # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it. + patches = versionSpec.patches; + buildInputs = [ texinfo4 makeWrapper autoconf sbcl @@ -27,9 +45,6 @@ stdenv.mkDerivation rec { xdpyinfo ]; - # NOTE: The patch needs an update for the next release. - # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it. - patches = [ ./fix-module-path.patch ]; # Stripping destroys the generated SBCL image dontStrip = true; diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index e60319d09717..ed0d5b0043d5 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -137,3 +137,10 @@ int posix_spawn(pid_t * pid, const char * path, char buf[PATH_MAX]; return posix_spawn_real(pid, rewrite(path, buf), file_actions, attrp, argv, envp); } + +int execv(const char *path, char *const argv[]) +{ + int (*execv_real) (const char *path, char *const argv[]) = dlsym(RTLD_NEXT, "execv"); + char buf[PATH_MAX]; + return execv_real(rewrite(path, buf), argv); +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 23f781f104d4..82cb72cb67ea 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1832,44 +1832,44 @@ rec { debian70x86_64 = debian7x86_64; debian7i386 = { - name = "debian-7.10-wheezy-i386"; - fullName = "Debian 7.10 Wheezy (i386)"; + name = "debian-7.11-wheezy-i386"; + fullName = "Debian 7.11 Wheezy (i386)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "02dncyhz3c02jzdxqngbhfic7acsa7p2yv76xwrhawj38yjgqzrm"; + sha256 = "57ea423dc1c0cc082cae580360f8e7192c9fd60e2ef775a4ce7f48784277462d"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian7x86_64 = { - name = "debian-7.10-wheezy-amd64"; - fullName = "Debian 7.10 Wheezy (amd64)"; + name = "debian-7.11-wheezy-amd64"; + fullName = "Debian 7.11 Wheezy (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "1kir3j6y81s914njvs0sbwywq7qv28f8s615r9agg9s0h5g760fw"; + sha256 = "b400e459ce2f8af8621182c3a9ea843f0df3dc2d5662e6c6204f9406f5ff2d41"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8i386 = { - name = "debian-8.4-jessie-i386"; - fullName = "Debian 8.4 Jessie (i386)"; + name = "debian-8.5-jessie-i386"; + fullName = "Debian 8.5 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "1j8swc1nzsi20vbcmya2sv0fzcnz7lhwb32lxabgcwm3xlkzlg58"; + sha256 = "f87a1ee673b335c28cb6ac87be61d6ef20f32dd847835c2bb7d400a00a464c7f"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.4-jessie-amd64"; - fullName = "Debian 8.4 Jessie (amd64)"; + name = "debian-8.5-jessie-amd64"; + fullName = "Debian 8.5 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "1vvl4k1c3wqvh4gj64vxj2iwb6s9ys5xrskwdpffhyjlslaylsnz"; + sha256 = "df6aea15d5547ae8dc6d7ceadc8bf6499bc5a3907d13231f811bf3c1c22474ef"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 1c8e6af83b86..06a0a2293064 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -71,8 +71,6 @@ let }; }; - shellEscape = x: "'${replaceChars ["'"] [("'\\'" + "'")] x}'"; - loopForever = "while :; do ${coreutils}/bin/sleep 1; done"; initScript = writeScript "init.sh" ('' @@ -132,7 +130,7 @@ let -o StrictHostKeyChecking=no \ -i /ssh.key \ -l Administrator \ - 192.168.0.1 -- ${shellEscape command} + 192.168.0.1 -- ${lib.escapeShellArg command} '') + optionalString (suspendTo != null) '' ${coreutils}/bin/touch /xchg/suspend_now ${loopForever} diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix new file mode 100644 index 000000000000..3e74ca9270a5 --- /dev/null +++ b/pkgs/data/fonts/emojione/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: + +stdenv.mkDerivation rec { + name = "emojione-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "emojione-color-font"; + rev = "v${version}"; + sha256 = "001c2bph4jcdg9arfmyxrscf1i09gvg44kqy28chjmhxzq99hpcg"; + }; + + preBuild = '' + sed -i 's,SCFBUILD :=.*,SCFBUILD := scfbuild,' Makefile + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; + + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf + ''; + + meta = with stdenv.lib; { + description = "Open source emoji set"; + homepage = "http://emojione.com/"; + licenses = licenses.cc-by-40; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 724a88ce8e46..ae085a145f21 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2016-06-13"; + version = "2016-06-20"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { "0dq5rh08xgwsrmkniww001b2dpd1d7db4sd385p70hkbbry496l3"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "156mkrizbnjs90lg2gqdlx1zzvpn81c83jiyprv12638zfgvqc7z"; + "1q49v1bxmlbd3y0rfimlcbw6jfp8jbh4hyvy3vdaf0lf82nhfs88"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "1wd838achh7wayl6bxmj0yywp5m2zbqk4xghng4mwmmnda6pa0f5"; + "0xqhvf2yyi2fq0bjch9fys22hqakhdhzrhsq9m4d2spmd2pjrp0x"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch deleted file mode 100644 index 89e3694a02d9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-08 18:53:52.284580835 +0200 -+++ configure.ac 2015-04-08 18:55:55.697225280 +0200 -@@ -113,6 +113,7 @@ - PKG_CHECK_MODULES(WEB_EXTENSION, [ - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) - AC_SUBST(WEB_EXTENSION_LIBS) diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch deleted file mode 100644 index 89e3694a02d9..000000000000 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-08 18:53:52.284580835 +0200 -+++ configure.ac 2015-04-08 18:55:55.697225280 +0200 -@@ -113,6 +113,7 @@ - PKG_CHECK_MODULES(WEB_EXTENSION, [ - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) - AC_SUBST(WEB_EXTENSION_LIBS) diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch deleted file mode 100644 index e65c0dea7472..000000000000 --- a/pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 -+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 -@@ -696,21 +696,6 @@ - ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ - ) - --# Valadoc --################################################# --foreach(pkg ${ENGINE_PACKAGES}) -- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") --endforeach(pkg ${ENGINE_PACKAGES}) -- --include(FindValadoc) --add_custom_target( -- valadoc -- WORKING_DIRECTORY -- ${CMAKE_SOURCE_DIR}/src -- COMMAND -- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --) -- - ## Make clean: remove copied files - ################################################## - set_property( diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix index 026227910f21..542ff24f5e65 100644 --- a/pkgs/desktops/kde-4.14/kdegames/bomber.nix +++ b/pkgs/desktops/kde-4.14/kdegames/bomber.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height"; + description = "A single player arcade game. The player is invading various cities in a plane that is decreasing in height"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix index b0e7d99c589f..89dff46129b6 100644 --- a/pkgs/desktops/kde-4.14/kdegames/bovo.nix +++ b/pkgs/desktops/kde-4.14/kdegames/bovo.nix @@ -2,7 +2,7 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; + description = "A Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix index 9f1ab0053099..50c3bf985b5b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/granatier.nix +++ b/pkgs/desktops/kde-4.14/kdegames/granatier.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; + description = "A clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix index 9a6f5e836955..cea4fb38b4fb 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix @@ -8,6 +8,6 @@ kde rec { postInstall = "wrapPythonPrograms"; meta = { - description = "an ancient Chinese board game for 4 players"; + description = "An ancient Chinese board game for 4 players"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix index f10e099da3cc..616533911ff8 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kapman.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kapman.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a clone of the well known game Pac-Man"; + description = "A clone of the well known game Pac-Man"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix index a9936c04f0ea..3f7c1343289a 100644 --- a/pkgs/desktops/kde-4.14/kdegames/katomic.nix +++ b/pkgs/desktops/kde-4.14/kdegames/katomic.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a fun and educational puzzle game built around molecular geometry"; + description = "A fun and educational puzzle game built around molecular geometry"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix index 27eeff2f65bb..1e20cf0051ea 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; + description = "A game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix index 98cf068de09a..08e8c62d2629 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a classic single player falling blocks puzzle game"; + description = "A classic single player falling blocks puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix index 77fa0db63529..291e4c65a43a 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player arcade game with the elements of puzzle"; + description = "A single player arcade game with the elements of puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix index 3a484d919bbb..4c5b2f62852f 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; + description = "A Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix index 06dfcee5ac39..b21a945a64b9 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds"; + description = "A single player puzzle game. The object of the game is to build lines of three similar diamonds"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix index 11b8838e7082..6504d069660b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a board game for two players based on the Connect-Four game"; + description = "A board game for two players based on the Connect-Four game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix index 6217c47a8065..86aff7e77ace 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; + description = "An action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix index 32eee67cc1e0..e417e89a0078 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kigo.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kigo.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an open-source implementation of the popular Go game"; + description = "An open-source implementation of the popular Go game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix index d9c1472495e7..9d8b307be756 100644 --- a/pkgs/desktops/kde-4.14/kdegames/killbots.nix +++ b/pkgs/desktops/kde-4.14/kdegames/killbots.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple game of evading killer robots"; + description = "A simple game of evading killer robots"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix index 72f7ab67501b..433991abd75b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an addictive and fun dice game, designed to be played by as many as six players"; + description = "An addictive and fun dice game, designed to be played by as many as six players"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix index a6d22cff51c3..888dba71b662 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple dice driven tactical game"; + description = "A simple dice driven tactical game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix index b592bc40641f..87415f9a4f81 100644 --- a/pkgs/desktops/kde-4.14/kdegames/klickety.nix +++ b/pkgs/desktops/kde-4.14/kdegames/klickety.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a puzzle game where the player removes groups of colored marbles to clear the board"; + description = "A puzzle game where the player removes groups of colored marbles to clear the board"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix index 90952fe91c07..e5c32d3fa9ab 100644 --- a/pkgs/desktops/kde-4.14/kdegames/klines.nix +++ b/pkgs/desktops/kde-4.14/kdegames/klines.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; + description = "A simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix index 946b531ff127..6aca3c229946 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames libkmahjongg ]; meta = { - description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; + description = "The tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix index 538454e95984..c02a61506d75 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kmines.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kmines.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a classic Minesweeper game"; + description = "A classic Minesweeper game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix index 42ffd2fcb4d5..aed9b48511ac 100644 --- a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix +++ b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Battle Ship game"; + description = "A Battle Ship game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix index a16e578ce848..d7a80f133168 100644 --- a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix +++ b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; + description = "A small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix index 78815ee57996..67a75cb9a36f 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kolf.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kolf.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a miniature golf game"; + description = "A miniature golf game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix index 3147c7305ea0..b0911d093ddd 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kollision.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kollision.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple ball dodging game"; + description = "A simple ball dodging game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix index 53ddd64928cc..974730a46d0b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/konquest.nix +++ b/pkgs/desktops/kde-4.14/kdegames/konquest.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "the KDE version of Gnu-Lactic Konquest"; + description = "The KDE version of Gnu-Lactic Konquest"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix index b60afa786d17..f33ddfb8570c 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix @@ -3,6 +3,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; nativeBuildInputs = [ shared_mime_info ]; meta = { - description = "a relaxing card sorting game"; + description = "A relaxing card sorting game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix index 2aed981428e1..065ee4bb657c 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; + description = "A simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix index 9c8880340388..085b91584c70 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames libkmahjongg ]; meta = { - description = "a solitaire-like game played using the standard set of Mahjong tiles"; + description = "A solitaire-like game played using the standard set of Mahjong tiles"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix index 767eb67971a8..bfdd8f358dd1 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames qca2 ]; meta = { - description = "a computerized version of the well known strategic board game Risk"; + description = "A computerized version of the well known strategic board game Risk"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix index ccf1fb551e9a..ce5e75336c97 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple Tron-Clone"; + description = "A simple Tron-Clone"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix index 5285f7916cad..692eb1c085af 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; + description = "Each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix index a17be2da6325..7cad6bf0e5ae 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game modeled after the well known pen and paper based game of Dots and Boxes"; + description = "A game modeled after the well known pen and paper based game of Dots and Boxes"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix index ea4e13a5e4f3..72a6a72b66d5 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a logic-based symbol placement puzzle"; + description = "A logic-based symbol placement puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix index 1a6ba9d653c2..a4480864fd8b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple constructor game suitable for children and adults alike"; + description = "A simple constructor game suitable for children and adults alike"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix index 9bdc6879db4b..f80cf4a8b356 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game based on the Rubik's Cube™ puzzle"; + description = "A game based on the Rubik's Cube™ puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix index 383b347dc330..d7687c1435f7 100644 --- a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a library for KMahjongg game"; + description = "A library for KMahjongg game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix index 2a5050cd6676..d3e8268784bb 100644 --- a/pkgs/desktops/kde-4.14/kdegames/lskat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/lskat.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; + description = "A fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix index ddecc78c75bc..a73fcf100eb7 100644 --- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix +++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix @@ -8,6 +8,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single-player jigsaw puzzle game"; + description = "A single-player jigsaw puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix index 165d7422f95b..77dcdcf48dce 100644 --- a/pkgs/desktops/kde-4.14/kdegames/picmi.nix +++ b/pkgs/desktops/kde-4.14/kdegames/picmi.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player logic-based puzzle game"; + description = "A single player logic-based puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix index 4c56e7529dd7..20e63baf723f 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ]; meta = { - description = "transparent audio CD access for applications using the KDE Platform"; + description = "Transparent audio CD access for applications using the KDE Platform"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix index 006300742ecd..bb44c3b7234e 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ]; meta = { - description = "a multimedia player with the focus on simplicity"; + description = "A multimedia player with the focus on simplicity"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix index 45f6c9abcb66..2311b1dda589 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ffmpeg ]; meta = { - description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror"; + description = "A video thumbnail generator for KDE file managers like Dolphin and Konqueror"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix index 93365b194b2e..1bf5584de2fa 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix @@ -5,6 +5,6 @@ kde { buildInputs = [ kdelibs taglib_1_9 libtunepimp ]; meta = { - description = "an audio jukebox application"; + description = "An audio jukebox application"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix index 8d8bc84e16ef..4d36aaf4f68a 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libcanberra libpulseaudio ]; meta = { - description = "sound mixer, an application to allow you to change the volume of your sound card"; + description = "Sound mixer, an application to allow you to change the volume of your sound card"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix index 720b01d1861e..66b0cfe869f6 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix @@ -3,6 +3,6 @@ kde { #todo: libmusicbrainz5 buildInputs = [ kdelibs ]; meta = { - description = "a library used to retrieve audio CD meta data from the internet"; + description = "A library used to retrieve audio CD meta data from the internet"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix index c88ebcc2a5a3..c34b849f4c92 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ]; meta = { - description = "a video thumbnail generator for KDE"; + description = "A video thumbnail generator for KDE"; }; } diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix index 5c357cede8e9..5d4f83e26562 100644 --- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix +++ b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix @@ -6,6 +6,6 @@ kde { preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}"; meta = { - description = "various KDE development utilities"; + description = "Various KDE development utilities"; }; } diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch deleted file mode 100644 index eea0ae4c199d..000000000000 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch +++ /dev/null @@ -1,372 +0,0 @@ -Index: plasma-workspace-5.5.5/startkde/startkde.cmake -=================================================================== ---- plasma-workspace-5.5.5.orig/startkde/startkde.cmake -+++ plasma-workspace-5.5.5/startkde/startkde.cmake -@@ -1,8 +1,36 @@ --#!/bin/sh -+#!@bash@ - # - # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+set -x -+ -+# The KDE icon cache is supposed to update itself -+# automatically, but it uses the timestamp on the icon -+# theme directory as a trigger. Since in Nix the -+# timestamp is always the same, this doesn't work. So as -+# a workaround, nuke the icon cache on login. This isn't -+# perfect, since it may require logging out after -+# installing new applications to update the cache. -+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -+rm -fv $HOME/.cache/icon-cache.kcache -+ -+# Qt writes a weird ‘libraryPath’ line to -+# ~/.config/Trolltech.conf that causes the KDE plugin -+# paths of previous KDE invocations to be searched. -+# Obviously using mismatching KDE libraries is potentially -+# disastrous, so here we nuke references to the Nix store -+# in Trolltech.conf. A better solution would be to stop -+# Qt from doing this wackiness in the first place. -+if [ -e $HOME/.config/Trolltech.conf ]; then -+ @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf -+fi -+ -+# (NixOS) We run kbuildsycoca5 before starting the user session because things -+# may be missing or moved if they have run nixos-rebuild and it may not be -+# possible for them to start Konsole to run it manually! -+@kbuildsycoca5@ -+ - if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing -@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`qtpaths --binaries-dir` -- qdbus=$qbindir/qdbus -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --else -- qdbus=qdbus --fi -- - # Check if a KDE session already is running and whether it's possible to connect to X --kcheckrunning -+@kcheckrunning@ - kcheckrunning_result=$? - if test $kcheckrunning_result -eq 0 ; then -- echo "KDE seems to be already running on this display." -- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null -+ echo "KDE seems to be already running on this display." -+ @xmessage@ -geometry 500x100 "KDE seems to be already running on this display." - exit 1 - elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." -- exit 1 -+ exit 1 - fi - - # Boot sequence: -@@ -57,13 +72,8 @@ fi - # * Then ksmserver is started which takes control of the rest of the startup sequence - - # We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html --fi -- --mkdir -p $configDir -+configDir=$(@qtpaths@ --writable-path GenericConfigLocation) -+mkdir -p "$configDir" - - #This is basically setting defaults so we can use them with kstartupconfig5 - cat >$configDir/startupconfigkeys <<EOF -@@ -102,42 +112,10 @@ XftSubPixel=none - EOF - } - --# Make sure the Oxygen font is installed --# This is necessary for setups where CMAKE_INSTALL_PREFIX --# is not in /usr. fontconfig looks in /usr, ~/.fonts and --# $XDG_DATA_HOME for fonts. In this case, we symlink the --# Oxygen font under ${XDG_DATA_HOME} and make it known to --# fontconfig -- --usr_share="/usr/share" --install_share="@KDE_INSTALL_FULL_DATADIR@" -- --if [ ! $install_share = $usr_share ]; then -- -- if [ ${XDG_DATA_HOME} ]; then -- fontsDir="${XDG_DATA_HOME}/fonts" -- else -- fontsDir="${HOME}/.fonts" -- fi -- -- test -d $fontsDir || { -- mkdir -p $fontsDir -- } -- -- oxygenDir=$fontsDir/oxygen -- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" -- -- # if the oxygen dir doesn't exist, create a symlink to be sure that the -- # Oxygen font is available to the user -- test -d $oxygenDir || test -d $prefixDir && { -- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir -- } --fi -- --kstartupconfig5 -+@out@/bin/kstartupconfig5 - returncode=$? - if test $returncode -ne 0; then -- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." -+ @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." - exit 1 - fi - [ -r $configDir/startupconfig ] && . $configDir/startupconfig -@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor - export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor - fi - -+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":") -+export XCURSOR_PATH -+ - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver - if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then -- @EXPORT_XCURSOR_PATH@ - - kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then -@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem - fi - fi - --if test "$kcmfonts_general_forcefontdpi" -ne 0; then -- xrdb -quiet -merge -nocpp <<EOF --Xft.dpi: $kcmfonts_general_forcefontdpi --EOF --fi -+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard -+# from some users that they're confused and don't know what to do. This is -+# especially necessary on slow machines, where starting KDE takes one or two -+# minutes until anything appears on the screen. -+# -+# If the user has overwritten fonts, the cursor font may be different now -+# so don't move this up. -+# -+@xsetroot@ -cursor_name left_ptr - - dl=$DESKTOP_LOCKED - unset DESKTOP_LOCKED # Don't want it in the environment - -+# Make sure that D-Bus is running -+# D-Bus autolaunch is broken -+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -+ eval `@dbus-launch@ --sh-syntax --exit-with-session` -+fi -+if @qdbus@ >/dev/null 2>/dev/null; then -+ : # ok -+else -+ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+ @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -+ exit 1 -+fi -+ - ksplash_pid= - if test -z "$dl"; then - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in - KSplashQML) -- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` -+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` - ;; - None) - ;; -@@ -201,8 +199,7 @@ fi - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g') - - # Add /env/ to the directory to locate the scripts to be sourced - for prefix in `echo $scriptpath`; do -@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override - usr_fdir=$HOME/.fonts - - if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -+ kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts - else -@@ -245,23 +242,13 @@ fi - # add the user's dirs to the font path, as they might simply have been made - # read-only by the administrator, for whatever reason. - --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -+test -d "$sys_odir" && @xset@ +fp "$sys_odir" -+test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" ) -+test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" ) -+test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir" - - # Ask X11 to rebuild its font list. --xset fp rehash -- --# Set a left cursor instead of the standard X11 "X" cursor, since I've heard --# from some users that they're confused and don't know what to do. This is --# especially necessary on slow machines, where starting KDE takes one or two --# minutes until anything appears on the screen. --# --# If the user has overwritten fonts, the cursor font may be different now --# so don't move this up. --# --xsetroot -cursor_name left_ptr -+@xset@ fp rehash - - # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap - if test -n "$GS_LIB" ; then -@@ -274,26 +261,6 @@ fi - - echo 'startkde: Starting up...' 1>&2 - --# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. --# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend --# to set it to a list of paths *not* including the KDE prefix if it's not /usr or --# /usr/local. --if test -z "$XDG_DATA_DIRS"; then -- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" --fi --export XDG_DATA_DIRS -- --# Make sure that D-Bus is running --if $qdbus >/dev/null 2>/dev/null; then -- : # ok --else -- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -- exit 1 --fi -- -- - # Mark that full KDE session is running (e.g. Konqueror preloading works only - # with full KDE running). The KDE_FULL_SESSION property can be detected by - # any X client connected to the same X session, even if not launched -@@ -318,11 +285,11 @@ fi - # - KDE_FULL_SESSION=true - export KDE_FULL_SESSION --xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - - KDE_SESSION_VERSION=5 - export KDE_SESSION_VERSION --xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - - KDE_SESSION_UID=`id -ru` - export KDE_SESSION_UID -@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP - - # At this point all the environment is ready, let's send it to kwalletd if running - if test -n "$PAM_KWALLET_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -+ env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN - fi - # ...and also to kwalletd5 - if test -n "$PAM_KWALLET5_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN -+ env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN - fi - - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@@ -349,18 +316,18 @@ if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not sync environment to dbus." -+ @xmessage@ -geometry 500x100 "Could not sync environment to dbus." - exit 1 - fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." -+ @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 - fi - -@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS="" - test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" --kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS -+@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." -+ @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation." - fi - --wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true` - - if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) -- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 -- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way -- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- $qdbus "$address" "/MainApplication" "quit" -+ @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do -+ @qdbus@ "$address" "/MainApplication" "quit" - done - break - fi -@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - - # Clean up --kdeinit5_shutdown -+@kdeinit5_shutdown@ - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@xprop@ -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@xprop@ -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startkde: Done.' 1>&2 diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 7d5447ae52ab..bb04df6134d4 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { vte_290 libgee gsettings_desktop_schemas defaultIconTheme ]; meta = { - description = "elementary OS's terminal"; + description = "Elementary OS's terminal"; longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; homepage = https://launchpad.net/pantheon-terminal; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 3a3670279c62..f9dc99ee2f8f 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "A programming language for the analysis and transformation of computer languages"; homepage = http://www.colm.net/open-source/colm; license = licenses.gpl2; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix index 030378e1811b..3b17722b91d8 100644 --- a/pkgs/development/compilers/elm/packages/elm-repl.nix +++ b/pkgs/development/compilers/elm/packages/elm-repl.nix @@ -24,6 +24,6 @@ mkDerivation { ]; jailbreak = true; homepage = "https://github.com/elm-lang/elm-repl"; - description = "a REPL for Elm"; + description = "A REPL for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index 9c540b0c10eb..5403c29baab4 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/kripken/emscripten-fastcomp; - description = "emscripten llvm"; + description = "Emscripten llvm"; platforms = platforms.all; maintainers = with maintainers; [ qknight matthewbauer ]; license = stdenv.lib.licenses.ncsa; diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix deleted file mode 100644 index 9909c49e1435..000000000000 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: - -# This wrapper works only with GHC 6.12 or later. -assert stdenv.lib.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 -# that package in Nix that honors these environment variables -# -# NIX_GHC -# NIX_GHCPKG -# NIX_GHC_DOCDIR -# NIX_GHC_LIBDIR -# -# instead of hard-coding the paths. The wrapper sets these variables -# appropriately to configure ghc-paths to point back to the wrapper -# instead of to the pristine GHC package, which doesn't know any of the -# additional libraries. -# -# A good way to import the environment set by the wrapper below into -# your shell is to add the following snippet to your ~/.bashrc: -# -# if [ -e ~/.nix-profile/bin/ghc ]; then -# eval $(grep export ~/.nix-profile/bin/ghc) -# fi - -let - ghc761OrLater = stdenv.lib.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"; - isHaskellPkg = x: (x ? pname) && (x ? version); -in -if packages == [] then ghc else -buildEnv { - name = "haskell-env-${ghc.name}"; - paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; - inherit ignoreCollisions; - postBuild = '' - . ${makeWrapper}/nix-support/setup-hook - - for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags '"-B$NIX_GHC_LIBDIR"' \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" - done - - for prg in runghc runhaskell; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags "-f $out/bin/ghc" \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" - done - - for prg in ghc-pkg ghc-pkg-${ghc.version}; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" - done - - $out/bin/ghc-pkg recache - ''; -} diff --git a/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch index bf83f169cfc3..6dd756f01cc2 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch +++ b/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch @@ -1,16 +1,18 @@ -diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt ---- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 -+++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 -@@ -56,7 +56,7 @@ +--- libcxx-3.8.0.src.org/lib/CMakeLists.txt 2015-12-16 15:41:05.000000000 -0800 ++++ libcxx-3.8.0.src/lib/CMakeLists.txt 2016-06-17 19:40:00.293394500 -0700 +@@ -94,30 +94,30 @@ + add_definitions(-D__STRICT_ANSI__) + add_link_flags( "-compatibility_version 1" - "-current_version ${LIBCXX_VERSION}" - "-install_name /usr/lib/libc++.1.dylib" + "-current_version 1" +- "-install_name /usr/lib/libc++.1.dylib" - "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" ++ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" + "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" "/usr/lib/libSystem.B.dylib") else() -@@ -64,14 +64,14 @@ + if ( ${CMAKE_OSX_SYSROOT} ) list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) if (OSX_HAS_ARMV7) set(OSX_RE_EXPORT_LINE @@ -23,8 +25,15 @@ diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/C + "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") endif() else() -- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") -+ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") +- set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") ++ set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") endif() - list(APPEND link_flags + add_link_flags( + "-compatibility_version 1" +- "-install_name /usr/lib/libc++.1.dylib" ++ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" + "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" + "${OSX_RE_EXPORT_LINE}" + "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp" + "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp") diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index e4da582857a1..f10dcb6784ca 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include") ''; - patches = [ ./darwin.patch ]; + patches = lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index fe69130e71a7..ca8a74c28bb6 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -15,12 +15,14 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "008fdbyza13ym3v0xpans4z4azw4y16hcbgrrnc4rx2mxwaw62ws"; - - patchPhase = '' - sed -i 's|/usr/bin/env||' \ - scripts/Python/finish-swig-Python-LLDB.sh \ - scripts/Python/build-swig-Python.sh + src = fetch "lldb" "0dasg12gf5crrd9pbi5rd1y8vwlgqp8nxgw9g4z47w3x2i28zxp3"; + + postUnpack = '' + # Hack around broken standalone builf as of 3.8 + unpackFile ${llvm.src} + srcDir="$(ls -d lldb-*.src)" + mkdir -p "$srcDir/tools/lib/Support" + cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/" ''; buildInputs = [ cmake python which swig ncurses zlib libedit ]; @@ -33,7 +35,9 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" + "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" + "-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include" "-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MINOR=7" ]; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 983f86531dc9..7e8312549da9 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { inherit stdenv coreutils autoconf automake smlnj; meta = { - description = "a parallel, pure variant of Standard ML"; + description = "A parallel, pure variant of Standard ML"; longDescription = '' Manticore is a high-level parallel programming language aimed at diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index 9ed5b8950e95..64d86aaac0d5 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "microscheme-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchzip { name = "${name}-src"; url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz"; - sha256 = "0ly1cphvnsip70kng9q0blb07pkyp9allav42sr6ybswqfqg60j9"; + sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"; }; buildInputs = [ makeWrapper vim ]; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 4bee8ee4f357..7cb3dddd5eb1 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, which, llvmPackages, ncurses, lua }: +{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }: let luajitArchive = "LuaJIT-2.0.4.tar.gz"; @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { ''; preBuild = '' + cat >Makefile.inc<<EOF + CLANG = ${stdenv.lib.getBin llvmPackages.clang-unwrapped}/bin/clang + LLVM_CONFIG = ${stdenv.lib.getBin llvmPackages.llvm}/bin/llvm-config + EOF + mkdir -p build cp ${luajitSrc} build/${luajitArchive} ''; @@ -46,7 +51,11 @@ stdenv.mkDerivation rec { '' ; - buildInputs = with llvmPackages; [ which lua llvm clang-unwrapped ncurses ]; + postFixup = '' + paxmark m $bin/bin/terra + ''; + + buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a473930e080c..725c659f0f6c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -76,7 +76,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1cmyf94jvfjwiibmhkkbrplq63g1yvy5kn65993zs10zgcfip3jb"; + sha256 = "1b154qskvcldk4kyzcbaw6mijrsn9327wldxwcv16a8zz39gvc5r"; rev = drv.version; }; })).override { diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 5742694a6fa2..52a3b20cb41e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1524,6 +1524,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_10"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1776,6 +1777,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2327,6 +2329,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2875,6 +2878,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2958,6 +2962,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2991,6 +2996,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4890,6 +4896,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5956,6 +5963,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6112,6 +6122,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6264,6 +6275,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6785,6 +6797,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 3e7b3275d9c2..3889c9d5701e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1524,6 +1524,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_10"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1776,6 +1777,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2327,6 +2329,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2875,6 +2878,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2958,6 +2962,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2991,6 +2996,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4890,6 +4896,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5956,6 +5963,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6112,6 +6122,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6264,6 +6275,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6785,6 +6797,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 24891d39c208..f60908c78961 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1524,6 +1524,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_10"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1776,6 +1777,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2327,6 +2329,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2875,6 +2878,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2958,6 +2962,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2991,6 +2996,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4890,6 +4896,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5956,6 +5963,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6112,6 +6122,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6264,6 +6275,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6785,6 +6797,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 2e1ca440f708..4e8bdf0caf22 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1524,6 +1524,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_10"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1776,6 +1777,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2327,6 +2329,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2875,6 +2878,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2958,6 +2962,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2991,6 +2996,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4890,6 +4896,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5956,6 +5963,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6112,6 +6122,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6264,6 +6275,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6785,6 +6797,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 43831ddae192..644be6366c3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1524,6 +1524,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_10"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1776,6 +1777,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2327,6 +2329,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2875,6 +2878,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2958,6 +2962,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2991,6 +2996,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4888,6 +4894,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5954,6 +5961,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6110,6 +6120,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6262,6 +6273,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6783,6 +6795,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index cdcc13118464..37538ba4c569 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1524,6 +1524,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_10"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1776,6 +1777,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2327,6 +2329,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2875,6 +2878,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2958,6 +2962,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2991,6 +2996,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4888,6 +4894,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5954,6 +5961,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6110,6 +6120,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6262,6 +6273,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6783,6 +6795,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 84de48986d16..7a002a805e3e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1523,6 +1523,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1775,6 +1776,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2326,6 +2328,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2874,6 +2877,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2957,6 +2961,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2990,6 +2995,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4886,6 +4892,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5952,6 +5959,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6108,6 +6118,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6260,6 +6271,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6781,6 +6793,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 12803bb1d5af..23ddf9de77fc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1523,6 +1523,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1775,6 +1776,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2326,6 +2328,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_5_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2874,6 +2877,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2957,6 +2961,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2990,6 +2995,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4886,6 +4892,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5952,6 +5959,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6108,6 +6118,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6260,6 +6271,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6781,6 +6793,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 9524c9d20521..b0fc788f7929 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -1521,6 +1521,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1773,6 +1774,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2322,6 +2324,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2869,6 +2872,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2952,6 +2956,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2985,6 +2990,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4879,6 +4885,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5945,6 +5952,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6101,6 +6111,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6253,6 +6264,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6774,6 +6786,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 76d093aa35a0..2db9ee2f399d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -1521,6 +1521,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1773,6 +1774,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2321,6 +2323,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2867,6 +2870,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2949,6 +2953,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2982,6 +2987,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4873,6 +4879,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5939,6 +5946,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6094,6 +6104,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6246,6 +6257,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6767,6 +6779,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 8e1f7b76658f..63d236cdd885 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_0"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4862,6 +4868,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5922,6 +5929,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6077,6 +6087,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6228,6 +6239,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6748,6 +6760,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 26a495423c0e..ceb2866914d6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_0"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4861,6 +4867,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5919,6 +5926,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6074,6 +6084,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6225,6 +6236,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6745,6 +6757,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index a70a4271d2c3..5d2a36beeda5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4861,6 +4867,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5919,6 +5926,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6074,6 +6084,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6225,6 +6236,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6745,6 +6757,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index b9a17ca0df9f..12b2c92803a4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4860,6 +4866,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5918,6 +5925,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6073,6 +6083,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6224,6 +6235,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6744,6 +6756,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index f78230efb6d4..017cb2217a7b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -1519,6 +1519,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1770,6 +1771,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2316,6 +2318,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2860,6 +2863,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2942,6 +2946,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2975,6 +2980,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4857,6 +4863,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5915,6 +5922,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6070,6 +6080,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6221,6 +6232,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6741,6 +6753,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 42d2e2181e15..3253f21c28e0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -1518,6 +1518,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1769,6 +1770,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2314,6 +2316,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2857,6 +2860,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2939,6 +2943,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2972,6 +2977,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4853,6 +4859,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5911,6 +5918,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6066,6 +6076,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6215,6 +6226,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6735,6 +6747,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 285871ee4d9b..2ac9e02a55a3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -1521,6 +1521,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1773,6 +1774,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2320,6 +2322,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2865,6 +2868,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2947,6 +2951,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2980,6 +2985,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4870,6 +4876,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5936,6 +5943,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6091,6 +6101,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6243,6 +6254,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6763,6 +6775,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index c4240081da89..d6f34df0e794 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2319,6 +2321,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2864,6 +2867,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2946,6 +2950,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2979,6 +2984,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4867,6 +4873,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5933,6 +5940,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6088,6 +6098,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6239,6 +6250,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6759,6 +6771,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index ee5543333b99..5cd8685d33e1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4866,6 +4872,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5932,6 +5939,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6087,6 +6097,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6238,6 +6249,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6758,6 +6770,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 366a5e152295..c82a1899edd6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4866,6 +4872,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5927,6 +5934,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6082,6 +6092,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6233,6 +6244,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6753,6 +6765,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index fa0f97d33483..f7acdfa9e22c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4863,6 +4869,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5923,6 +5930,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6078,6 +6088,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6229,6 +6240,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6749,6 +6761,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index d73347288dab..4f1d3404bd0e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -1520,6 +1520,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1772,6 +1773,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2318,6 +2320,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_6_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2863,6 +2866,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2945,6 +2949,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2978,6 +2983,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4862,6 +4868,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5922,6 +5929,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6077,6 +6087,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6228,6 +6239,7 @@ self: super: { "mysql-simple" = doDistribute super."mysql-simple_0_2_2_4"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6748,6 +6760,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index a10dc99017f3..34522b77bd65 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1511,6 +1511,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1762,6 +1763,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2305,6 +2307,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2846,6 +2849,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2928,6 +2932,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2961,6 +2966,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4838,6 +4844,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5882,6 +5889,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6035,6 +6045,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6181,6 +6192,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6698,6 +6710,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index fd572d72805e..8f14cd279d92 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1511,6 +1511,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1762,6 +1763,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2305,6 +2307,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2846,6 +2849,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2928,6 +2932,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2961,6 +2966,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4838,6 +4844,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5882,6 +5889,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6035,6 +6045,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6181,6 +6192,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6698,6 +6710,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index aeec177fd1b6..23bbc0388cef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1505,6 +1505,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1755,6 +1756,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2297,6 +2299,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_8"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2836,6 +2839,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2918,6 +2922,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2950,6 +2955,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4823,6 +4829,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5862,6 +5869,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6015,6 +6025,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6162,6 +6173,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6677,6 +6689,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 3206256936c8..225576a8845e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2296,6 +2298,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2835,6 +2838,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2917,6 +2921,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2949,6 +2954,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4822,6 +4828,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5861,6 +5868,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6014,6 +6024,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6161,6 +6172,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6675,6 +6687,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index f57f07fe4549..e4db44bd7ad9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2296,6 +2298,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2835,6 +2838,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2917,6 +2921,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2949,6 +2954,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4822,6 +4828,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5861,6 +5868,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6014,6 +6024,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6161,6 +6172,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6675,6 +6687,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 2e445206b6ba..a9949becbcc8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2296,6 +2298,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2835,6 +2838,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2917,6 +2921,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2949,6 +2954,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4822,6 +4828,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5860,6 +5867,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6013,6 +6023,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6160,6 +6171,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6674,6 +6686,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index d09497eb38d7..0b984a5a5675 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2296,6 +2298,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2835,6 +2838,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2917,6 +2921,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2949,6 +2954,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4820,6 +4826,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5858,6 +5865,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6011,6 +6021,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6158,6 +6169,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6672,6 +6684,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 671e067536c0..386ac10e67f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2296,6 +2298,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2835,6 +2838,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2917,6 +2921,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2949,6 +2954,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4819,6 +4825,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5857,6 +5864,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6009,6 +6019,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6156,6 +6167,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6670,6 +6682,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 6476d75ae665..d284ed5605f8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2295,6 +2297,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2833,6 +2836,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2915,6 +2919,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2947,6 +2952,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4816,6 +4822,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5853,6 +5860,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6005,6 +6015,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6152,6 +6163,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6666,6 +6678,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 320f96399466..7a66ba7c4a34 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2294,6 +2296,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2832,6 +2835,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2914,6 +2918,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2946,6 +2951,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4813,6 +4819,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5850,6 +5857,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6002,6 +6012,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6149,6 +6160,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6662,6 +6674,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index f73fd049b52d..33f83845549c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2293,6 +2295,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2831,6 +2834,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2913,6 +2917,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2945,6 +2950,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4811,6 +4817,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5848,6 +5855,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6000,6 +6010,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6147,6 +6158,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6659,6 +6671,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -8076,6 +8089,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index c331ed44872b..e9ad8ff9a49e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2293,6 +2295,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2831,6 +2834,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2913,6 +2917,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2945,6 +2950,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4810,6 +4816,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5847,6 +5854,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5999,6 +6009,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6146,6 +6157,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6658,6 +6670,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -8075,6 +8088,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index b96d09e19962..ac0301a706ac 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1510,6 +1510,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1761,6 +1762,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2303,6 +2305,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2844,6 +2847,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2926,6 +2930,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2959,6 +2964,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4836,6 +4842,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5880,6 +5887,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6033,6 +6043,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6179,6 +6190,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6696,6 +6708,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 98a1080204ed..66771ba9bae3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2293,6 +2295,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2831,6 +2834,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2913,6 +2917,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2945,6 +2950,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4810,6 +4816,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5847,6 +5854,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5999,6 +6009,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6146,6 +6157,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6658,6 +6670,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -8074,6 +8087,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index a3e430f6043f..8e8af435cc3f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2293,6 +2295,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2831,6 +2834,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2913,6 +2917,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2945,6 +2950,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4810,6 +4816,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5847,6 +5854,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5999,6 +6009,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6146,6 +6157,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6658,6 +6670,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -8073,6 +8086,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 64a305ddd93d..fe76d9223656 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1504,6 +1504,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1754,6 +1755,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2293,6 +2295,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2831,6 +2834,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2913,6 +2917,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2945,6 +2950,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4809,6 +4815,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5846,6 +5853,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5998,6 +6008,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6145,6 +6156,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6657,6 +6669,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -8072,6 +8085,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 6919b09cb074..b8c5444ef40b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1510,6 +1510,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1761,6 +1762,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2303,6 +2305,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2844,6 +2847,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2926,6 +2930,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2959,6 +2964,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4835,6 +4841,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5878,6 +5885,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6031,6 +6041,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6177,6 +6188,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6694,6 +6706,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 7a5dddccdcbf..4f617d0365f9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1510,6 +1510,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1761,6 +1762,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2303,6 +2305,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2844,6 +2847,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2926,6 +2930,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2959,6 +2964,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4835,6 +4841,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5878,6 +5885,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6031,6 +6041,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6177,6 +6188,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6693,6 +6705,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 569e0244fd61..983aac5a2aad 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1510,6 +1510,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1761,6 +1762,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2303,6 +2305,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2843,6 +2846,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2925,6 +2929,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2958,6 +2963,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4834,6 +4840,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5877,6 +5884,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6030,6 +6040,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6176,6 +6187,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6692,6 +6704,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index a503dcadb7c0..f2151df22064 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1508,6 +1508,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1758,6 +1759,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2300,6 +2302,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_3"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2840,6 +2843,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2922,6 +2926,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2955,6 +2960,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4830,6 +4836,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5873,6 +5880,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6026,6 +6036,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6172,6 +6183,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6687,6 +6699,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 73900dd499ba..a826d645dd4e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1508,6 +1508,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1758,6 +1759,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2300,6 +2302,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_3"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2840,6 +2843,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2922,6 +2926,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2955,6 +2960,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4830,6 +4836,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5873,6 +5880,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6026,6 +6036,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6173,6 +6184,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6688,6 +6700,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index b126a892bcbb..8d9ea7e613f4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1507,6 +1507,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1757,6 +1758,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2299,6 +2301,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_7_3"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2839,6 +2842,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2921,6 +2925,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2954,6 +2959,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4828,6 +4834,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5871,6 +5878,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6024,6 +6034,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6171,6 +6182,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6686,6 +6698,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index a09e300bbbe2..afb9345c455e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1505,6 +1505,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1755,6 +1756,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2297,6 +2299,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_8"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2837,6 +2840,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2919,6 +2923,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2951,6 +2956,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4824,6 +4830,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5865,6 +5872,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -6018,6 +6028,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = dontDistribute super."monad-unlift"; @@ -6165,6 +6176,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6680,6 +6692,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index f55a8e6e2e48..cc302fd1d4e0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -1471,6 +1471,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1711,6 +1712,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2242,6 +2244,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2770,6 +2773,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2851,6 +2855,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2883,6 +2888,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4721,6 +4727,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5732,6 +5739,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5878,6 +5888,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -6022,6 +6033,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6525,6 +6537,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7922,6 +7935,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 0c5c23dad7eb..1244f9c64533 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -1470,6 +1470,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1710,6 +1711,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2241,6 +2243,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2769,6 +2772,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2850,6 +2854,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2882,6 +2887,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4719,6 +4725,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5729,6 +5736,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5875,6 +5885,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -6019,6 +6030,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6522,6 +6534,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7917,6 +7930,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 5a0d5f3a2b0c..98fed6240616 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -1465,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1704,6 +1705,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2233,6 +2235,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2759,6 +2762,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2839,6 +2843,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2871,6 +2876,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4699,6 +4705,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5704,6 +5711,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5849,6 +5859,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5992,6 +6003,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6379,6 +6391,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6492,6 +6505,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7879,6 +7893,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index a5882ee5f72d..09741aca68f8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -1465,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1704,6 +1705,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2233,6 +2235,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2759,6 +2762,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2839,6 +2843,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2871,6 +2876,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4698,6 +4704,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5703,6 +5710,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5848,6 +5858,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5991,6 +6002,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6378,6 +6390,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6491,6 +6504,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7878,6 +7892,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index ea10b878f7c2..b695321af5cd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -1465,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1704,6 +1705,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2232,6 +2234,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2758,6 +2761,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2838,6 +2842,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2870,6 +2875,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4696,6 +4702,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5701,6 +5708,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5846,6 +5856,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5989,6 +6000,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6376,6 +6388,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6488,6 +6501,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7875,6 +7889,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 427feb8f3918..ec14fd5f2fee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -1465,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1704,6 +1705,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2232,6 +2234,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2758,6 +2761,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2838,6 +2842,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2870,6 +2875,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4695,6 +4701,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5699,6 +5706,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5844,6 +5854,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5987,6 +5998,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6374,6 +6386,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6485,6 +6498,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7872,6 +7886,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 2f19425d7e0d..8b1de71834f9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -1465,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1704,6 +1705,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2232,6 +2234,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2757,6 +2760,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2837,6 +2841,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2869,6 +2874,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4694,6 +4700,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5697,6 +5704,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5842,6 +5852,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5985,6 +5996,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6372,6 +6384,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6483,6 +6496,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7870,6 +7884,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index cafeb1694950..73520e9bf870 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -1465,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1704,6 +1705,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2232,6 +2234,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2757,6 +2760,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2837,6 +2841,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2869,6 +2874,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4692,6 +4698,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5694,6 +5701,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5839,6 +5849,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5982,6 +5993,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6369,6 +6381,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6480,6 +6493,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7866,6 +7880,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 2d590d7ad7fa..088b810bfb7c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -1464,6 +1464,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1703,6 +1704,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2231,6 +2233,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2756,6 +2759,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2836,6 +2840,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2868,6 +2873,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4691,6 +4697,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5691,6 +5698,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5836,6 +5846,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5979,6 +5990,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6366,6 +6378,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6477,6 +6490,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7861,6 +7875,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 1796ee6816c6..6233acdbb060 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -1463,6 +1463,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1702,6 +1703,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2230,6 +2232,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2755,6 +2758,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2835,6 +2839,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2867,6 +2872,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4689,6 +4695,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5687,6 +5694,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5831,6 +5841,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5974,6 +5985,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6361,6 +6373,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6472,6 +6485,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7856,6 +7870,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index dbca5637c3df..e463c60c8292 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -1463,6 +1463,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1702,6 +1703,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2230,6 +2232,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2755,6 +2758,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2835,6 +2839,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2867,6 +2872,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4689,6 +4695,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5687,6 +5694,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5831,6 +5841,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5974,6 +5985,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6361,6 +6373,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6472,6 +6485,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7856,6 +7870,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 92b3243775cc..2eae8bb9f356 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -1462,6 +1462,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1701,6 +1702,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2227,6 +2229,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2752,6 +2755,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2832,6 +2836,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2864,6 +2869,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4684,6 +4690,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5681,6 +5688,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5825,6 +5835,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5968,6 +5979,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6354,6 +6366,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6465,6 +6478,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7848,6 +7862,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 964359f005a3..f43041c3fd5d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -1468,6 +1468,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1708,6 +1709,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2239,6 +2241,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2767,6 +2770,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2847,6 +2851,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2879,6 +2884,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4715,6 +4721,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5724,6 +5731,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5870,6 +5880,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -6014,6 +6025,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6517,6 +6529,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7910,6 +7923,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index 9262e91bb94f..56142bc9b48b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -1461,6 +1461,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1700,6 +1701,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2226,6 +2228,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2751,6 +2754,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2831,6 +2835,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2863,6 +2868,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4683,6 +4689,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5680,6 +5687,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5824,6 +5834,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5967,6 +5978,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6353,6 +6365,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6464,6 +6477,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7845,6 +7859,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index bf7fade77af2..2f6ee57ceb7e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -1461,6 +1461,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1700,6 +1701,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2225,6 +2227,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2750,6 +2753,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2830,6 +2834,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2862,6 +2867,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4680,6 +4686,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5675,6 +5682,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5819,6 +5829,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5961,6 +5972,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6346,6 +6358,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6457,6 +6470,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7833,6 +7847,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index 929b0099e14c..01ad6f7719d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -1461,6 +1461,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1700,6 +1701,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2225,6 +2227,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2750,6 +2753,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2830,6 +2834,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2862,6 +2867,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4679,6 +4685,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5672,6 +5679,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5816,6 +5826,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5958,6 +5969,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6343,6 +6355,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6454,6 +6467,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7830,6 +7844,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index f1a5ca54ee6f..519d47d575b7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -1468,6 +1468,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1708,6 +1709,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2239,6 +2241,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2767,6 +2770,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2847,6 +2851,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2879,6 +2884,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4713,6 +4719,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5722,6 +5729,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5868,6 +5878,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -6012,6 +6023,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6515,6 +6527,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7907,6 +7920,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 577cd9911a95..3e709266c14d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -1468,6 +1468,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1708,6 +1709,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2239,6 +2241,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2767,6 +2770,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2847,6 +2851,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2879,6 +2884,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4713,6 +4719,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5722,6 +5729,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5868,6 +5878,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -6012,6 +6023,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6515,6 +6527,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7906,6 +7919,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index f36d2fd5b850..9cf3dea41fe2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -1467,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1707,6 +1708,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2238,6 +2240,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2766,6 +2769,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2846,6 +2850,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2878,6 +2883,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4710,6 +4716,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5717,6 +5724,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5863,6 +5873,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -6006,6 +6017,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6395,6 +6407,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6508,6 +6521,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7898,6 +7912,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index c3ff6dd17f7c..7d387dd6691a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -1467,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1707,6 +1708,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2238,6 +2240,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2766,6 +2769,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2846,6 +2850,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2878,6 +2883,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4708,6 +4714,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5713,6 +5720,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5859,6 +5869,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -6002,6 +6013,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6391,6 +6403,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6504,6 +6517,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7894,6 +7908,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 5993a35d22ec..f53eddec8047 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -1466,6 +1466,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1706,6 +1707,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2237,6 +2239,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2764,6 +2767,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2844,6 +2848,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2876,6 +2881,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4705,6 +4711,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5710,6 +5717,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5856,6 +5866,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5999,6 +6010,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6388,6 +6400,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6501,6 +6514,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7888,6 +7902,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 16ba33824abe..df09f26d4739 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -1466,6 +1466,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1706,6 +1707,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2235,6 +2237,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2761,6 +2764,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2841,6 +2845,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2873,6 +2878,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4702,6 +4708,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5707,6 +5714,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5852,6 +5862,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5995,6 +6006,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6384,6 +6396,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6497,6 +6510,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7884,6 +7898,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index b6a16fefd1a2..ebd61bbbf400 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -1465,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1704,6 +1705,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2233,6 +2235,7 @@ self: super: { "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2759,6 +2762,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; @@ -2839,6 +2843,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2871,6 +2876,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4699,6 +4705,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; @@ -5704,6 +5711,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = dontDistribute super."megaparsec"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5849,6 +5859,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = dontDistribute super."monad-time"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5992,6 +6003,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-check" = dontDistribute super."nagios-check"; @@ -6381,6 +6393,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6494,6 +6507,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7881,6 +7895,7 @@ self: super: { "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index f0f19c374a35..4f367c2d5e6e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -1441,6 +1441,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1675,6 +1676,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2189,6 +2191,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2708,6 +2711,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_3_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = doDistribute super."diversity_0_7_1_1"; @@ -2786,6 +2790,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2817,6 +2822,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4556,6 +4562,7 @@ self: super: { "hspec-meta" = doDistribute super."hspec-meta_2_2_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4602,6 +4609,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5570,6 +5578,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_2_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5710,6 +5721,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5850,6 +5862,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5874,6 +5887,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5981,6 +5995,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6221,6 +6236,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6327,6 +6343,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7669,6 +7686,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 5b2bd8399275..b64eef57d3dc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -1440,6 +1440,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1674,6 +1675,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2188,6 +2190,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2707,6 +2710,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_3_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = doDistribute super."diversity_0_7_1_1"; @@ -2785,6 +2789,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2816,6 +2821,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4553,6 +4559,7 @@ self: super: { "hspec-meta" = doDistribute super."hspec-meta_2_2_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4599,6 +4606,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5561,6 +5569,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_2_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5701,6 +5712,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5841,6 +5853,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5865,6 +5878,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5972,6 +5986,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6212,6 +6227,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6318,6 +6334,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7660,6 +7677,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index db7e4388deb5..69038656e304 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -1440,6 +1440,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1674,6 +1675,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2185,6 +2187,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2703,6 +2706,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_3_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = doDistribute super."diversity_0_7_1_1"; @@ -2781,6 +2785,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2812,6 +2817,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4539,6 +4545,7 @@ self: super: { "hspec-megaparsec" = dontDistribute super."hspec-megaparsec"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4585,6 +4592,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5544,6 +5552,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_2_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5683,6 +5694,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5822,6 +5834,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5846,6 +5859,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5953,6 +5967,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6193,6 +6208,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6299,6 +6315,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7630,6 +7647,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index ccbb0576feeb..a7b032128312 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -1432,6 +1432,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1663,6 +1664,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2172,6 +2174,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2682,6 +2685,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_3_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2756,6 +2760,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2787,6 +2792,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4504,6 +4510,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4550,6 +4557,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5505,6 +5513,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5642,6 +5653,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5780,6 +5792,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5804,6 +5817,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5909,6 +5923,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6147,6 +6162,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6253,6 +6269,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7571,6 +7588,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index dc96b1cf60d9..6088c518ca23 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -1430,6 +1430,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1661,6 +1662,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2167,6 +2169,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2677,6 +2680,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_3_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2751,6 +2755,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2782,6 +2787,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4499,6 +4505,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4545,6 +4552,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5499,6 +5507,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5635,6 +5646,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5773,6 +5785,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5797,6 +5810,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5902,6 +5916,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6140,6 +6155,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6246,6 +6262,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7562,6 +7579,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix index 85d9465afb20..22cb81d468cb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix @@ -1423,6 +1423,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1653,6 +1654,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2152,6 +2154,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_11"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2654,6 +2657,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2727,6 +2731,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2758,6 +2763,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4456,6 +4462,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4501,6 +4508,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_2"; "htags" = dontDistribute super."htags"; @@ -5443,6 +5451,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5572,6 +5583,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5709,6 +5721,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5733,6 +5746,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5834,6 +5848,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6069,6 +6084,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6170,6 +6186,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7474,6 +7491,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix index 5f43e0234aa5..86bb32e24ea9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix @@ -1421,6 +1421,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1649,6 +1650,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2147,6 +2149,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2649,6 +2652,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2722,6 +2726,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2753,6 +2758,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4446,6 +4452,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4491,6 +4498,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_2"; "htags" = dontDistribute super."htags"; @@ -5432,6 +5440,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5561,6 +5572,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5698,6 +5710,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5722,6 +5735,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5823,6 +5837,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6058,6 +6073,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6159,6 +6175,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7462,6 +7479,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix index 0ca297a6d157..66401ceadfe9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix @@ -1420,6 +1420,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1648,6 +1649,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2146,6 +2148,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2648,6 +2651,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2721,6 +2725,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2751,6 +2756,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4443,6 +4449,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4488,6 +4495,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5425,6 +5433,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5551,6 +5562,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5688,6 +5700,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5712,6 +5725,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5813,6 +5827,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6048,6 +6063,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6149,6 +6165,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7450,6 +7467,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix index 480bf35aa93e..e70125dd762e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix @@ -1419,6 +1419,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = doDistribute super."authenticate-oauth_1_5_1_1"; @@ -1643,6 +1644,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2138,6 +2140,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2640,6 +2643,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2712,6 +2716,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2742,6 +2747,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4434,6 +4440,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4479,6 +4486,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5411,6 +5419,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5537,6 +5548,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5673,6 +5685,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5697,6 +5710,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5798,6 +5812,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6032,6 +6047,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6133,6 +6149,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7433,6 +7450,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.14.nix b/pkgs/development/haskell-modules/configuration-lts-5.14.nix index 454525b91769..e710a2917db6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.14.nix @@ -1415,6 +1415,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = doDistribute super."authenticate-oauth_1_5_1_1"; @@ -1639,6 +1640,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2131,6 +2133,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2631,6 +2634,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2703,6 +2707,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2733,6 +2738,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4422,6 +4428,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4467,6 +4474,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5398,6 +5406,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5523,6 +5534,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5658,6 +5670,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5682,6 +5695,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5783,6 +5797,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6017,6 +6032,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6117,6 +6133,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7413,6 +7430,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.15.nix b/pkgs/development/haskell-modules/configuration-lts-5.15.nix index 6c9037849572..3ba7c3a3ed96 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.15.nix @@ -1414,6 +1414,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = doDistribute super."authenticate-oauth_1_5_1_1"; @@ -1638,6 +1639,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2130,6 +2132,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2628,6 +2631,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2700,6 +2704,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2730,6 +2735,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4415,6 +4421,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4460,6 +4467,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5390,6 +5398,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5515,6 +5526,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_2_0"; @@ -5650,6 +5662,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5674,6 +5687,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5775,6 +5789,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6009,6 +6024,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6109,6 +6125,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7403,6 +7420,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.16.nix b/pkgs/development/haskell-modules/configuration-lts-5.16.nix index a91ca4d68802..d806763589ef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.16.nix @@ -1410,6 +1410,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = doDistribute super."authenticate-oauth_1_5_1_1"; @@ -1631,6 +1632,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2120,6 +2122,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2613,6 +2616,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2685,6 +2689,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2715,6 +2720,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4397,6 +4403,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4442,6 +4449,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5368,6 +5376,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5493,6 +5504,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_2_0"; @@ -5626,6 +5638,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5650,6 +5663,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5751,6 +5765,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -5985,6 +6000,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6085,6 +6101,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7368,6 +7385,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.17.nix b/pkgs/development/haskell-modules/configuration-lts-5.17.nix index 88c155edc1ec..f32c9293ee1d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.17.nix @@ -1408,6 +1408,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = doDistribute super."authenticate-oauth_1_5_1_1"; @@ -1628,6 +1629,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2116,6 +2118,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2609,6 +2612,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2681,6 +2685,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2711,6 +2716,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4393,6 +4399,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4438,6 +4445,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5363,6 +5371,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5488,6 +5499,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_2_0"; @@ -5621,6 +5633,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5645,6 +5658,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5745,6 +5759,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -5978,6 +5993,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6078,6 +6094,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7359,6 +7376,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.18.nix b/pkgs/development/haskell-modules/configuration-lts-5.18.nix index 7023c96e1b78..e3c40a33492f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.18.nix @@ -1407,6 +1407,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = doDistribute super."authenticate-oauth_1_5_1_1"; @@ -1627,6 +1628,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2113,6 +2115,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2602,6 +2605,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2674,6 +2678,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2704,6 +2709,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4382,6 +4388,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4427,6 +4434,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5349,6 +5357,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5472,6 +5483,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_2_0"; @@ -5604,6 +5616,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5628,6 +5641,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5727,6 +5741,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -5959,6 +5974,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6059,6 +6075,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7339,6 +7356,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix index 3875ee7f63de..bbd926c4928e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -1430,6 +1430,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1661,6 +1662,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2167,6 +2169,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2676,6 +2679,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_3_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2750,6 +2754,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2781,6 +2786,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4494,6 +4500,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4540,6 +4547,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5492,6 +5500,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5625,6 +5636,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5763,6 +5775,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5787,6 +5800,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5892,6 +5906,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6130,6 +6145,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6233,6 +6249,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7547,6 +7564,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix index da2679a84611..3dc1a2d57747 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix @@ -1428,6 +1428,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1658,6 +1659,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2163,6 +2165,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2670,6 +2673,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_3_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2744,6 +2748,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2775,6 +2780,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4483,6 +4489,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4529,6 +4536,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5479,6 +5487,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5611,6 +5622,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5749,6 +5761,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5773,6 +5786,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5878,6 +5892,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6115,6 +6130,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6218,6 +6234,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7527,6 +7544,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix index b7a1882d2408..48eb12dd4578 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix @@ -1427,6 +1427,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1657,6 +1658,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2161,6 +2163,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2665,6 +2668,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2738,6 +2742,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2769,6 +2774,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4475,6 +4481,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4521,6 +4528,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5470,6 +5478,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5602,6 +5613,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5739,6 +5751,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5763,6 +5776,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5867,6 +5881,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6103,6 +6118,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6206,6 +6222,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7514,6 +7531,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix index 8c100f0276a2..43d2013681a9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix @@ -1427,6 +1427,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1657,6 +1658,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2160,6 +2162,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2664,6 +2667,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2737,6 +2741,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2768,6 +2773,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4473,6 +4479,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4519,6 +4526,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; @@ -5468,6 +5476,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5600,6 +5611,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5737,6 +5749,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5761,6 +5774,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5865,6 +5879,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6101,6 +6116,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6204,6 +6220,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7512,6 +7529,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix index 36927ea97659..0943f741b756 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix @@ -1426,6 +1426,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1656,6 +1657,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2159,6 +2161,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_11"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2662,6 +2665,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2735,6 +2739,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2766,6 +2771,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4468,6 +4474,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4514,6 +4521,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_2"; "htags" = dontDistribute super."htags"; @@ -5461,6 +5469,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5593,6 +5604,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5730,6 +5742,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5754,6 +5767,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5857,6 +5871,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6093,6 +6108,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6195,6 +6211,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7502,6 +7519,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix index a46720c431a5..fa7f3d432125 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix @@ -1426,6 +1426,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1656,6 +1657,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2156,6 +2158,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_11"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2659,6 +2662,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2732,6 +2736,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2763,6 +2768,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4464,6 +4470,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4510,6 +4517,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_2"; "htags" = dontDistribute super."htags"; @@ -5457,6 +5465,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5588,6 +5599,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5725,6 +5737,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5749,6 +5762,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5852,6 +5866,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6088,6 +6103,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6190,6 +6206,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7497,6 +7514,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix index f6bd1ff89dc6..5440beabeda3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix @@ -1426,6 +1426,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1656,6 +1657,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2156,6 +2158,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_11"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2659,6 +2662,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2732,6 +2736,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2763,6 +2768,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4464,6 +4470,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4510,6 +4517,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_2"; "htags" = dontDistribute super."htags"; @@ -5457,6 +5465,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5588,6 +5599,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5725,6 +5737,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5749,6 +5762,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5852,6 +5866,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6088,6 +6103,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6190,6 +6206,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7497,6 +7514,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix index 500b5f9ea89b..2eeb0dc1e708 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix @@ -1425,6 +1425,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; @@ -1655,6 +1656,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2154,6 +2156,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-extra" = doDistribute super."conduit-extra_1_1_11"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2656,6 +2659,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "dixi" = doDistribute super."dixi_0_6_0_5"; "djembe" = dontDistribute super."djembe"; @@ -2729,6 +2733,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2760,6 +2765,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4459,6 +4465,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0"; @@ -4505,6 +4512,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htaglib" = doDistribute super."htaglib_1_0_2"; "htags" = dontDistribute super."htags"; @@ -5449,6 +5457,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_3_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5580,6 +5591,7 @@ self: super: { "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; "monad-time" = doDistribute super."monad-time_0_1"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0"; @@ -5717,6 +5729,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5741,6 +5754,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5843,6 +5857,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -6078,6 +6093,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -6179,6 +6195,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -7483,6 +7500,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.0.nix b/pkgs/development/haskell-modules/configuration-lts-6.0.nix index fc51dda6e097..5ccafcc7a849 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.0.nix @@ -1383,6 +1383,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1596,6 +1597,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2070,6 +2072,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2535,6 +2538,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; @@ -2601,6 +2605,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2631,6 +2636,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4049,6 +4055,7 @@ self: super: { "hnop" = dontDistribute super."hnop"; "ho-rewriting" = dontDistribute super."ho-rewriting"; "hoauth" = dontDistribute super."hoauth"; + "hoauth2" = doDistribute super."hoauth2_0_5_3_1"; "hob" = dontDistribute super."hob"; "hobbes" = dontDistribute super."hobbes"; "hobbits" = dontDistribute super."hobbits"; @@ -4260,6 +4267,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4304,6 +4312,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5195,6 +5204,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_4_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5314,6 +5326,7 @@ self: super: { "monad-stm" = dontDistribute super."monad-stm"; "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-wrap" = dontDistribute super."monad-wrap"; @@ -5440,6 +5453,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5462,6 +5476,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5558,6 +5573,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -5787,6 +5803,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -5844,6 +5861,7 @@ self: super: { "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = doDistribute super."persistable-record_0_4_0_0"; "persistent" = doDistribute super."persistent_2_2_4_1"; "persistent-audit" = dontDistribute super."persistent-audit"; "persistent-cereal" = dontDistribute super."persistent-cereal"; @@ -5884,6 +5902,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -6794,6 +6813,7 @@ self: super: { "simple-pascal" = dontDistribute super."simple-pascal"; "simple-pipe" = dontDistribute super."simple-pipe"; "simple-rope" = dontDistribute super."simple-rope"; + "simple-sendfile" = doDistribute super."simple-sendfile_0_2_24"; "simple-server" = dontDistribute super."simple-server"; "simple-sessions" = dontDistribute super."simple-sessions"; "simple-sql-parser" = dontDistribute super."simple-sql-parser"; @@ -7102,6 +7122,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; "strict-identity" = dontDistribute super."strict-identity"; @@ -7679,6 +7700,7 @@ self: super: { "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; "uniform-pair" = dontDistribute super."uniform-pair"; + "union" = doDistribute super."union_0_1_1_0"; "union-find-array" = dontDistribute super."union-find-array"; "union-map" = dontDistribute super."union-map"; "unique" = dontDistribute super."unique"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.1.nix b/pkgs/development/haskell-modules/configuration-lts-6.1.nix index 441d46d25086..f984f78ba6f8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.1.nix @@ -125,6 +125,7 @@ self: super: { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_3"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -1379,6 +1380,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1592,6 +1594,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2057,6 +2060,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2520,6 +2524,7 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distributed-static" = doDistribute super."distributed-static_0_3_4_0"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; @@ -2586,6 +2591,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2616,6 +2622,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -4014,6 +4021,7 @@ self: super: { "hnop" = dontDistribute super."hnop"; "ho-rewriting" = dontDistribute super."ho-rewriting"; "hoauth" = dontDistribute super."hoauth"; + "hoauth2" = doDistribute super."hoauth2_0_5_3_1"; "hob" = dontDistribute super."hob"; "hobbes" = dontDistribute super."hobbes"; "hobbits" = dontDistribute super."hobbits"; @@ -4224,6 +4232,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4268,6 +4277,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -5150,6 +5160,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_4_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5267,6 +5280,7 @@ self: super: { "monad-stm" = dontDistribute super."monad-stm"; "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-wrap" = dontDistribute super."monad-wrap"; @@ -5393,6 +5407,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5415,6 +5430,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5510,6 +5526,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -5737,6 +5754,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -5794,6 +5812,7 @@ self: super: { "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = doDistribute super."persistable-record_0_4_0_0"; "persistent" = doDistribute super."persistent_2_2_4_1"; "persistent-audit" = dontDistribute super."persistent-audit"; "persistent-cereal" = dontDistribute super."persistent-cereal"; @@ -5834,6 +5853,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -6729,6 +6749,7 @@ self: super: { "simple-pascal" = dontDistribute super."simple-pascal"; "simple-pipe" = dontDistribute super."simple-pipe"; "simple-rope" = dontDistribute super."simple-rope"; + "simple-sendfile" = doDistribute super."simple-sendfile_0_2_24"; "simple-server" = dontDistribute super."simple-server"; "simple-sessions" = dontDistribute super."simple-sessions"; "simple-sql-parser" = dontDistribute super."simple-sql-parser"; @@ -7036,6 +7057,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; "strict-identity" = dontDistribute super."strict-identity"; @@ -7608,6 +7630,7 @@ self: super: { "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; "uniform-pair" = dontDistribute super."uniform-pair"; + "union" = doDistribute super."union_0_1_1_0"; "union-find-array" = dontDistribute super."union-find-array"; "union-map" = dontDistribute super."union-map"; "unique" = dontDistribute super."unique"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.2.nix b/pkgs/development/haskell-modules/configuration-lts-6.2.nix index 83cb0fc4cb73..d0e37d8ade12 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.2.nix @@ -125,6 +125,7 @@ self: super: { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_3"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -1369,6 +1370,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1581,6 +1583,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -2043,6 +2046,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2503,6 +2507,7 @@ self: super: { "distributed-process-tests" = doDistribute super."distributed-process-tests_0_4_5"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; @@ -2569,6 +2574,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2599,6 +2605,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -2770,6 +2777,7 @@ self: super: { "extensible" = dontDistribute super."extensible"; "extensible-data" = dontDistribute super."extensible-data"; "external-sort" = dontDistribute super."external-sort"; + "extra" = doDistribute super."extra_1_4_9"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3985,6 +3993,7 @@ self: super: { "hnop" = dontDistribute super."hnop"; "ho-rewriting" = dontDistribute super."ho-rewriting"; "hoauth" = dontDistribute super."hoauth"; + "hoauth2" = doDistribute super."hoauth2_0_5_3_1"; "hob" = dontDistribute super."hob"; "hobbes" = dontDistribute super."hobbes"; "hobbits" = dontDistribute super."hobbits"; @@ -4195,6 +4204,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4239,6 +4249,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsx2hs" = doDistribute super."hsx2hs_0_13_4"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -4747,6 +4758,7 @@ self: super: { "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-javascript" = doDistribute super."language-javascript_0_6_0_5"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; "language-lua-qq" = dontDistribute super."language-lua-qq"; @@ -5116,6 +5128,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_4_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5233,6 +5248,7 @@ self: super: { "monad-stm" = dontDistribute super."monad-stm"; "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-wrap" = dontDistribute super."monad-wrap"; @@ -5358,6 +5374,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5380,6 +5397,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5474,6 +5492,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -5699,6 +5718,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -5754,6 +5774,7 @@ self: super: { "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = doDistribute super."persistable-record_0_4_0_0"; "persistent" = doDistribute super."persistent_2_2_4_1"; "persistent-audit" = dontDistribute super."persistent-audit"; "persistent-cereal" = dontDistribute super."persistent-cereal"; @@ -5793,6 +5814,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -6682,6 +6704,7 @@ self: super: { "simple-pascal" = dontDistribute super."simple-pascal"; "simple-pipe" = dontDistribute super."simple-pipe"; "simple-rope" = dontDistribute super."simple-rope"; + "simple-sendfile" = doDistribute super."simple-sendfile_0_2_24"; "simple-server" = dontDistribute super."simple-server"; "simple-sessions" = dontDistribute super."simple-sessions"; "simple-sql-parser" = dontDistribute super."simple-sql-parser"; @@ -6986,6 +7009,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; "strict-identity" = dontDistribute super."strict-identity"; @@ -7554,6 +7578,7 @@ self: super: { "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; "uniform-pair" = dontDistribute super."uniform-pair"; + "union" = doDistribute super."union_0_1_1_0"; "union-find-array" = dontDistribute super."union-find-array"; "union-map" = dontDistribute super."union-map"; "unique" = dontDistribute super."unique"; diff --git a/pkgs/development/haskell-modules/configuration-lts-6.3.nix b/pkgs/development/haskell-modules/configuration-lts-6.3.nix index 709ba0834c8c..712804ae0c84 100644 --- a/pkgs/development/haskell-modules/configuration-lts-6.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-6.3.nix @@ -125,6 +125,7 @@ self: super: { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_3"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -484,6 +485,7 @@ self: super: { "Hate" = dontDistribute super."Hate"; "Hawk" = dontDistribute super."Hawk"; "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = doDistribute super."Hclip_3_0_0_3"; "Hedi" = dontDistribute super."Hedi"; "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; @@ -1291,6 +1293,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "aur-api" = dontDistribute super."aur-api"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1502,6 +1505,7 @@ self: super: { "bitmap" = dontDistribute super."bitmap"; "bitmap-opengl" = dontDistribute super."bitmap-opengl"; "bitmaps" = dontDistribute super."bitmaps"; + "bits" = doDistribute super."bits_0_4"; "bits-atomic" = dontDistribute super."bits-atomic"; "bits-bytestring" = dontDistribute super."bits-bytestring"; "bits-conduit" = dontDistribute super."bits-conduit"; @@ -1955,6 +1959,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2407,6 +2412,7 @@ self: super: { "distributed-process-platform" = dontDistribute super."distributed-process-platform"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; + "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; @@ -2473,6 +2479,7 @@ self: super: { "dump" = dontDistribute super."dump"; "dunai" = dontDistribute super."dunai"; "duplo" = dontDistribute super."duplo"; + "dustme" = dontDistribute super."dustme"; "dvda" = dontDistribute super."dvda"; "dvdread" = dontDistribute super."dvdread"; "dvi-processing" = dontDistribute super."dvi-processing"; @@ -2503,6 +2510,7 @@ self: super: { "ebeats" = dontDistribute super."ebeats"; "ebnf-bff" = dontDistribute super."ebnf-bff"; "ec2-signature" = dontDistribute super."ec2-signature"; + "eccrypto" = dontDistribute super."eccrypto"; "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; @@ -2674,6 +2682,7 @@ self: super: { "extensible" = dontDistribute super."extensible"; "extensible-data" = dontDistribute super."extensible-data"; "external-sort" = dontDistribute super."external-sort"; + "extra" = doDistribute super."extra_1_4_9"; "extractelf" = dontDistribute super."extractelf"; "ez-couch" = dontDistribute super."ez-couch"; "faceted" = dontDistribute super."faceted"; @@ -3882,6 +3891,7 @@ self: super: { "hnop" = dontDistribute super."hnop"; "ho-rewriting" = dontDistribute super."ho-rewriting"; "hoauth" = dontDistribute super."hoauth"; + "hoauth2" = doDistribute super."hoauth2_0_5_3_1"; "hob" = dontDistribute super."hob"; "hobbes" = dontDistribute super."hobbes"; "hobbits" = dontDistribute super."hobbits"; @@ -4091,6 +4101,7 @@ self: super: { "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; + "hspec-setup" = doDistribute super."hspec-setup_0_1_1_0"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; @@ -4133,6 +4144,7 @@ self: super: { "hsx" = dontDistribute super."hsx"; "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; + "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; @@ -4637,6 +4649,7 @@ self: super: { "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-javascript" = doDistribute super."language-javascript_0_6_0_5"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; "language-lua-qq" = dontDistribute super."language-lua-qq"; @@ -5005,6 +5018,9 @@ self: super: { "mega-sdist" = dontDistribute super."mega-sdist"; "megaparsec" = doDistribute super."megaparsec_4_4_0"; "meldable-heap" = dontDistribute super."meldable-heap"; + "mellon-core" = dontDistribute super."mellon-core"; + "mellon-gpio" = dontDistribute super."mellon-gpio"; + "mellon-web" = dontDistribute super."mellon-web"; "melody" = dontDistribute super."melody"; "memcache" = dontDistribute super."memcache"; "memcache-conduit" = dontDistribute super."memcache-conduit"; @@ -5120,6 +5136,7 @@ self: super: { "monad-stm" = dontDistribute super."monad-stm"; "monad-supply" = dontDistribute super."monad-supply"; "monad-task" = dontDistribute super."monad-task"; + "monad-timing" = dontDistribute super."monad-timing"; "monad-tx" = dontDistribute super."monad-tx"; "monad-unify" = dontDistribute super."monad-unify"; "monad-wrap" = dontDistribute super."monad-wrap"; @@ -5242,6 +5259,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; "nagios-perfdata" = dontDistribute super."nagios-perfdata"; @@ -5264,6 +5282,7 @@ self: super: { "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; "native" = dontDistribute super."native"; + "nats" = doDistribute super."nats_1_1"; "nats-queue" = dontDistribute super."nats-queue"; "natural-number" = dontDistribute super."natural-number"; "natural-numbers" = dontDistribute super."natural-numbers"; @@ -5358,6 +5377,7 @@ self: super: { "nist-beacon" = dontDistribute super."nist-beacon"; "nitro" = dontDistribute super."nitro"; "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = doDistribute super."nix-paths_1"; "nixfromnpm" = dontDistribute super."nixfromnpm"; "nixos-types" = dontDistribute super."nixos-types"; "nkjp" = dontDistribute super."nkjp"; @@ -5582,6 +5602,7 @@ self: super: { "parser-helper" = dontDistribute super."parser-helper"; "parser241" = dontDistribute super."parser241"; "parsergen" = dontDistribute super."parsergen"; + "parsers" = doDistribute super."parsers_0_12_3"; "parsestar" = dontDistribute super."parsestar"; "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; @@ -5637,6 +5658,7 @@ self: super: { "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = doDistribute super."persistable-record_0_4_0_0"; "persistent" = doDistribute super."persistent_2_2_4_1"; "persistent-audit" = dontDistribute super."persistent-audit"; "persistent-cereal" = dontDistribute super."persistent-cereal"; @@ -5676,6 +5698,7 @@ self: super: { "phizzle" = dontDistribute super."phizzle"; "phoityne" = dontDistribute super."phoityne"; "phoityne-vscode" = dontDistribute super."phoityne-vscode"; + "phone-metadata" = dontDistribute super."phone-metadata"; "phone-numbers" = dontDistribute super."phone-numbers"; "phone-push" = dontDistribute super."phone-push"; "phonetic-code" = dontDistribute super."phonetic-code"; @@ -6484,6 +6507,7 @@ self: super: { "shadowsocks" = dontDistribute super."shadowsocks"; "shady-gen" = dontDistribute super."shady-gen"; "shady-graphics" = dontDistribute super."shady-graphics"; + "shake" = doDistribute super."shake_0_15_9"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; "shake-minify" = dontDistribute super."shake-minify"; @@ -6555,6 +6579,7 @@ self: super: { "simple-pascal" = dontDistribute super."simple-pascal"; "simple-pipe" = dontDistribute super."simple-pipe"; "simple-rope" = dontDistribute super."simple-rope"; + "simple-sendfile" = doDistribute super."simple-sendfile_0_2_24"; "simple-server" = dontDistribute super."simple-server"; "simple-sessions" = dontDistribute super."simple-sessions"; "simple-sql-parser" = dontDistribute super."simple-sql-parser"; @@ -6857,6 +6882,7 @@ self: super: { "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; + "streams" = doDistribute super."streams_3_2_1"; "strict-concurrency" = dontDistribute super."strict-concurrency"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; "strict-identity" = dontDistribute super."strict-identity"; @@ -7416,6 +7442,7 @@ self: super: { "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; "uniform-pair" = dontDistribute super."uniform-pair"; + "union" = doDistribute super."union_0_1_1_0"; "union-find-array" = dontDistribute super."union-find-array"; "union-map" = dontDistribute super."union-map"; "unique" = dontDistribute super."unique"; diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/haskell-modules/ghcjs/stage2.nix index 4b31e77ca7bd..aca4c6c7828f 100644 --- a/pkgs/development/haskell-modules/ghcjs/stage2.nix +++ b/pkgs/development/haskell-modules/ghcjs/stage2.nix @@ -312,7 +312,7 @@ ]; jailbreak = true; homepage = "http://github.com/ghcjs/ghcjs-base"; - description = "base library for GHCJS"; + description = "Base library for GHCJS"; license = stdenv.lib.licenses.mit; }) {}; Cabal = callPackage diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1a31e3560704..001473d93f7d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2068,7 +2068,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "BlogLiterately" = callPackage + "BlogLiterately_0_8_3" = callPackage ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs , containers, data-default, directory, filepath, HaXml, haxr , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc @@ -2095,6 +2095,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "BlogLiterately" = callPackage + ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs + , containers, data-default, directory, filepath, HaXml, haxr + , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc + , pandoc-citeproc, pandoc-types, parsec, process, split, strict + , tagsoup, temporary, transformers + }: + mkDerivation { + pname = "BlogLiterately"; + version = "0.8.3.1"; + sha256 = "230edb974c43c7639c89ce2415fea6f9b57d4a15078f674f2b39f6437f5be09a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bool-extras bytestring cmdargs containers + data-default directory filepath HaXml haxr highlighting-kate + hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec + process split strict tagsoup temporary transformers + ]; + executableHaskellDepends = [ base cmdargs ]; + homepage = "http://byorgey.wordpress.com/blogliterately/"; + description = "A tool for posting Haskelly articles to blogs"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "BlogLiterately-diagrams_0_1_4_3" = callPackage ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe @@ -11212,7 +11238,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Hclip" = callPackage + "Hclip_3_0_0_3" = callPackage ({ mkDerivation, base, mtl, process, strict, tasty, tasty-hunit }: mkDerivation { pname = "Hclip"; @@ -11224,6 +11250,20 @@ self: { homepage = "https://github.com/jetho/Hclip"; description = "A small cross-platform library for reading and modifying the system clipboard"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Hclip" = callPackage + ({ mkDerivation, base, mtl, process, strict }: + mkDerivation { + pname = "Hclip"; + version = "3.0.0.4"; + sha256 = "d8c80bd2d035571cd76ce4f69453e9fcef4096dbc8868eb4cfcd7eb74fe5f712"; + libraryHaskellDepends = [ base mtl process strict ]; + doCheck = false; + homepage = "https://github.com/jetho/Hclip"; + description = "A small cross-platform library for reading and modifying the system clipboard"; + license = stdenv.lib.licenses.bsd3; }) {}; "Hedi" = callPackage @@ -14280,10 +14320,8 @@ self: { }: mkDerivation { pname = "MissingH"; - version = "1.4.0.0"; - sha256 = "e7bfd371a3504cf6be9fb3e549514119f30d012be5ebb10ace84e00de27688dc"; - revision = "2"; - editedCabalFile = "fb4dda9bef0a8a75549961dd8a35d1f49372ec43b53eb6aa27cc53850ad10034"; + version = "1.4.0.1"; + sha256 = "283f2afd46625d98b4e29f77edadfa5e6009a227812ee2ece10091ad6a7e9b71"; libraryHaskellDepends = [ array base containers directory filepath hslogger HUnit mtl network old-locale old-time parsec process random regex-compat time unix @@ -16693,8 +16731,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.9.0.8"; - sha256 = "22b6f69b384eb9883560b837cdf8dbe70b76099a10818adca803298c22cbe3bd"; + version = "0.9.0.10"; + sha256 = "47cfa115c13c96a3ed7720e437db5871bce3fe3ce2b0038932747be435dd9445"; libraryHaskellDepends = [ base bytestring cairo cereal Chart Chart-cairo containers data-default-class generic-accessors glib gtk3 lens text time @@ -38621,6 +38659,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "aur-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, hspec + , http-client, http-client-tls, mtl, text + }: + mkDerivation { + pname = "aur-api"; + version = "0.1.2.1"; + sha256 = "8262daf22fa46e3eaba2dffc97bfac7c7146b8cac371cd4161b0e03e1cbed744"; + libraryHaskellDepends = [ + aeson base bytestring exceptions hspec http-client http-client-tls + mtl text + ]; + homepage = "https://github.com/wangbj/aur-api"; + description = "ArchLinux AUR json v5 API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "authenticate_1_3_2_10" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, http-conduit, http-types @@ -45113,7 +45168,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "bits" = callPackage + "bits_0_4" = callPackage ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl , transformers }: @@ -45129,6 +45184,22 @@ self: { homepage = "http://github.com/analytics/bits"; description = "Various bit twiddling and bitwise serialization primitives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bits" = callPackage + ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl + , transformers + }: + mkDerivation { + pname = "bits"; + version = "0.5"; + sha256 = "5834fbf0c5b4c5d0259f9aae9631c906e184a50606786132896307f15e406f1a"; + libraryHaskellDepends = [ base bytes mtl transformers ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/bits"; + description = "Various bit twiddling and bitwise serialization primitives"; + license = stdenv.lib.licenses.bsd3; }) {}; "bits-atomic" = callPackage @@ -45355,8 +45426,8 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.8.0.0"; - sha256 = "6df64f668a4949fe3efc5f695efef7e05edb6b6d47559ae1a95d5355eee62dd2"; + version = "0.9.0.0"; + sha256 = "9360e11c943707a18339273346e0d4ce84dd247ea9ca503d2143eb210113cf05"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types microlens microlens-th network QuickCheck scientific split text @@ -60874,8 +60945,9 @@ self: { pname = "concurrent-utilities"; version = "0.2.0.0"; sha256 = "d108b831e0631c1d3d9b5e2dbfb335b63997206384b7a069978c95a2a1af918a"; + revision = "1"; + editedCabalFile = "2b711482a361d04696567a2d07b866747e1fcd12a70b081dab94887d94cf4f6a"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "-"; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; @@ -61971,6 +62043,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conduit-merge" = callPackage + ({ mkDerivation, base, conduit, mtl }: + mkDerivation { + pname = "conduit-merge"; + version = "0.1.2.0"; + sha256 = "4d332f30af4c79c345af81072396b33e1dc26f35c9e6d9a6e51559cc46c0ce1e"; + libraryHaskellDepends = [ base conduit mtl ]; + homepage = "https://github.com/cblp/conduit-merge#readme"; + description = "Merge multiple sorted conduits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "conduit-network-stream" = callPackage ({ mkDerivation, base, bytestring, conduit, mtl, network-conduit , resourcet @@ -62128,10 +62212,8 @@ self: { }: mkDerivation { pname = "config-value"; - version = "0.4.0.1"; - sha256 = "67e92a664a7d5b80c456d3f0cdbbf6f1fc8d00710509f784221fd01c60342f35"; - revision = "1"; - editedCabalFile = "a07f958c50a175dba2f3e4ee6130a1871d14eb6cb28612b4cf040251cd026b28"; + version = "0.4.0.2"; + sha256 = "214481f20acac05b7a67dad3ce11b0965b19429c4ddb95ed1f869caffaaefc57"; libraryHaskellDepends = [ array base pretty text transformers ]; libraryToolDepends = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; @@ -66327,8 +66409,8 @@ self: { }: mkDerivation { pname = "cryptonite"; - version = "0.16"; - sha256 = "5c3bf190954986ea4af466914eb7a0c55a0b4c1c66552d00341277c89082511a"; + version = "0.17"; + sha256 = "a6c6a129b844c55580c4bfd79ecdf5bdc37ea8be6634ae7858015219111156c8"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -76666,6 +76748,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distribution-nixpkgs" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, doctest, hspec, language-nix, lens, pretty, process + , QuickCheck, split + }: + mkDerivation { + pname = "distribution-nixpkgs"; + version = "1"; + sha256 = "c4e50f2f3255171a236bfc339da545ff2a14e4cd76b0ed8b89b85653e44ff530"; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq language-nix lens + pretty process split + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers deepseq doctest hspec + language-nix lens pretty process QuickCheck split + ]; + doCheck = false; + homepage = "https://github.com/peti/distribution-nixpkgs#readme"; + description = "Types and functions to manipulate the Nixpkgs distribution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distribution-plot" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, colour, containers , data-default-class, distribution, lens @@ -77564,8 +77669,36 @@ self: { }: mkDerivation { pname = "docvim"; - version = "0.3.1.0"; - sha256 = "bb7512fb3c564c3dbe192ab5841cd6ae4a027dbccaf1b963edf487b51cf32fcb"; + version = "0.3.1.1"; + sha256 = "f8882e3b57b8273daf8728acfab4e9fa437cfc9ebe33109b4e4b10b0de98d614"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory dlist filepath lens mtl + optparse-applicative parsec pretty-show split + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers deepseq directory dlist filepath hlint + lens mtl parsec pretty-show process split tasty tasty-golden + tasty-hunit temporary + ]; + doCheck = false; + homepage = "https://github.com/wincent/docvim"; + description = "Documentation generator for Vim plug-ins"; + license = stdenv.lib.licenses.mit; + }) {}; + + "docvim_0_3_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , dlist, filepath, hlint, lens, mtl, optparse-applicative, parsec + , pretty-show, process, split, tasty, tasty-golden, tasty-hunit + , temporary + }: + mkDerivation { + pname = "docvim"; + version = "0.3.1.2"; + sha256 = "ec90fa58581a5e6c8eb17274d9fd001c1e530d1e5b31f43d56ae9b90dccb607d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77578,10 +77711,10 @@ self: { lens mtl parsec pretty-show process split tasty tasty-golden tasty-hunit temporary ]; - jailbreak = true; homepage = "https://github.com/wincent/docvim"; description = "Documentation generator for Vim plug-ins"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dom-lt" = callPackage @@ -78723,6 +78856,29 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "dustme" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, async, attoparsec + , base, bytestring, containers, deepseq, extra, hashable, hspec + , safe, semigroups, terminfo, text, unordered-containers + }: + mkDerivation { + pname = "dustme"; + version = "0.1.0.0"; + sha256 = "e0e9b1a28fef4f9b3230af437272661f3287cc13f8ddc0dd94f4177311ccaa69"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint async attoparsec base bytestring + containers deepseq extra hashable safe semigroups terminfo text + unordered-containers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/mwotton/dustme#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dvda" = callPackage ({ mkDerivation, ad, base, containers, directory, fgl , file-location, graphviz, hashable, hashtables, mtl, process @@ -79313,6 +79469,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eccrypto" = callPackage + ({ mkDerivation, base, bytestring, cereal, crypto-api, SHA, vector + }: + mkDerivation { + pname = "eccrypto"; + version = "0.0.1"; + sha256 = "fd4adad1c85bbe1b001aef804584d87b7daadba2aa7310a319e59cc616a79cc9"; + libraryHaskellDepends = [ + base bytestring cereal crypto-api SHA vector + ]; + description = "Elliptic Curve Cryptography for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ecdsa" = callPackage ({ mkDerivation, base, bytestring, crypto-api, crypto-pubkey-types , hecc @@ -83366,13 +83536,12 @@ self: { pname = "eventloop"; version = "0.8.1.2"; sha256 = "1e4a62abcfb50f949cffe61a53d37c6b7a5ad157cdaecba31f528046f36fe42e"; - revision = "1"; - editedCabalFile = "11af2a4e0a7b4c39cb552ec0f0e4f9eed48e903194983d11fb1bc11705086baa"; + revision = "3"; + editedCabalFile = "c2eeaa631bc97d0a2214829ded0eaf1411852515fe1a9d2ed5aa5a25e8e6302d"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets ]; - jailbreak = true; homepage = "-"; description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together."; license = stdenv.lib.licenses.bsd3; @@ -84818,7 +84987,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extra" = callPackage + "extra_1_4_9" = callPackage ({ mkDerivation, base, directory, filepath, process, QuickCheck , time, unix }: @@ -84835,6 +85004,26 @@ self: { homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "extra" = callPackage + ({ mkDerivation, base, directory, filepath, process, QuickCheck + , time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.4.10"; + sha256 = "b40b3f74c02e40697f4ba5242a764c2846921e8aafdd92e79a30a7afd9e56759"; + libraryHaskellDepends = [ + base directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck time unix + ]; + homepage = "https://github.com/ndmitchell/extra#readme"; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; }) {}; "extract-dependencies_0_2_0_0" = callPackage @@ -86439,8 +86628,8 @@ self: { }: mkDerivation { pname = "fbmessenger-api"; - version = "0.1.0.3"; - sha256 = "c746bea409094604698a375cbf08804799e390be1ffee4b0ffe95e2263270879"; + version = "0.1.1.0"; + sha256 = "fa50761fadbca6b88bb169b5509262f4d82ebaee25cf7855d62af15bbc5bb1c2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94995,8 +95184,8 @@ self: { ({ mkDerivation, attoparsec, base, containers, text, time }: mkDerivation { pname = "ghc-time-alloc-prof"; - version = "0.0.0"; - sha256 = "f9b40315889766b53c0ad03b6e4a2af71da558d217afdb1d6072e9672f006828"; + version = "0.0.0.1"; + sha256 = "9a3fabe71006ce604945d3195f4d3057bdf24693e483633b688f447819381b98"; libraryHaskellDepends = [ attoparsec base containers text time ]; homepage = "https://github.com/maoe/ghc-time-alloc-prof"; description = "Library for parsing GHC time and allocation profiling reports"; @@ -97050,8 +97239,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20160527"; - sha256 = "9482a13acd8b6c4cbe4f354243726e94689d0b3f516eabfbc78900e94ad67924"; + version = "6.20160613"; + sha256 = "595e1945ea42bdcd55fd6b6096cbdb64646f2391ad34eb9b45ab92190e1d5314"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -99154,8 +99343,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.7"; - sha256 = "282402385403fad10b750146f28f41d447a77592ef23d94b287edf51b7336679"; + version = "0.1.8"; + sha256 = "9c6706f4f85144caaf3455058a92f82d93a82f461e922c3500c3937ec70339ae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108592,8 +108781,8 @@ self: { }: mkDerivation { pname = "hapstone"; - version = "0.1.0.1"; - sha256 = "408ca259ec062af5bb9b6b871d07bd846ee590449efca9ab24db497aa56d2c23"; + version = "0.2.0.1"; + sha256 = "3d0e5f37edddf252df8c6f4291ba73c0c2331053086cd7583810644e1555e016"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ capstone ]; libraryToolDepends = [ c2hs ]; @@ -109227,22 +109416,22 @@ self: { }: mkDerivation { pname = "hashing"; - version = "0.1.0.0"; - sha256 = "2f1c97a3ca2acd05f9e961ed0d594521420c6a14b38568326689318265d38ac5"; + version = "0.1.0.1"; + sha256 = "e5a4a19c6cd6f0a0adda381db76d608d23f8d303e68f1d744735433f91f49410"; + revision = "1"; + editedCabalFile = "a50b8538d365ef9fbdc0083c3de91fbdbcebe5e630f36330475e0d10243e2596"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - array base bytestring mtl QuickCheck template-haskell - ]; + libraryHaskellDepends = [ array base bytestring ]; executableHaskellDepends = [ - array base bytestring mtl QuickCheck template-haskell + array base bytestring mtl QuickCheck ]; testHaskellDepends = [ array base bytestring cryptonite mtl QuickCheck template-haskell ]; - homepage = "https://github.com/wangbj/hashing/blob/master/README.md"; - description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/wangbj/hashing"; + description = "A pure haskell library implements several hash algorithms"; + license = stdenv.lib.licenses.mit; }) {}; "hashmap_1_3_0_1" = callPackage @@ -109850,10 +110039,9 @@ self: { ({ mkDerivation, base, bytestring, lens, tagsoup, wreq }: mkDerivation { pname = "haskell-fake-user-agent"; - version = "0.0.1"; - sha256 = "0aefb6f1d64ddc5f6e686bb20d84f899270beb5da7b7609d00e50768d3fa1c5a"; + version = "0.0.2"; + sha256 = "a39b379651027d108b0e2d984f6f511b689965d457b9df3ffbc0979727ee70bb"; libraryHaskellDepends = [ base bytestring lens tagsoup wreq ]; - jailbreak = true; description = "Simple library for retrieving current user agent strings"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -113050,19 +113238,19 @@ self: { }) {}; "hasql-transaction" = callPackage - ({ mkDerivation, base, base-prelude, bytestring + ({ mkDerivation, async, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras - , either, hasql, mtl, postgresql-error-codes, transformers + , hasql, mtl, rebase, transformers }: mkDerivation { pname = "hasql-transaction"; - version = "0.4.5"; - sha256 = "bac5527d7778531ffb5138f666684f008a65537afffa2327a5264c5869f15630"; + version = "0.4.5.1"; + sha256 = "79b096fa3425ff53bcb5417fd67cdcf4316c00a23c092b02cec173e5a8c99879"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant - contravariant-extras either hasql mtl postgresql-error-codes - transformers + contravariant-extras hasql mtl transformers ]; + testHaskellDepends = [ async hasql rebase ]; homepage = "https://github.com/nikita-volkov/hasql-transaction"; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; @@ -118165,19 +118353,18 @@ self: { "hipchat-hs" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring - , either, http-client, lens, network-uri, servant, servant-client - , split, string-conversions, text, time + , either, http-client, lens, network-uri, postgresql-simple + , servant, servant-client, split, string-conversions, text, time }: mkDerivation { pname = "hipchat-hs"; - version = "0.0.3"; - sha256 = "f793fe60c119608a363a2ce7cc380a8f5c99adcfac4472b990e0726397db5dd5"; + version = "0.0.4"; + sha256 = "6a712f0a4148e80cd0b5eb9c9b1a2165420a6781c72eaa298a1106d77e50c02f"; libraryHaskellDepends = [ aeson aeson-casing async base bytestring either http-client lens - network-uri servant servant-client split string-conversions text - time + network-uri postgresql-simple servant servant-client split + string-conversions text time ]; - jailbreak = true; description = "Hipchat API bindings in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121150,7 +121337,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hoauth2" = callPackage + "hoauth2_0_5_3_1" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types , text }: @@ -121164,6 +121351,23 @@ self: { homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hoauth2" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types + , text + }: + mkDerivation { + pname = "hoauth2"; + version = "0.5.4.0"; + sha256 = "dc83b0cd5ee51b9c9b28ea04417341dbd146720f43ac73792b180e205ea4cdf9"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit http-types text + ]; + homepage = "https://github.com/freizl/hoauth2"; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; }) {}; "hob" = callPackage @@ -121221,13 +121425,14 @@ self: { }: mkDerivation { pname = "hobbits"; - version = "1.2.2"; - sha256 = "568be09943c403e3bb46b4b58bcb543fbc2421fecfe8459e1976a57894657b11"; + version = "1.2.3"; + sha256 = "88a6dfa9ea8f800b6d916c0f6e92875d9132003eacde013210d97bdc999840f3"; + revision = "1"; + editedCabalFile = "3341a9644e507027bb3b890c7adba0e0c93a18f80173504ae45c1ad569d716bc"; libraryHaskellDepends = [ base deepseq haskell-src-exts haskell-src-meta mtl syb tagged template-haskell th-expand-syns transformers ]; - jailbreak = true; description = "A library for canonically representing terms with binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -123396,7 +123601,6 @@ self: { exceptions filepath hlint hspec mtl mtl-compat QuickCheck text transformers transformers-compat unix unix-bytestring ]; - doCheck = false; homepage = "https://github.com/dhess/hpio"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -127529,7 +127733,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hspec-setup" = callPackage + "hspec-setup_0_1_1_0" = callPackage ({ mkDerivation, base, directory, filepath, process, projectroot }: mkDerivation { pname = "hspec-setup"; @@ -127544,6 +127748,23 @@ self: { homepage = "https://github.com/yamadapc/haskell-hspec-setup"; description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hspec-setup" = callPackage + ({ mkDerivation, base, directory, filepath, process, projectroot }: + mkDerivation { + pname = "hspec-setup"; + version = "0.1.1.1"; + sha256 = "fd294bd10fc0fa1573e84d78ba7f6fd77e294efbaac419a5530e0818ece91109"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath process projectroot + ]; + homepage = "https://github.com/yamadapc/haskell-hspec-setup"; + description = "Add an hspec test-suite in one command"; + license = stdenv.lib.licenses.mit; }) {}; "hspec-shouldbe" = callPackage @@ -128726,6 +128947,24 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hsyslog-udp" = callPackage + ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text + , time, unix + }: + mkDerivation { + pname = "hsyslog-udp"; + version = "0.1.1"; + sha256 = "eedafcd134d2085c02b363889df5291b2062dfb51685a24a93eb133028b3aea1"; + libraryHaskellDepends = [ + base bytestring hsyslog network text time unix + ]; + testHaskellDepends = [ base hspec time ]; + jailbreak = true; + homepage = "https://github.com/ThoughtLeadr/hsyslog-udp"; + description = "Log to syslog over a network via UDP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hszephyr" = callPackage ({ mkDerivation, base, bytestring, com_err, mtl, time, zephyr }: mkDerivation { @@ -136907,8 +137146,8 @@ self: { pname = "insert-ordered-containers"; version = "0.1.0.1"; sha256 = "4905e5d128c19887a79b281150acb16cb3b043ab2c5a7788b0151ba7d46b900a"; - revision = "1"; - editedCabalFile = "845948717464c40358d8d635fa3b8240fb4a2464558527a4cfeccdf426403eaa"; + revision = "2"; + editedCabalFile = "45eb329a4ace69cd003e0eafa048cbdb3b34f17e0f835ff0f1e1bc6ac90b33dd"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -137303,8 +137542,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.14"; - sha256 = "1719348eabd877c95461c5709d9033460495245212529c211046a652c7cf4b2e"; + version = "0.1.15"; + sha256 = "ef80da6f426e31f3b2337c2c94834574ec111ce7ba3d9f2834326857506f1eba"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -138477,25 +138716,6 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "0.4.0.0"; - sha256 = "be5388f15ee90d5f58da28783c77348e424378635e13a0bb00a71369deb22a77"; - libraryHaskellDepends = [ - base bytestring conduit data-default-class irc-conduit irc-ctcp - old-locale stm stm-conduit text time transformers - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; - - "irc-client_0_4_1_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, data-default-class - , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time - , transformers - }: - mkDerivation { - pname = "irc-client"; version = "0.4.1.0"; sha256 = "2661f089733a7473f99662e2e1b97c42a48d399f98b7e076f43c2fadeedcb8f6"; libraryHaskellDepends = [ @@ -138505,7 +138725,7 @@ self: { homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "irc-colors" = callPackage @@ -138566,8 +138786,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "1.1.4"; - sha256 = "2e2b60ec96966604d38860b58901bb2f652b801c3091c3dfeaf2d8ab745dcaa5"; + version = "1.1.5"; + sha256 = "59ce88cb12164583fbd7c889f13c3524a9cdc74a59ef5cbb7a704d67b0508bd2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138580,7 +138800,6 @@ self: { network regex-tdfa split stm text time tls transformers vty x509 x509-store x509-system x509-validation ]; - jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; license = stdenv.lib.licenses.bsd3; @@ -146175,7 +146394,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-javascript" = callPackage + "language-javascript_0_6_0_5" = callPackage ({ mkDerivation, alex, array, base, blaze-builder, bytestring , Cabal, containers, happy, hspec, mtl, QuickCheck, text , utf8-light, utf8-string @@ -146195,6 +146414,29 @@ self: { homepage = "http://github.com/erikd/language-javascript"; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "language-javascript" = callPackage + ({ mkDerivation, alex, array, base, blaze-builder, bytestring + , Cabal, containers, happy, hspec, mtl, QuickCheck, text + , utf8-light, utf8-string + }: + mkDerivation { + pname = "language-javascript"; + version = "0.6.0.6"; + sha256 = "9c889992e3e8a31f6a4b1ad2d0ec46a3a182245aa423099d2313a6c5ae005b75"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers mtl text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base blaze-builder bytestring Cabal containers hspec mtl + QuickCheck utf8-light utf8-string + ]; + homepage = "http://github.com/erikd/language-javascript"; + description = "Parser for JavaScript"; + license = stdenv.lib.licenses.bsd3; }) {}; "language-kort" = callPackage @@ -147169,8 +147411,9 @@ self: { pname = "lazy-search"; version = "0.1.0.0"; sha256 = "1691e5ec0363fd3aff644ae4daad29c84ea3d3a489546949546e4fb2678b688f"; + revision = "1"; + editedCabalFile = "8aba91a790a6f69fc43f2b46c3946e1ab44b769b3335ae08973132e52f9580ce"; libraryHaskellDepends = [ base size-based ]; - jailbreak = true; description = "Finds values satisfying a lazy predicate"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -153007,8 +153250,8 @@ self: { }: mkDerivation { pname = "lua-bc"; - version = "0.1"; - sha256 = "518dcad6c16a870fe64d6d45ad83202dc9586a71dd976b652dfb5445150bd352"; + version = "0.1.0.1"; + sha256 = "c0f92db8b4c0bdc2d188c1f17833fb684489ab3147837e68bffa96375c7fa89a"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -156895,6 +157138,70 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mellon-core" = callPackage + ({ mkDerivation, async, base, doctest, hlint, hspec, mtl + , QuickCheck, quickcheck-instances, time, transformers + }: + mkDerivation { + pname = "mellon-core"; + version = "0.7.0.1"; + sha256 = "addfa2b5cd790a7cff00f48366f5ad3e25a77e3a6d8163a3914da5b1d0c79288"; + libraryHaskellDepends = [ async base mtl time transformers ]; + testHaskellDepends = [ + async base doctest hlint hspec mtl QuickCheck quickcheck-instances + time transformers + ]; + homepage = "https://github.com/dhess/mellon/"; + description = "Control physical access devices"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mellon-gpio" = callPackage + ({ mkDerivation, base, hlint, hpio, mellon-core }: + mkDerivation { + pname = "mellon-gpio"; + version = "0.7.0.1"; + sha256 = "f9585f0bcf3850437eaa689046d27e2d0df52a0d668ba0ee4f9eee155ba82380"; + libraryHaskellDepends = [ base hpio mellon-core ]; + testHaskellDepends = [ base hlint ]; + homepage = "https://github.com/dhess/mellon/"; + description = "GPIO support for mellon"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mellon-web" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, hlint, hpio + , hspec, hspec-wai, http-client, http-types, lucid, mellon-core + , mellon-gpio, mtl, network, optparse-applicative, servant + , servant-client, servant-docs, servant-lucid, servant-server, text + , time, transformers, wai, wai-extra, warp + }: + mkDerivation { + pname = "mellon-web"; + version = "0.7.0.1"; + sha256 = "dc51190cd4529f2d3844fef77edafa6c7b4c5680f7e4c422392f211bf9de46b1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types lucid mellon-core + servant servant-client servant-docs servant-lucid servant-server + text time transformers wai warp + ]; + executableHaskellDepends = [ + base exceptions hpio mellon-core mellon-gpio mtl network + optparse-applicative time transformers warp + ]; + testHaskellDepends = [ + aeson base bytestring hlint hspec hspec-wai http-client http-types + lucid mellon-core network servant servant-client servant-docs + servant-lucid servant-server text time transformers wai wai-extra + warp + ]; + homepage = "https://github.com/dhess/mellon/"; + description = "A REST web service for Mellon controllers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "melody" = callPackage ({ mkDerivation, base, containers, either, HUnit, lens, mtl, parsec , ParsecTools, test-framework, test-framework-hunit @@ -161189,6 +161496,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-timing" = callPackage + ({ mkDerivation, base, containers, exceptions, hlint, hspec + , monad-control, mtl, time, transformers, transformers-base + }: + mkDerivation { + pname = "monad-timing"; + version = "0.1.0.1"; + sha256 = "d6f05adb7975fd0c4e2ceca4bbc77cfa65ddbf60d60f343203ff68a7f3f4bd09"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl time transformers + transformers-base + ]; + testHaskellDepends = [ base containers hlint hspec transformers ]; + homepage = "https://github.com/pikajude/monad-timing"; + description = "Monad transformer for recording timing events"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-tx" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -164007,14 +164332,13 @@ self: { }: mkDerivation { pname = "murmur3"; - version = "1.0.1"; - sha256 = "5bac92e0d72d5858bdc390c5c5e234e3c3d4191d717e3d5b972d6fd3401500c3"; + version = "1.0.2"; + sha256 = "8bc485e0f30d7f67611f70e56a5908a6b1b05273fe95eedaaf65e544a1f9c0cc"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base base16-bytestring bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/plaprade/murmur3"; description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; license = stdenv.lib.licenses.publicDomain; @@ -164915,6 +165239,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mywatch" = callPackage + ({ mkDerivation, aeson, base, bytestring, ConfigFile + , data-default-class, docopt, fast-logger, http-types + , interpolatedstring-perl6, MissingH, mtl, mysql, mysql-simple + , network, resource-pool, scotty, text, unix, unordered-containers + , wai, wai-extra, wai-middleware-static, warp + }: + mkDerivation { + pname = "mywatch"; + version = "0.1.0"; + sha256 = "8b5e82086279e07e1b28ea4d0c6ef8d816cbb3ab6e05d6c6880b7c88893a70bf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring ConfigFile data-default-class docopt + fast-logger http-types interpolatedstring-perl6 MissingH mtl mysql + mysql-simple network resource-pool scotty text unix + unordered-containers wai wai-extra wai-middleware-static warp + ]; + description = "View MySQL processes"; + license = stdenv.lib.licenses.mit; + }) {}; + "mzv" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -165433,7 +165780,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nats" = callPackage + "nats_1_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "nats"; @@ -165443,6 +165790,19 @@ self: { homepage = "http://github.com/ekmett/nats/"; description = "Natural numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nats" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "nats"; + version = "1.1.1"; + sha256 = "131d1b4857cd1c0699ef60aeb41af923ee3e0ecd26ed1324c067d993bc17d4cd"; + doHaddock = false; + homepage = "http://github.com/ekmett/nats/"; + description = "Natural numbers"; + license = stdenv.lib.licenses.bsd3; }) {}; "nats-queue" = callPackage @@ -167941,25 +168301,31 @@ self: { }) {}; "neural" = callPackage - ({ mkDerivation, ad, array, attoparsec, base, deepseq, directory - , doctest, filepath, ghc-typelits-natnormalise, Glob, hspec, lens - , MonadRandom, mtl, parallel, pipes, profunctors, STMonadTrans - , text, transformers, typelits-witnesses, vector + ({ mkDerivation, ad, array, attoparsec, base, bytestring, deepseq + , directory, doctest, filepath, ghc-typelits-natnormalise, Glob + , hspec, JuicyPixels, kan-extensions, lens, monad-par + , monad-par-extras, MonadRandom, mtl, parallel, pipes + , pipes-bytestring, pipes-safe, pipes-zlib, profunctors, reflection + , STMonadTrans, text, transformers, typelits-witnesses, vector }: mkDerivation { pname = "neural"; - version = "0.1.1.0"; - sha256 = "222ef9b9feaaf5fcd4577e60c18d9a2cf9feed9dbdbe8f63d997b9b5a7f435c6"; + version = "0.2.0.0"; + sha256 = "d5dcb82fbd3073a84a9e1a1585a02c10bc4aed643099bcc44b0580be4dcf4c92"; revision = "1"; - editedCabalFile = "db2bcbca3e967c456dfcc752db6bce9a3b69febd01cffa34ea28a7f1f4677088"; + editedCabalFile = "d512a196ec408e464c4613d1b63e8b5a0a3abb49b61c87e012c9cc38c41434c6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ad array base deepseq directory filepath ghc-typelits-natnormalise - hspec lens MonadRandom mtl parallel pipes profunctors STMonadTrans - text transformers typelits-witnesses vector + ad array base bytestring deepseq directory filepath + ghc-typelits-natnormalise hspec kan-extensions lens monad-par + monad-par-extras MonadRandom mtl parallel pipes pipes-bytestring + pipes-safe profunctors reflection STMonadTrans text transformers + typelits-witnesses vector + ]; + executableHaskellDepends = [ + array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text ]; - executableHaskellDepends = [ attoparsec base MonadRandom text ]; testHaskellDepends = [ base doctest Glob hspec MonadRandom ]; jailbreak = true; homepage = "https://github.com/brunjlar/neural"; @@ -168317,7 +168683,7 @@ self: { license = "GPL"; }) {}; - "nix-paths" = callPackage + "nix-paths_1" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { pname = "nix-paths"; @@ -168330,6 +168696,20 @@ self: { homepage = "https://github.com/peti/nix-paths"; description = "Knowledge of Nix's installation directories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) nix;}; + + "nix-paths" = callPackage + ({ mkDerivation, base, nix, process }: + mkDerivation { + pname = "nix-paths"; + version = "1.0.0.1"; + sha256 = "742da2042caa20d63690e9c6de632eebd71b863001eb2c71645f8c72d3e9f315"; + libraryHaskellDepends = [ base process ]; + libraryToolDepends = [ nix ]; + homepage = "https://github.com/peti/nix-paths"; + description = "Knowledge of Nix's installation directories"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) nix;}; "nixfromnpm" = callPackage @@ -173254,6 +173634,8 @@ self: { pname = "pandoc"; version = "1.17.1"; sha256 = "5978baaf664ce254b508108a6be9d5a11a2c2ac61462ae85286be2ecdb010c86"; + revision = "1"; + editedCabalFile = "0ceaa11f58bcbaa0b3aa8babf7a92de818ff331f38193c8e42ee8bc174113681"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -174748,7 +175130,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "parsers" = callPackage + "parsers_0_12_3" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, bytestring , charset, containers, directory, doctest, filepath, parsec , QuickCheck, quickcheck-instances, scientific, text, transformers @@ -174773,6 +175155,31 @@ self: { homepage = "http://github.com/ekmett/parsers/"; description = "Parsing combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "parsers" = callPackage + ({ mkDerivation, attoparsec, base, base-orphans, bytestring + , charset, containers, directory, doctest, filepath, parsec + , QuickCheck, quickcheck-instances, scientific, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "parsers"; + version = "0.12.4"; + sha256 = "2781a27d40f0019fc671b483ca47276c826621e1daa42f08846af8e40e94ca1e"; + libraryHaskellDepends = [ + attoparsec base base-orphans charset containers parsec scientific + text transformers unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring containers directory doctest filepath + parsec QuickCheck quickcheck-instances + ]; + doCheck = false; + homepage = "http://github.com/ekmett/parsers/"; + description = "Parsing combinators"; + license = stdenv.lib.licenses.bsd3; }) {}; "parsestar" = callPackage @@ -175585,14 +175992,14 @@ self: { "pcg-random" = callPackage ({ mkDerivation, base, bytestring, doctest, entropy, primitive - , random, time + , random }: mkDerivation { pname = "pcg-random"; - version = "0.1.3.2"; - sha256 = "288db42bb77ffef6e57007b893b41df5a3ac8f252d5a519306448cb5802ebe71"; + version = "0.1.3.3"; + sha256 = "0378f07160a1b9c8d861062a6a91d18b2ef278854c1a50608239c434eefeea13"; libraryHaskellDepends = [ - base bytestring entropy primitive random time + base bytestring entropy primitive random ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -176418,7 +176825,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "persistable-record" = callPackage + "persistable-record_0_4_0_0" = callPackage ({ mkDerivation, array, base, containers, dlist, names-th , template-haskell, transformers }: @@ -176432,6 +176839,24 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Binding between SQL database values and haskell records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "persistable-record" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , template-haskell, th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.4.0.1"; + sha256 = "db12018eecdc964e2b79ab022ae25d5bd65ba9d41ab670da907f57c2fc8ea9c0"; + libraryHaskellDepends = [ + array base containers dlist names-th template-haskell + th-data-compat transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; @@ -177830,6 +178255,8 @@ self: { pname = "persistent-redis"; version = "2.5.1"; sha256 = "6c19ef7006375d9353a2f71b94732b481abe2fc4d3671acd96f9f0fa92d1c01a"; + revision = "1"; + editedCabalFile = "dde54d46abc86863665ff1a55ab04f0b0ba6137062c9e58990cc1eab137bb552"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring hedis http-api-data monad-control mtl path-pieces persistent scientific text time @@ -178965,6 +179392,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "phone-metadata" = callPackage + ({ mkDerivation, base, containers, hxt, regex-pcre, text }: + mkDerivation { + pname = "phone-metadata"; + version = "0.0.1.3"; + sha256 = "4ad4dbf61fd98219b6652a78b35cee4eb8d9bb207ea411353b0d2742a18c91df"; + libraryHaskellDepends = [ base containers hxt regex-pcre text ]; + description = "Phonenumber Metadata based on Google's libphonenumber"; + license = stdenv.lib.licenses.mit; + }) {}; + "phone-numbers" = callPackage ({ mkDerivation, base, bytestring, phonenumber }: mkDerivation { @@ -183741,6 +184179,7 @@ self: { transformers transformers-base unordered-containers vector wai wai-cors wai-extra wai-middleware-static warp ]; + jailbreak = true; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -197859,17 +198298,25 @@ self: { }) {}; "rtcm" = callPackage - ({ mkDerivation, array, base, basic-prelude, binary, binary-bits - , bytestring, lens, random, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, word24 + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-bits, binary-conduit, bytestring + , conduit, conduit-combinators, conduit-extra, lens, random + , resourcet, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, word24 }: mkDerivation { pname = "rtcm"; - version = "0.1.5"; - sha256 = "cc91a2c354c79e6f4bb98c3f801bc72c5a37fd3874fa3d0ac4e6fa5637fac364"; + version = "0.1.6"; + sha256 = "efcb1d0ae4539bff588bfece8b15dfbdcc304395aa7fe1448ea37a9436abdd76"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - array base basic-prelude binary binary-bits bytestring lens - template-haskell word24 + aeson array base base64-bytestring basic-prelude binary binary-bits + bytestring lens template-haskell text word24 + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-combinators conduit-extra resourcet ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty @@ -201640,6 +202087,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_1" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, directory, distributive, doctest + , filepath, semigroups, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.1"; + sha256 = "16ac8ce9b40b0407cdb1b1197a704ec58ec689d5a6de891165a577725361f835"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive semigroups tagged transformers transformers-compat + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -202674,13 +203141,13 @@ self: { "servant-auth-cookie" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, blaze-markup , bytestring, cereal, cookie, cryptonite, http-media, http-types - , memory, servant, servant-server, text, time, transformers, wai - , warp + , memory, mtl, servant, servant-server, text, time, transformers + , wai, warp }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.1.0.0"; - sha256 = "b2c865ce075f24445331815daff87f5c9618b5e84cf6a94359668b4d894caccb"; + version = "0.1.0.1"; + sha256 = "891ed1a3d4ca5e17835aa906595ab601551e084c0831be1154f99adec23b699b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202688,10 +203155,9 @@ self: { http-types memory servant servant-server time transformers wai ]; executableHaskellDepends = [ - base blaze-html blaze-markup bytestring cereal http-media servant - servant-server text wai warp + base blaze-html blaze-markup bytestring cereal http-media mtl + servant servant-server text wai warp ]; - jailbreak = true; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -204793,8 +205259,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "1.2.0"; - sha256 = "0489eced12a79d7ee1fe022a58645c4c7381ecff6ab8e9c402751eaebf24c024"; + version = "1.2.0.1"; + sha256 = "fb81e32af60c528a2c845c1f23fe048a5ba92fd6fa877f5935bcfc6172cdce4b"; libraryHaskellDepends = [ array base bytestring containers mtl profunctors scientific semigroups split tagged template-haskell text transformers @@ -205313,7 +205779,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shake" = callPackage + "shake_0_15_9" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory , extra, filepath, hashable, js-flot, js-jquery, primitive, process , QuickCheck, random, time, transformers, unix @@ -205344,6 +205810,40 @@ self: { homepage = "http://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "shake" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, directory + , extra, filepath, hashable, js-flot, js-jquery, primitive, process + , QuickCheck, random, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "shake"; + version = "0.15.10"; + sha256 = "36331a3cf3e29578c3134e4ee6481dd932e7d40704f5c38703a0eb231ba433d0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery process random time transformers unix + unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process random time transformers unix + unordered-containers utf8-string + ]; + testHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery process QuickCheck random time transformers unix + unordered-containers utf8-string + ]; + doCheck = false; + homepage = "http://shakebuild.com"; + description = "Build system library, like Make, but more accurate dependencies"; + license = stdenv.lib.licenses.bsd3; }) {}; "shake-cabal-build" = callPackage @@ -205985,19 +206485,19 @@ self: { }) {}; "shakespeare-sass" = callPackage - ({ mkDerivation, base, hlibsass, hsass, shakespeare - , template-haskell, yesod, yesod-core + ({ mkDerivation, base, hsass, shakespeare, template-haskell, yesod + , yesod-core }: mkDerivation { pname = "shakespeare-sass"; - version = "0.1.0.2"; - sha256 = "db1a1a5fa84bd789265af26592fa1e885bd94be3cacb973b96a20a94b5991171"; + version = "0.1.0.3"; + sha256 = "149227f017a72ee1f07420db8156b1ebfcf9a45197da272a83c714c2bf9a3299"; libraryHaskellDepends = [ - base hlibsass hsass shakespeare template-haskell yesod yesod-core + base hsass shakespeare template-haskell yesod yesod-core ]; homepage = "https://github.com/brcha/shakespeare-sass"; description = "SASS support for Shakespeare and Yesod"; - license = stdenv.lib.licenses.mpl20; + license = stdenv.lib.licenses.bsd3; }) {}; "shakespeare-text" = callPackage @@ -206320,8 +206820,8 @@ self: { }: mkDerivation { pname = "shellmate"; - version = "0.3"; - sha256 = "6d79053eeb3bbff4cd5c35da1f9c6962e4af56efacb5383c7a5fc02312e97348"; + version = "0.3.1"; + sha256 = "60eb4dfa1a5b3b12c2bf01b84d814069a1363eb088e7bb4c69764be1df94489c"; libraryHaskellDepends = [ base bytestring directory filepath process temporary transformers ]; @@ -206332,15 +206832,16 @@ self: { }) {}; "shellmate-extras" = callPackage - ({ mkDerivation, base, bytestring, feed, HTTP, network-uri - , shellmate, tagsoup, xml + ({ mkDerivation, base, bytestring, feed, HTTP, mime-types + , network-uri, shellmate, tagsoup, text, xml }: mkDerivation { pname = "shellmate-extras"; - version = "0.3"; - sha256 = "a04254b00c39cfe7260d535b4a525e4072dc6b4d857165dc16c9cd4a101a08d8"; + version = "0.3.1"; + sha256 = "49bdaaae24269dc2ceb4c00155a76b04e610e422ff9c815ba3f87657a784b873"; libraryHaskellDepends = [ - base bytestring feed HTTP network-uri shellmate tagsoup xml + base bytestring feed HTTP mime-types network-uri shellmate tagsoup + text xml ]; homepage = "https://github.com/valderman/shellmate"; description = "Extra functionality for shellmate"; @@ -207602,7 +208103,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "simple-sendfile" = callPackage + "simple-sendfile_0_2_24" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , directory, hspec, HUnit, network, process, resourcet, unix }: @@ -207618,6 +208119,25 @@ self: { doCheck = false; description = "Cross platform library for the sendfile system call"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "simple-sendfile" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, hspec, HUnit, network, process, resourcet, unix + }: + mkDerivation { + pname = "simple-sendfile"; + version = "0.2.25"; + sha256 = "0ae68821cd828b29772654b5613d514a421b1b1440d82a4b610339e67a92294d"; + libraryHaskellDepends = [ base bytestring network unix ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra directory hspec HUnit network + process resourcet unix + ]; + doCheck = false; + description = "Cross platform library for the sendfile system call"; + license = stdenv.lib.licenses.bsd3; }) {}; "simple-server" = callPackage @@ -208537,8 +209057,8 @@ self: { }: mkDerivation { pname = "slack-api"; - version = "0.8"; - sha256 = "ebc98de706cb40a19ac2295c2129263240696f27412f8bcadf5816787b3cb446"; + version = "0.9"; + sha256 = "397967f49fbdd25afac310b27baeb6d46ac7f095a9699bb01a0326857ddd4e38"; libraryHaskellDepends = [ aeson base bytestring containers errors HsOpenSSL io-streams lens lens-aeson monad-loops mtl network network-uri openssl-streams text @@ -217090,27 +217610,26 @@ self: { "stratosphere" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , ede, hlint, lens, system-fileio, system-filepath, tasty - , tasty-hspec, template-haskell, text, unordered-containers + , hlint, lens, tasty, tasty-hspec, template-haskell, text + , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.1.2"; - sha256 = "80e47c868980bc5b9f84c9512baf8f91f8c6f0da5d676a5f5c10d8e1c4dbae27"; + version = "0.1.2.1"; + sha256 = "70948036bc62ee5d77d01efa674fcfd762e2bf95d04a94e55dde1339940d471c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring ede lens system-fileio - system-filepath template-haskell text unordered-containers + aeson aeson-pretty base bytestring lens template-haskell text + unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring ede lens system-fileio - system-filepath template-haskell text unordered-containers + aeson aeson-pretty base bytestring lens template-haskell text + unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory ede hlint lens - system-fileio system-filepath tasty tasty-hspec template-haskell - text unordered-containers + aeson aeson-pretty base bytestring directory hlint lens tasty + tasty-hspec template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -217808,23 +218327,22 @@ self: { }) {}; "streaming-eversion" = callPackage - ({ mkDerivation, base, bifunctors, comonad, doctest, foldl, free - , pipes, pipes-text, profunctors, streaming, tasty, tasty-hunit - , tasty-quickcheck, transformers + ({ mkDerivation, base, bifunctors, comonad, doctest, errors, foldl + , free, microlens, pipes, pipes-bytestring, pipes-text, profunctors + , streaming, tasty, tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "streaming-eversion"; - version = "0.1.0.0"; - sha256 = "a75ea3df58d9c5f9e7efd85a43bbccb7c4bef0bb91d6bd92a27cc3b783242517"; + version = "0.2.0.0"; + sha256 = "0f3a42563c8f75d8dd938c8ea4b75d36c5875b9d818292b2a9d344d1258fbb5a"; libraryHaskellDepends = [ base bifunctors comonad foldl free pipes profunctors streaming transformers ]; testHaskellDepends = [ - base doctest foldl pipes pipes-text streaming tasty tasty-hunit - tasty-quickcheck + base doctest errors foldl microlens pipes pipes-bytestring + pipes-text streaming tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; description = "Translate pull-based stream folds into push-based iteratees"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -217932,7 +218450,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streams" = callPackage + "streams_3_2_1" = callPackage ({ mkDerivation, adjunctions, base, comonad, distributive , semigroupoids, semigroups }: @@ -217947,6 +218465,23 @@ self: { homepage = "http://github.com/ekmett/streams/issues"; description = "Various Haskell 2010 stream comonads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streams" = callPackage + ({ mkDerivation, adjunctions, base, comonad, distributive + , semigroupoids, semigroups + }: + mkDerivation { + pname = "streams"; + version = "3.3"; + sha256 = "2933f80d6a83fed326af5588b0cce93985b07233359c311bd69c5bac19954e40"; + libraryHaskellDepends = [ + adjunctions base comonad distributive semigroupoids semigroups + ]; + homepage = "http://github.com/ekmett/streams/issues"; + description = "Various Haskell 2010 stream comonads"; + license = stdenv.lib.licenses.bsd3; }) {}; "strict" = callPackage @@ -227258,6 +227793,8 @@ self: { pname = "these"; version = "0.7"; sha256 = "21959dd626454a9b7f0ac7b57d923802b72d008ca77f752fa8f569698bf6ea10"; + revision = "1"; + editedCabalFile = "d9c6643b3d9565bb5931e24d5b18f5f60293c7644a3bb9298429db8b632b1279"; libraryHaskellDepends = [ base bifunctors containers data-default-class hashable mtl profunctors semigroupoids transformers transformers-compat @@ -228193,14 +228730,13 @@ self: { pname = "time-parsers"; version = "0.1.0.0"; sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8"; - revision = "2"; - editedCabalFile = "700250081f7f2faaeefc228fe3972df380e5bb774edc33529cdfa839ab8e65d4"; + revision = "3"; + editedCabalFile = "b05dabb850510fe5c058510383fda2e2b6fda4775802440a0f85eb7c4a0e175e"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit template-haskell text time ]; - jailbreak = true; homepage = "https://github.com/phadej/time-parsers#readme"; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; @@ -232395,6 +232931,8 @@ self: { pname = "twitter-types"; version = "0.7.2.1"; sha256 = "1b3f39c47749af7dac2fed9905c2c6db976577dfbacc68cc3d531da8f367675b"; + revision = "1"; + editedCabalFile = "e74c78e993ffc36f682748663c9b322b9d4153e84364f6bf698b4d24f520c409"; libraryHaskellDepends = [ aeson base old-locale text time unordered-containers ]; @@ -232404,7 +232942,6 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th-prime text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; @@ -232600,10 +233137,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "type-combinators"; - version = "0.2.2.1"; - sha256 = "96e3c4954236120f46fa515c75f33a8b641d5263bc3b4b7dd2055858dfeee966"; + version = "0.2.4.3"; + sha256 = "1f0ccb6929f53b676e6582141c9423458468eec98be62acc8dc3bab0d52337f6"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/kylcarte/type-combinators"; description = "A collection of data types for type-level programming"; license = stdenv.lib.licenses.bsd3; @@ -233139,8 +233675,8 @@ self: { }: mkDerivation { pname = "typed-wire"; - version = "0.3.1.0"; - sha256 = "d6f7fea68057427d3d2ef1c0eae2a4c0c9c1c4d4920d2bab38be8535854be03d"; + version = "0.3.1.1"; + sha256 = "c69f28ac21b363aac2e58df3b619c3a96d0816eacb446bfcdf217ffae186b971"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234439,7 +234975,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "union" = callPackage + "union_0_1_1_0" = callPackage ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: mkDerivation { pname = "union"; @@ -234448,6 +234984,18 @@ self: { libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "union" = callPackage + ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: + mkDerivation { + pname = "union"; + version = "0.1.1.1"; + sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4"; + libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; + description = "Extensible type-safe unions"; + license = stdenv.lib.licenses.bsd3; }) {}; "union-find" = callPackage @@ -239650,8 +240198,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.1"; - sha256 = "a8f5389330063d55a7c08ef779a603a70ec4455271d8e3a8dcf2a35f19efe91d"; + version = "3.1.2"; + sha256 = "c6d035173d100d15f0d9e4aa360f49ec1d3347c7aef72f3b1e34f556974a5eb4"; libraryHaskellDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 58db9737d32c..3cb1efbce739 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -47,7 +47,7 @@ let # On GHCJS, use a stripped down version of GHC's prologue.txt prologue = if !isGhcjs - then "${ghc}/${docLibGlob}/prologue.txt" + then "${ghc.doc}/${docLibGlob}/prologue.txt" else writeText "ghcjs-prologue.txt" '' This index includes documentation for many Haskell modules. ''; @@ -79,7 +79,7 @@ stdenv.mkDerivation { } echo importing builtin packages - for docdir in ${ghc}/${docLibGlob}/*; do + for docdir in ${ghc.doc}/${docLibGlob}/*; do name="$(basename $docdir)" ${opts isGhcjs ''docdir="$docdir/html"''} if [[ -d $docdir ]]; then diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 23ea2fd65528..adf743848d19 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "high-performance JIT compiler for Lua 5.1"; + description = "High-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 5dfd1b85567a..2ca17b588aac 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -283,8 +283,9 @@ let meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; - license = stdenv.lib.licenses.php301; + license = licenses.php301; maintainers = with maintainers; [ globin ]; + platforms = platforms.all; }; patches = if !php7 then [ ./fix-paths.patch ] else [ ./fix-paths-php7.patch ]; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 726e2aa6aca1..48712cc21b98 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -109,7 +109,7 @@ let meta = { homepage = "http://python.org"; - description = "a high-level dynamically-typed programming language"; + description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that is used in a wide variety of application domains. Some of its key diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index a72377a47708..3538f901d460 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -162,7 +162,7 @@ let meta = { homepage = "http://python.org"; - description = "a high-level dynamically-typed programming language"; + description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that is used in a wide variety of application domains. Some of its key diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 8c7e82557ab5..3f3627b6b238 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "resample library by Fons Adriaensen"; + description = "Resample library by Fons Adriaensen"; version = "${version}"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 8b40260ddf39..12670ab711ae 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://sourceforge.net/projects/buddy/"; - description = "binary decision diagram package"; + description = "Binary decision diagram package"; license = "as-is"; platforms = with stdenv.lib.platforms; allBut cygwin; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index a72532ee35bc..76069e72b0d6 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuild = true; meta = { - description = "advanced disassembly library"; + description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 366e5f613a97..9573358a22f5 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cyrusimap.web.cmu.edu/"; - description = "library for adding authentication support to connection-based protocols"; + description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index fa8e9f0ef2c9..26357b440498 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://launchpad.net/frame"; - description = "handles the buildup and synchronization of a set of simultaneous touches"; + description = "Handles the buildup and synchronization of a set of simultaneous touches"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix index c83173450b19..0a4a6e6b9b00 100644 --- a/pkgs/development/libraries/ftgl/2.1.2.nix +++ b/pkgs/development/libraries/ftgl/2.1.2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; - description = "font rendering library for OpenGL applications"; + description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index ce750fc1696f..8fc69ec75685 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; - description = "font rendering library for OpenGL applications"; + description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/git2/0.21.nix b/pkgs/development/libraries/git2/0.21.nix index 823f09b8bced..4ea430865485 100644 --- a/pkgs/development/libraries/git2/0.21.nix +++ b/pkgs/development/libraries/git2/0.21.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libssh2 openssl http-parser ]; meta = { - description = "the Git linkable library"; + description = "The Git linkable library"; homepage = http://libgit2.github.com/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3e9e0bea8e3b..7aaac299b0e3 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { buildInputs = [ zlib libssh2 openssl http-parser ]; meta = { - description = "the Git linkable library"; + description = "The Git linkable library"; homepage = http://libgit2.github.com/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch b/pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch deleted file mode 100644 index 1f25aa1f8987..000000000000 --- a/pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py ---- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py 2016-02-01 12:25:41.000000000 -0500 -+++ gobject-introspection-1.46.0/giscanner/ccompiler.py 2016-02-01 12:26:52.000000000 -0500 -@@ -128,7 +128,7 @@ - self.compiler.add_runtime_library_dir('.') - - # https://bugzilla.gnome.org/show_bug.cgi?id=625195 -- args.append('-Wl,-rpath=.') -+ args.append('-Wl,-rpath,.') - - # Ensure libraries are always linked as we are going to use ldd to work - # out their names later -@@ -140,7 +140,7 @@ - for library_path in libpaths: - args.append('-L' + library_path) - if os.path.isabs(library_path): -- args.append('-Wl,-rpath=' + library_path) -+ args.append('-Wl,-rpath,' + library_path) - - else: - # libtool case: assemble linker command arguments, like we did before diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 25c8d7e561b6..fe816ee5267c 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.nic.ad.jp/ja/idn/idnkit; - description = "provides functionalities about i18n domain name processing"; + description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 7dba9e025198..35eabdd35563 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; - description = "a software implementation of the JBIG1 data compression standard"; + 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/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 64fd951d70dd..445f65b9202e 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/Seagate/kinetic-cpp-client; - description = "code for producing C and C++ kinetic clients"; + description = "Code for producing C and C++ kinetic clients"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 6617816b642b..8e7971d8087c 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://fallabs.com/kyotocabinet; - description = "a library of routines for managing a database"; + description = "A library of routines for managing a database"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index d266a97535e6..07689fbdd277 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "a LDAP-like embedded database"; + description = "A LDAP-like embedded database"; homepage = http://ldb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index bc21237e238d..bafcc5210b38 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://0pointer.de/lennart/projects/libasyncns/; - description = "a C library for Linux/Unix for executing name service queries asynchronously"; + description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index acb6eb2c7291..e3aec98a8dbe 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -17,7 +17,7 @@ assert faacSupport -> enableUnfree; -with { inherit (stdenv.lib) optional optionals; }; +with { inherit (stdenv.lib) optional optionals hasPrefix; }; /* ToDo: - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools @@ -39,8 +39,8 @@ let }; patches = [] - ++ optionals (vpxSupport && version == "0.8.17" ) [ ./vpxenc-0.8.17-libvpx-1.5.patch ] - ++ optionals (vpxSupport && version == "11.6") [ ./vpxenc-11.6-libvpx-1.5.patch ]; + ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch + ++ optional (vpxSupport && hasPrefix "11." version) ./vpxenc-11.6-libvpx-1.5.patch; preConfigure = "patchShebangs doc/texi2pod.pl"; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index ff9cd25293aa..df18ae06ed66 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.hyperrealm.com/libconfig; - description = "a simple library for processing structured configuration files"; + description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 8ffa1ff81924..f44d228f6501 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ indent ]; meta = { - description = "library reading dwg files"; + description = "Library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index ad37f9010c5c..96de7eb7b3c2 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libestr.adiscon.com/; - description = "some essentials for string handling"; + description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 3e0310736dd3..7a039a813d8a 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "1ydpk6i5vjd78i0531cxlkjvlmvvrsfyc7hv7wx81ws3rkp5hnsq"; + sha256 = "05z9d2pi8n8yl3dbwg2nw6bcvi0zzc9hkammm1mayfh7h4akqc0i"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 6292318d5ca9..a91205e182c7 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/libical/libical; - description = "an Open Source implementation of the iCalendar protocols"; + 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/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index ab8c696a66c7..cb62ff3628b8 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; + description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = http://sourceforge.net/projects/liblo; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index c5d91e266992..81490ccd5390 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.liblognorm.com/; - description = "help to make sense out of syslog data, or, actually, any event data that is present in text form"; + description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 94401c30a6ba..caabde85f29b 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "minimalistic user-space library oriented to Netlink developers"; + description = "Minimalistic user-space library oriented to Netlink developers"; longDescription = '' libmnl is a minimalistic user-space library oriented to Netlink developers. There are a lot of common tasks in parsing, validating, constructing of both the Netlink diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index a1d2b3b8e244..b1d26b81a8d4 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; - description = "userspace API to packets queued by the kernel packet filter"; + description = "Userspace API to packets queued by the kernel packet filter"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 4a80ac3a8755..24e46c0802b2 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/omxil/; - description = "an opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; + description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 3d9a288b5bb5..8c6ee6dc9b9f 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig }: +{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig, doxygen, autoreconfHook, readline }: stdenv.mkDerivation rec { - name = "libqalculate-0.9.7"; + name = "libqalculate-${version}"; + version = "0.9.8"; src = fetchurl { - url = "mirror://sourceforge/qalculate/${name}.tar.gz"; - sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs"; + url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; + sha256 = "07rd95a0wsqs3iymr64mlljn191f8gdnjvr9d4l1spjv3s8j5wdi"; }; - outputs = [ "out" "doc" ]; - - buildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; + buildInputs = [ readline ]; propagatedBuildInputs = [ cln libxml2 glib ]; - meta = { + preBuild = '' + pushd docs/reference + doxygen Doxyfile + popd + ''; + + meta = with stdenv.lib; { description = "An advanced calculator library"; - homepage = http://qalculate.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + homepage = http://qalculate.github.io; + maintainers = with maintainers; [ urkud gebner ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 809a855835df..c19dc73abfa6 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { homepage = https://github.com/clusterlabs/libqb; - description = "a library providing high performance logging, tracing, ipc, and poll"; + description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 1a7c8c92b538..52439f0fe2cc 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.librelp.com/; - description = "a reliable logging library"; + description = "A reliable logging library"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 63a60820e3fc..e30271aaa384 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "high level library for the Linux Kernel seccomp filter"; + description = "High level library for the Linux Kernel seccomp filter"; homepage = "http://sourceforge.net/projects/libseccomp"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 36327327b4dd..8ffb8f8bde98 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.i-scream.org/libstatgrab/; - description = "a library that provides cross platforms access to statistics about the running system"; + description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index b9c4a0a36d40..3a09a0de4bfb 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libstroke, a library for simple gesture recognition"; + description = "Libstroke, a library for simple gesture recognition"; homepage = http://etla.net/libstroke/; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 2356e5bddbd6..0d757d33cf95 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; homepage = http://sourceforge.net/projects/linuxwacom/; - description = "libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index c084cfb8116d..ba179e54fe0c 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/libykneomgr; - description = "a C library to interact with the CCID-part of the Yubikey NEO"; + description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 6d63e8367f79..fbae5245b6d9 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "http://log4cplus.sourceforge.net/"; - description = "a port the log4j library from Java to C++"; + description = "A port the log4j library from Java to C++"; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 5830786f6448..164960a52833 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; meta = with stdenv.lib; { - description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications"; + description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 345ff5d31b5d..fa4758d0877a 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "a small XML library"; + description = "A small XML library"; homepage = http://www.minixml.org; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index c56eef31961d..7b43845d23f7 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { moveToOutput bin/pcre-config "$dev" '' + optionalString (variant != null) '' - ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.so.*.*.* + ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib} ''; crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") { diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix index 1291617ad6fa..f6e7ed56adc4 100644 --- a/pkgs/development/libraries/poker-eval/default.nix +++ b/pkgs/development/libraries/poker-eval/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pokersource.org/poker-eval/; - description = "poker hand evaluator"; + description = "Poker hand evaluator"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.mtreskin]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index f99514f054a5..02d758f89f26 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { ] else null; meta = { - description = "command line option parsing library"; + description = "Command line option parsing library"; }; } diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index c39314843c02..90e1dfded6ae 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "a wrapper for the user, group and hosts NSS API"; + description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix new file mode 100644 index 000000000000..920b77b223f9 --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, requireFile +, cudatoolkit +}: + +stdenv.mkDerivation rec { + version = "5.0"; + cudatoolkit_version = "7.5"; + + name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + + src = requireFile rec { + name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}-ga.tgz"; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library + at https://developer.nvidia.com/cudnn, and run the following command in the download directory: + nix-prefetch-url file://${name} + ''; + sha256 = "c4739a00608c3b66a004a74fc8e721848f9112c5cb15f730c1be4964b3a23b3a"; + }; + + phases = "unpackPhase installPhase fixupPhase"; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib64/libcudnn.so + + mkdir -p $out + cp -a include $out/include + cp -a lib64 $out/lib64 + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + meta = { + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + homepage = "https://developer.nvidia.com/cudnn"; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 0c6f40c8b143..b93312b0e8c9 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "a library passing all socket communications through unix sockets"; + description = "A library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 8e3cf899e40b..ce313e351686 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { hompage = http://www.speex.org/; - description = "an Open Source/Free Software patent-free audio compression format designed for speech"; + description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 56b1900837ac..e31c793a7d7a 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { hompage = http://www.speex.org/; - description = "an Open Source/Free Software patent-free audio compression format designed for speech"; + description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f38e48c87c2e..6dded64e0f54 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { "-DSQLITE_ENABLE_JSON1" "-DSQLITE_ENABLE_FTS3" "-DSQLITE_ENABLE_FTS3_PARENTHESIS" + "-DSQLITE_ENABLE_FTS3_TOKENIZER" "-DSQLITE_ENABLE_FTS4" "-DSQLITE_ENABLE_RTREE" "-DSQLITE_ENABLE_STMT_SCANSTATUS" diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 35d7f53173fb..d53941b5e2f5 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "a wrapper for the user, group and hosts NSS API"; + description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch deleted file mode 100644 index 3bc0fff4d509..000000000000 --- a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 -From: Timothy J Fontaine <tjfontaine@gmail.com> -Date: Thu, 23 May 2013 13:57:59 -0700 -Subject: [PATCH] v8: fix GetLocalizedMessage usage - -As is the backport of the abort on uncaught exception wouldn't compile -because we it was passing in `this` when it was unnecessary. ---- - deps/v8/src/isolate.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/isolate.cc b/src/isolate.cc -index 04a438b..5a5293e 100644 ---- a/src/isolate.cc -+++ b/src/isolate.cc -@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { - (report_exception || can_be_caught_externally)) { - fatal_exception_depth++; - fprintf(stderr, "%s\n\nFROM\n", -- *MessageHandler::GetLocalizedMessage(this, message_obj)); -+ *MessageHandler::GetLocalizedMessage(message_obj)); - PrintCurrentStackTrace(stderr); - OS::Abort(); - } --- -1.8.1.6 - diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 803c552b4878..9f9f90a6f176 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing; - description = "a more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; + description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 3e534a8b955d..b3145302d303 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,17 +2,27 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.9.0"; + version = "3.9.6"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}"; - sha256 = "0j4la9936jcy2fam1x5wplbslqa4zjnrk4wyipkbwz9m8cxg0n6v"; + sha256 = "19k3pqd567jfxyps4i6mk7sblwzaj1rixmsdwscw63pdgcgf260g"; }; + outputs = [ "dev" "out" "doc" "lib" ]; + nativeBuildInputs = [ autoreconfHook ]; + postInstall = '' + # fix recursive cycle: + # wolfssl-config points to dev, dev propagates bin + moveToOutput bin/wolfssl-config "$dev" + # moveToOutput also removes "$out" so recreate it + mkdir -p "$out" + ''; + meta = with stdenv.lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 708db269e946..6e4dc00b0387 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ yasm ]; meta = with stdenv.lib; { - description = "library for encoding H264/AVC video streams"; + description = "Library for encoding H264/AVC video streams"; homepage = http://www.videolan.org/developers/x264.html; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/zeromq/sodium_warning.patch b/pkgs/development/libraries/zeromq/sodium_warning.patch deleted file mode 100644 index 4b84fd7edf42..000000000000 --- a/pkgs/development/libraries/zeromq/sodium_warning.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 479db2113643e459c11db392e0fefd6400657c9e Mon Sep 17 00:00:00 2001 -From: Constantin Rack <constantin@rack.li> -Date: Sat, 8 Nov 2014 10:50:17 +0100 -Subject: [PATCH] Problem: return code of sodium_init() is not checked. - -There are two todo comments in curve_client.cpp and curve_server.cpp that suggest -checking the return code of sodium_init() call. sodium_init() returns -1 on error, -0 on success and 1 if it has been called before and is already initalized: -https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c ---- - src/curve_client.cpp | 7 ++++--- - src/curve_server.cpp | 7 ++++--- - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/curve_client.cpp b/src/curve_client.cpp -index 6019c54..77fc420 100644 ---- a/src/curve_client.cpp -+++ b/src/curve_client.cpp -@@ -38,6 +38,7 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : - cn_peer_nonce(1), - sync() - { -+ int rc; - memcpy (public_key, options_.curve_public_key, crypto_box_PUBLICKEYBYTES); - memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); - memcpy (server_key, options_.curve_server_key, crypto_box_PUBLICKEYBYTES); -@@ -47,12 +48,12 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : - unsigned char tmpbytes[4]; - randombytes(tmpbytes, 4); - #else -- // todo check return code -- sodium_init(); -+ rc = sodium_init (); -+ zmq_assert (rc != -1); - #endif - - // Generate short-term key pair -- const int rc = crypto_box_keypair (cn_public, cn_secret); -+ rc = crypto_box_keypair (cn_public, cn_secret); - zmq_assert (rc == 0); - } - -diff --git a/src/curve_server.cpp b/src/curve_server.cpp -index a3c4243..22c32d6 100644 ---- a/src/curve_server.cpp -+++ b/src/curve_server.cpp -@@ -42,6 +42,7 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, - cn_peer_nonce(1), - sync() - { -+ int rc; - // Fetch our secret key from socket options - memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); - scoped_lock_t lock (sync); -@@ -50,12 +51,12 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, - unsigned char tmpbytes[4]; - randombytes(tmpbytes, 4); - #else -- // todo check return code -- sodium_init(); -+ rc = sodium_init (); -+ zmq_assert (rc != -1); - #endif - - // Generate short-term key pair -- const int rc = crypto_box_keypair (cn_public, cn_secret); -+ rc = crypto_box_keypair (cn_public, cn_secret); - zmq_assert (rc == 0); - } - diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 6ec61cda9d09..e8ec8f2aa241 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -345,7 +345,7 @@ let lispPackages = rec { command-line-arguments = buildLispPackage rec { baseName = "command-line-arguments"; version = "git-20141113"; - description = "small library to deal with command-line arguments"; + description = "Small library to deal with command-line arguments"; deps = []; # Source type: git src = pkgs.fetchgit { diff --git a/pkgs/development/mobile/titaniumenv/cli/registry.nix b/pkgs/development/mobile/titaniumenv/cli/registry.nix index 045f619087e4..3d31d41dd434 100644 --- a/pkgs/development/mobile/titaniumenv/cli/registry.nix +++ b/pkgs/development/mobile/titaniumenv/cli/registry.nix @@ -120,7 +120,7 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; meta = { - description = "get colors in your node.js console"; + description = "Get colors in your node.js console"; homepage = https://github.com/Marak/colors.js; license = "MIT"; }; @@ -169,7 +169,7 @@ let sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }; meta = { - description = "get colors in your node.js console like what"; + description = "Get colors in your node.js console like what"; homepage = https://github.com/Marak/colors.js; }; production = true; @@ -513,7 +513,7 @@ let sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; meta = { - description = "parse argument options"; + description = "Parse argument options"; homepage = https://github.com/substack/minimist; license = "MIT"; }; @@ -1164,7 +1164,7 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; meta = { - description = "read and write binary structures and data types"; + description = "Read and write binary structures and data types"; homepage = https://github.com/rmustacc/node-ctype; }; production = true; @@ -1599,7 +1599,7 @@ let }; }; meta = { - description = "the complete solution for node.js command-line programs"; + description = "The complete solution for node.js command-line programs"; homepage = "https://github.com/tj/commander.js#readme"; license = "MIT"; }; @@ -1614,7 +1614,7 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; meta = { - description = "graceful fs.readlink"; + description = "Graceful fs.readlink"; homepage = https://github.com/zhiyelee/graceful-readlink; license = "MIT"; }; @@ -1745,7 +1745,7 @@ let }; dependencies = {}; meta = { - description = "extend like a boss"; + description = "Extend like a boss"; homepage = https://github.com/Raynos/xtend; license = "MIT"; }; @@ -2316,7 +2316,7 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; meta = { - description = "get colors in your node.js console"; + description = "Get colors in your node.js console"; homepage = https://github.com/Marak/colors.js; license = "MIT"; }; @@ -2332,7 +2332,7 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; meta = { - description = "decycle your json"; + description = "Decycle your json"; homepage = https://github.com/douglascrockford/JSON-js; }; production = true; @@ -2347,7 +2347,7 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; meta = { - description = "a customizable value inspector"; + description = "A customizable value inspector"; }; production = true; linkDependencies = false; diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index d2fa675bbd82..f25a6f97b392 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://ocaml-http.forge.ocamlcore.org/; platforms = ocaml.meta.platforms or []; - description = "do it yourself (OCaml) HTTP daemon"; + description = "Do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; maintainers = with maintainers; [ roconnor vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 16a1ac3b30f2..10a3a1602ae9 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; meta = with stdenv.lib; { - description = "fast, arbitrary precision OCaml integers"; + description = "Fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index acaf1efdaaac..e110afa1d249 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { setupHook = ../generic-setup-hook.sh; meta = { - description = "a pure binding to gnuplot"; + description = "A pure binding to gnuplot"; homepage = http://puredocs.bitbucket.org/pure-gplot.html; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index c60ee54bec8e..6bc28fd95687 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "python plotting library, making publication quality plots"; + description = "Python plotting library, making publication quality plots"; homepage = "http://matplotlib.sourceforge.net/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/scipy-0.16.1-decorator-fix.patch b/pkgs/development/python-modules/scipy-0.16.1-decorator-fix.patch deleted file mode 100644 index 0a7f92d9d2ea..000000000000 --- a/pkgs/development/python-modules/scipy-0.16.1-decorator-fix.patch +++ /dev/null @@ -1,487 +0,0 @@ -From 8d3cd578f9c0a36d29411c96fa70402a7a56d502 Mon Sep 17 00:00:00 2001 -From: Evgeni Burovski <evgeni@burovski.me> -Date: Sun, 8 Nov 2015 15:27:22 +0000 -Subject: [PATCH] MAINT: update decorators.py module to version 4.0.5 - -This is commit d6abda0 at -https://github.com/micheles/decorator/tree/4.0.5 ---- - scipy/_lib/decorator.py | 380 +++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 293 insertions(+), 87 deletions(-) - -diff --git a/scipy/_lib/decorator.py b/scipy/_lib/decorator.py -index 07d9d21..05f7056 100644 ---- a/scipy/_lib/decorator.py -+++ b/scipy/_lib/decorator.py -@@ -1,48 +1,52 @@ --########################## LICENCE ############################### --## --## Copyright (c) 2005-2011, Michele Simionato --## All rights reserved. --## --## Redistributions of source code must retain the above copyright --## notice, this list of conditions and the following disclaimer. --## Redistributions in bytecode form must reproduce the above copyright --## notice, this list of conditions and the following disclaimer in --## the documentation and/or other materials provided with the --## distribution. -- --## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --## HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, --## INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, --## BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS --## OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND --## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR --## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE --## USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH --## DAMAGE. -+# ######################### LICENSE ############################ # -+ -+# Copyright (c) 2005-2015, Michele Simionato -+# All rights reserved. -+ -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions are -+# met: -+ -+# Redistributions of source code must retain the above copyright -+# notice, this list of conditions and the following disclaimer. -+# Redistributions in bytecode form must reproduce the above copyright -+# notice, this list of conditions and the following disclaimer in -+# the documentation and/or other materials provided with the -+# distribution. -+ -+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+# HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -+# DAMAGE. - - """ - Decorator module, see http://pypi.python.org/pypi/decorator - for the documentation. - """ -+from __future__ import print_function - --from __future__ import division, print_function, absolute_import -- --__version__ = '3.3.2' -- --__all__ = ["decorator", "FunctionMaker"] -- --import sys - import re -+import sys - import inspect --from functools import partial -+import operator -+import itertools -+import collections - --from scipy._lib.six import exec_ -+__version__ = '4.0.5' - - if sys.version >= '3': - from inspect import getfullargspec -+ -+ def get_init(cls): -+ return cls.__init__ - else: - class getfullargspec(object): - "A quick and dirty replacement for getfullargspec for Python 2.X" -@@ -51,7 +55,6 @@ else: - inspect.getargspec(f) - self.kwonlyargs = [] - self.kwonlydefaults = None -- self.annotations = getattr(f, '__annotations__', {}) - - def __iter__(self): - yield self.args -@@ -59,17 +62,35 @@ else: - yield self.varkw - yield self.defaults - --DEF = re.compile('\s*def\s*([_\w][_\w\d]*)\s*\(') -+ getargspec = inspect.getargspec -+ -+ def get_init(cls): -+ return cls.__init__.__func__ -+ -+# getargspec has been deprecated in Python 3.5 -+ArgSpec = collections.namedtuple( -+ 'ArgSpec', 'args varargs varkw defaults') - --# basic functionality - -+def getargspec(f): -+ """A replacement for inspect.getargspec""" -+ spec = getfullargspec(f) -+ return ArgSpec(spec.args, spec.varargs, spec.varkw, spec.defaults) - -+DEF = re.compile('\s*def\s*([_\w][_\w\d]*)\s*\(') -+ -+ -+# basic functionality - class FunctionMaker(object): - """ - An object with the ability to create functions with a given signature. - It has attributes name, doc, module, signature, defaults, dict and - methods update and make. - """ -+ -+ # Atomic get-and-increment provided by the GIL -+ _compile_count = itertools.count() -+ - def __init__(self, func=None, name=None, signature=None, - defaults=None, doc=None, module=None, funcdict=None): - self.shortsignature = signature -@@ -82,22 +103,32 @@ class FunctionMaker(object): - self.module = func.__module__ - if inspect.isfunction(func): - argspec = getfullargspec(func) -+ self.annotations = getattr(func, '__annotations__', {}) - for a in ('args', 'varargs', 'varkw', 'defaults', 'kwonlyargs', -- 'kwonlydefaults', 'annotations'): -+ 'kwonlydefaults'): - setattr(self, a, getattr(argspec, a)) - for i, arg in enumerate(self.args): - setattr(self, 'arg%d' % i, arg) -- self.signature = inspect.formatargspec( -- formatvalue=lambda val: "", *argspec)[1:-1] -- allargs = list(self.args) -- if self.varargs: -- allargs.append('*' + self.varargs) -- if self.varkw: -- allargs.append('**' + self.varkw) -- try: -- self.shortsignature = ', '.join(allargs) -- except TypeError: # exotic signature, valid only in Python 2.X -- self.shortsignature = self.signature -+ if sys.version < '3': # easy way -+ self.shortsignature = self.signature = ( -+ inspect.formatargspec( -+ formatvalue=lambda val: "", *argspec)[1:-1]) -+ else: # Python 3 way -+ allargs = list(self.args) -+ allshortargs = list(self.args) -+ if self.varargs: -+ allargs.append('*' + self.varargs) -+ allshortargs.append('*' + self.varargs) -+ elif self.kwonlyargs: -+ allargs.append('*') # single star syntax -+ for a in self.kwonlyargs: -+ allargs.append('%s=None' % a) -+ allshortargs.append('%s=%s' % (a, a)) -+ if self.varkw: -+ allargs.append('**' + self.varkw) -+ allshortargs.append('**' + self.varkw) -+ self.signature = ', '.join(allargs) -+ self.shortsignature = ', '.join(allshortargs) - self.dict = func.__dict__.copy() - # func=None happens when decorating a caller - if name: -@@ -122,12 +153,15 @@ class FunctionMaker(object): - func.__name__ = self.name - func.__doc__ = getattr(self, 'doc', None) - func.__dict__ = getattr(self, 'dict', {}) -- if sys.version_info[0] >= 3: -- func.__defaults__ = getattr(self, 'defaults', ()) -- else: -- func.func_defaults = getattr(self, 'defaults', ()) -+ func.__defaults__ = getattr(self, 'defaults', ()) - func.__kwdefaults__ = getattr(self, 'kwonlydefaults', None) -- callermodule = sys._getframe(3).f_globals.get('__name__', '?') -+ func.__annotations__ = getattr(self, 'annotations', None) -+ try: -+ frame = sys._getframe(3) -+ except AttributeError: # for IronPython and similar implementations -+ callermodule = '?' -+ else: -+ callermodule = frame.f_globals.get('__name__', '?') - func.__module__ = getattr(self, 'module', callermodule) - func.__dict__.update(kw) - -@@ -140,16 +174,20 @@ class FunctionMaker(object): - raise SyntaxError('not a valid function template\n%s' % src) - name = mo.group(1) # extract the function name - names = set([name] + [arg.strip(' *') for arg in -- self.shortsignature.split(',')]) -+ self.shortsignature.split(',')]) - for n in names: - if n in ('_func_', '_call_'): - raise NameError('%s is overridden in\n%s' % (n, src)) - if not src.endswith('\n'): # add a newline just for safety - src += '\n' # this is needed in old versions of Python -+ -+ # Ensure each generated function has a unique filename for profilers -+ # (such as cProfile) that depend on the tuple of (<filename>, -+ # <definition line>, <function name>) being unique. -+ filename = '<decorator-gen-%d>' % (next(self._compile_count),) - try: -- code = compile(src, '<string>', 'single') -- # print >> sys.stderr, 'Compiling %s' % src -- exec_(code, evaldict) -+ code = compile(src, filename, 'single') -+ exec(code, evaldict) - except: - print('Error in generated code:', file=sys.stderr) - print(src, file=sys.stderr) -@@ -165,9 +203,9 @@ class FunctionMaker(object): - doc=None, module=None, addsource=True, **attrs): - """ - Create a function from the strings name, signature and body. -- evaldict is the evaluation dictionary. If addsource is true an attribute -- __source__ is added to the result. The attributes attrs are added, -- if any. -+ evaldict is the evaluation dictionary. If addsource is true an -+ attribute __source__ is added to the result. The attributes attrs -+ are added, if any. - """ - if isinstance(obj, str): # "name(signature)" - name, rest = obj.strip().split('(', 1) -@@ -180,37 +218,205 @@ class FunctionMaker(object): - self = cls(func, name, signature, defaults, doc, module) - ibody = '\n'.join(' ' + line for line in body.splitlines()) - return self.make('def %(name)s(%(signature)s):\n' + ibody, -- evaldict, addsource, **attrs) -+ evaldict, addsource, **attrs) - - --def decorator(caller, func=None): -+def decorate(func, caller): - """ -- decorator(caller) converts a caller function into a decorator; -- decorator(caller, func) decorates a function using a caller. -+ decorate(func, caller) decorates a function using a caller. - """ -- if func is not None: # returns a decorated function -- if sys.version_info[0] >= 3: -- evaldict = func.__globals__.copy() -+ evaldict = func.__globals__.copy() -+ evaldict['_call_'] = caller -+ evaldict['_func_'] = func -+ fun = FunctionMaker.create( -+ func, "return _call_(_func_, %(shortsignature)s)", -+ evaldict, __wrapped__=func) -+ if hasattr(func, '__qualname__'): -+ fun.__qualname__ = func.__qualname__ -+ return fun -+ -+ -+def decorator(caller, _func=None): -+ """decorator(caller) converts a caller function into a decorator""" -+ if _func is not None: # return a decorated function -+ # this is obsolete behavior; you should use decorate instead -+ return decorate(_func, caller) -+ # else return a decorator function -+ if inspect.isclass(caller): -+ name = caller.__name__.lower() -+ callerfunc = get_init(caller) -+ doc = 'decorator(%s) converts functions/generators into ' \ -+ 'factories of %s objects' % (caller.__name__, caller.__name__) -+ elif inspect.isfunction(caller): -+ if caller.__name__ == '<lambda>': -+ name = '_lambda_' - else: -- evaldict = func.func_globals.copy() -- evaldict['_call_'] = caller -- evaldict['_func_'] = func -+ name = caller.__name__ -+ callerfunc = caller -+ doc = caller.__doc__ -+ else: # assume caller is an object with a __call__ method -+ name = caller.__class__.__name__.lower() -+ callerfunc = caller.__call__.__func__ -+ doc = caller.__call__.__doc__ -+ evaldict = callerfunc.__globals__.copy() -+ evaldict['_call_'] = caller -+ evaldict['_decorate_'] = decorate -+ return FunctionMaker.create( -+ '%s(func)' % name, 'return _decorate_(func, _call_)', -+ evaldict, doc=doc, module=caller.__module__, -+ __wrapped__=caller) -+ -+ -+# ####################### contextmanager ####################### # -+ -+try: # Python >= 3.2 -+ from contextlib import _GeneratorContextManager -+except ImportError: # Python >= 2.5 -+ from contextlib import GeneratorContextManager as _GeneratorContextManager -+ -+ -+class ContextManager(_GeneratorContextManager): -+ def __call__(self, func): -+ """Context manager decorator""" - return FunctionMaker.create( -- func, "return _call_(_func_, %(shortsignature)s)", -- evaldict, undecorated=func, __wrapped__=func) -- else: # returns a decorator -- if isinstance(caller, partial): -- return partial(decorator, caller) -- # otherwise assume caller is a function -- first = inspect.getargspec(caller)[0][0] # first arg -- if sys.version_info[0] >= 3: -- evaldict = caller.__globals__.copy() -- else: -- evaldict = caller.func_globals.copy() -- evaldict['_call_'] = caller -- evaldict['decorator'] = decorator -+ func, "with _self_: return _func_(%(shortsignature)s)", -+ dict(_self_=self, _func_=func), __wrapped__=func) -+ -+init = getfullargspec(_GeneratorContextManager.__init__) -+n_args = len(init.args) -+if n_args == 2 and not init.varargs: # (self, genobj) Python 2.7 -+ def __init__(self, g, *a, **k): -+ return _GeneratorContextManager.__init__(self, g(*a, **k)) -+ ContextManager.__init__ = __init__ -+elif n_args == 2 and init.varargs: # (self, gen, *a, **k) Python 3.4 -+ pass -+elif n_args == 4: # (self, gen, args, kwds) Python 3.5 -+ def __init__(self, g, *a, **k): -+ return _GeneratorContextManager.__init__(self, g, a, k) -+ ContextManager.__init__ = __init__ -+ -+contextmanager = decorator(ContextManager) -+ -+ -+# ############################ dispatch_on ############################ # -+ -+def append(a, vancestors): -+ """ -+ Append ``a`` to the list of the virtual ancestors, unless it is already -+ included. -+ """ -+ add = True -+ for j, va in enumerate(vancestors): -+ if issubclass(va, a): -+ add = False -+ break -+ if issubclass(a, va): -+ vancestors[j] = a -+ add = False -+ if add: -+ vancestors.append(a) -+ -+ -+# inspired from simplegeneric by P.J. Eby and functools.singledispatch -+def dispatch_on(*dispatch_args): -+ """ -+ Factory of decorators turning a function into a generic function -+ dispatching on the given arguments. -+ """ -+ assert dispatch_args, 'No dispatch args passed' -+ dispatch_str = '(%s,)' % ', '.join(dispatch_args) -+ -+ def check(arguments, wrong=operator.ne, msg=''): -+ """Make sure one passes the expected number of arguments""" -+ if wrong(len(arguments), len(dispatch_args)): -+ raise TypeError('Expected %d arguments, got %d%s' % -+ (len(dispatch_args), len(arguments), msg)) -+ -+ def gen_func_dec(func): -+ """Decorator turning a function into a generic function""" -+ -+ # first check the dispatch arguments -+ argset = set(getfullargspec(func).args) -+ if not set(dispatch_args) <= argset: -+ raise NameError('Unknown dispatch arguments %s' % dispatch_str) -+ -+ typemap = {} -+ -+ def vancestors(*types): -+ """ -+ Get a list of sets of virtual ancestors for the given types -+ """ -+ check(types) -+ ras = [[] for _ in range(len(dispatch_args))] -+ for types_ in typemap: -+ for t, type_, ra in zip(types, types_, ras): -+ if issubclass(t, type_) and type_ not in t.__mro__: -+ append(type_, ra) -+ return [set(ra) for ra in ras] -+ -+ def ancestors(*types): -+ """ -+ Get a list of virtual MROs, one for each type -+ """ -+ check(types) -+ lists = [] -+ for t, vas in zip(types, vancestors(*types)): -+ n_vas = len(vas) -+ if n_vas > 1: -+ raise RuntimeError( -+ 'Ambiguous dispatch for %s: %s' % (t, vas)) -+ elif n_vas == 1: -+ va, = vas -+ mro = type('t', (t, va), {}).__mro__[1:] -+ else: -+ mro = t.__mro__ -+ lists.append(mro[:-1]) # discard t and object -+ return lists -+ -+ def register(*types): -+ """ -+ Decorator to register an implementation for the given types -+ """ -+ check(types) -+ def dec(f): -+ check(getfullargspec(f).args, operator.lt, ' in ' + f.__name__) -+ typemap[types] = f -+ return f -+ return dec -+ -+ def dispatch_info(*types): -+ """ -+ An utility to introspect the dispatch algorithm -+ """ -+ check(types) -+ lst = [] -+ for anc in itertools.product(*ancestors(*types)): -+ lst.append(tuple(a.__name__ for a in anc)) -+ return lst -+ -+ def _dispatch(dispatch_args, *args, **kw): -+ types = tuple(type(arg) for arg in dispatch_args) -+ try: # fast path -+ f = typemap[types] -+ except KeyError: -+ pass -+ else: -+ return f(*args, **kw) -+ combinations = itertools.product(*ancestors(*types)) -+ next(combinations) # the first one has been already tried -+ for types_ in combinations: -+ f = typemap.get(types_) -+ if f is not None: -+ return f(*args, **kw) -+ -+ # else call the default implementation -+ return func(*args, **kw) -+ - return FunctionMaker.create( -- '%s(%s)' % (caller.__name__, first), -- 'return decorator(_call_, %s)' % first, -- evaldict, undecorated=caller, __wrapped__=caller, -- doc=caller.__doc__, module=caller.__module__) -+ func, 'return _f_(%s, %%(shortsignature)s)' % dispatch_str, -+ dict(_f_=_dispatch), register=register, default=func, -+ typemap=typemap, vancestors=vancestors, ancestors=ancestors, -+ dispatch_info=dispatch_info, __wrapped__=func) -+ -+ gen_func_dec.__name__ = 'dispatch_on' + dispatch_str -+ return gen_func_dec --- -2.6.3 - diff --git a/pkgs/development/python-modules/theano/cuda/default.nix b/pkgs/development/python-modules/theano/cuda/default.nix new file mode 100644 index 000000000000..bf49d3918611 --- /dev/null +++ b/pkgs/development/python-modules/theano/cuda/default.nix @@ -0,0 +1,62 @@ +{ buildPythonPackage +, fetchFromGitHub +, blas +, numpy +, six +, scipy +, nose +, nose-parameterized +, pydot_ng +, sphinx +, pygments +, libgpuarray +, python +, pycuda +, cudatoolkit +, cudnn +, stdenv +}: + +buildPythonPackage rec { + name = "Theano-cuda-${version}"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "Theano"; + repo = "Theano"; + rev = "46fbfeb628220b5e42bf8277a5955c52d153e874"; + sha256 = "1sl91gli3jaw5gpjqqab4fiq4x6282spqciaid1s65pjsf3k55sc"; + }; + + doCheck = false; + + patchPhase = '' + pushd theano/sandbox/gpuarray + sed -i -re '2s/^/from builtins import bytes\n/g' subtensor.py + sed -i -re "s/(b'2')/int(bytes(\1))/g" subtensor.py + sed -i -re "s/(ctx.bin_id\[\-2\])/int(\1)/g" subtensor.py + + sed -i -re '2s/^/from builtins import bytes\n/g' dnn.py + sed -i -re "s/(b'30')/int(bytes(\1))/g" dnn.py + sed -i -re "s/(ctx.bin_id\[\-2:\])/int(\1)/g" dnn.py + popd + ''; + + dontStrip = true; + + propagatedBuildInputs = [ + blas + numpy + six + scipy + nose + nose-parameterized + pydot_ng + sphinx + pygments + pycuda + cudatoolkit + libgpuarray + ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]); + +} diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 4ebba0d5b653..56a3b371d1dc 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -16,8 +16,6 @@ }@args: let - - shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; importedGemset = import gemset; filteredGemset = (lib.filterAttrs (name: attrs: if (builtins.hasAttr "groups" attrs) @@ -58,8 +56,8 @@ let "${confFiles}/Gemfile" \ "$out/${ruby.gemPath}" \ "${bundler}/${ruby.gemPath}" \ - ${shellEscape (toString envPaths)} \ - ${shellEscape (toString groups)} + ${lib.escapeShellArg envPaths} \ + ${lib.escapeShellArg groups} '' + lib.optionalString (postBuild != null) postBuild; passthru = rec { inherit ruby bundler meta gems; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 6e1b0c00bd08..74dc64000c0f 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -18,8 +18,8 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, ruby, bundler, fetchurl, fetchgit, makeWrapper, git, - buildRubyGem, darwin +{ lib, fetchurl, fetchgit, makeWrapper, git, darwin +, ruby, bundler } @ defs: lib.makeOverridable ( @@ -53,7 +53,6 @@ lib.makeOverridable ( , ...} @ attrs: let - shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; src = attrs.src or ( if type == "gem" then fetchurl { @@ -165,7 +164,7 @@ stdenv.mkDerivation (attrs // { ${src} \ ${attrs.rev} \ ${version} \ - ${shellEscape (toString buildFlags)} + ${lib.escapeShellArgs buildFlags} ''} ${lib.optionalString (type == "gem") '' diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 00eb5b9afc13..ffb2896da359 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; meta = with stdenv.lib; { - description = "code coverage tester for compiled programs, Python scripts and shell scripts"; + description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; longDescription = '' Kcov is a code coverage tester for compiled programs, Python diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 3693a27ac23e..634427daaa2c 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dub-${version}"; - version = "0.9.25"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "0cb4kx72fvk6vfqkk0mrp6fvv512xhw03dq2dn9lng0daydvdcim"; + sha256 = "07s52hmh9jc3i4jfx4j4a91m44qrr933pwfwczzijhybj2wmpjhh"; rev = "v${version}"; repo = "dub"; owner = "D-Programming-Language"; @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "Build tool for D projects"; homepage = http://code.dlang.org/; license = licenses.mit; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index af3f4a1afffb..fdeafcbb4fe2 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.gnu.org/software/gnulib/"; - description = "central location for code to be shared among GNU packages"; + description = "Central location for code to be shared among GNU packages"; license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch b/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch deleted file mode 100644 index bb0785fe192e..000000000000 --- a/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch +++ /dev/null @@ -1,1786 +0,0 @@ ---- binutils-2.23/bfd/elf-bfd.h -+++ binutils-2.23/bfd/elf-bfd.h -@@ -1577,6 +1577,9 @@ struct elf_obj_tdata - /* Segment flags for the PT_GNU_STACK segment. */ - unsigned int stack_flags; - -+ /* Segment flags for the PT_PAX_FLAGS segment. */ -+ unsigned int pax_flags; -+ - /* Symbol version definitions in external objects. */ - Elf_Internal_Verdef *verdef; - ---- binutils-2.23/bfd/elf.c -+++ binutils-2.23/bfd/elf.c -@@ -1158,6 +1158,7 @@ get_segment_type (unsigned int p_type) - case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break; - case PT_GNU_STACK: pt = "STACK"; break; - case PT_GNU_RELRO: pt = "RELRO"; break; -+ case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break; - default: pt = NULL; break; - } - return pt; -@@ -2477,6 +2478,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index) - case PT_GNU_RELRO: - return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro"); - -+ case PT_PAX_FLAGS: -+ return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags"); -+ - default: - /* Check for any processor-specific program segment types. */ - bed = get_elf_backend_data (abfd); -@@ -3551,6 +3555,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info) - ++segs; - } - -+ { -+ /* We need a PT_PAX_FLAGS segment. */ -+ ++segs; -+ } -+ - for (s = abfd->sections; s != NULL; s = s->next) - { - if ((s->flags & SEC_LOAD) != 0 -@@ -4153,6 +4162,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info) - } - } - -+ { -+ amt = sizeof (struct elf_segment_map); -+ m = bfd_zalloc (abfd, amt); -+ if (m == NULL) -+ goto error_return; -+ m->next = NULL; -+ m->p_type = PT_PAX_FLAGS; -+ m->p_flags = elf_tdata (abfd)->pax_flags; -+ m->p_flags_valid = 1; -+ -+ *pm = m; -+ pm = &m->next; -+ } -+ - free (sections); - elf_tdata (abfd)->segment_map = mfirst; - } -@@ -5417,7 +5440,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) - 6. PT_TLS segment includes only SHF_TLS sections. - 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments. - 8. PT_DYNAMIC should not contain empty sections at the beginning -- (with the possible exception of .dynamic). */ -+ (with the possible exception of .dynamic). -+ 9. PT_PAX_FLAGS segments do not include any sections. */ - #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \ - ((((segment->p_paddr \ - ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \ -@@ -5425,6 +5449,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) - && (section->flags & SEC_ALLOC) != 0) \ - || IS_NOTE (segment, section)) \ - && segment->p_type != PT_GNU_STACK \ -+ && segment->p_type != PT_PAX_FLAGS \ - && (segment->p_type != PT_TLS \ - || (section->flags & SEC_THREAD_LOCAL)) \ - && (segment->p_type == PT_LOAD \ ---- binutils-2.23/bfd/elflink.c -+++ binutils-2.23/bfd/elflink.c -@@ -5545,16 +5545,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, - return TRUE; - - bed = get_elf_backend_data (output_bfd); -+ -+ elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC; -+ if (info->execheap) -+ elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT; -+ else if (info->noexecheap) -+ elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT; -+ - if (info->execstack) -- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; -+ { -+ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; -+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; -+ } - else if (info->noexecstack) -- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; -+ { -+ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; -+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; -+ } - else - { - bfd *inputobj; - asection *notesec = NULL; - int exec = 0; - -+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; - for (inputobj = info->input_bfds; - inputobj; - inputobj = inputobj->link_next) -@@ -5567,7 +5581,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, - if (s) - { - if (s->flags & SEC_CODE) -- exec = PF_X; -+ { -+ elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP; -+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; -+ exec = PF_X; -+ } - notesec = s; - } - else if (bed->default_execstack) ---- binutils-2.23/binutils/readelf.c -+++ binutils-2.23/binutils/readelf.c -@@ -2740,6 +2740,7 @@ get_segment_type (unsigned long p_type) - return "GNU_EH_FRAME"; - case PT_GNU_STACK: return "GNU_STACK"; - case PT_GNU_RELRO: return "GNU_RELRO"; -+ case PT_PAX_FLAGS: return "PAX_FLAGS"; - - default: - if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) ---- binutils-2.23/include/bfdlink.h -+++ binutils-2.23/include/bfdlink.h -@@ -322,6 +322,14 @@ struct bfd_link_info - /* TRUE if PT_GNU_RELRO segment should be created. */ - unsigned int relro: 1; - -+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT -+ flags. */ -+ unsigned int execheap: 1; -+ -+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT -+ flags. */ -+ unsigned int noexecheap: 1; -+ - /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment - should be created. */ - unsigned int eh_frame_hdr: 1; ---- binutils-2.23/include/elf/common.h -+++ binutils-2.23/include/elf/common.h -@@ -429,6 +429,7 @@ - #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME /* Solaris uses the same value */ - #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */ - #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */ -+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */ - - /* Program segment permissions, in program header p_flags field. */ - -@@ -439,6 +440,21 @@ - #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */ - #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */ - -+/* Flags to control PaX behavior. */ -+ -+#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */ -+#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */ -+#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */ -+#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */ -+#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */ -+#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */ -+#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */ -+#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */ -+#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */ -+#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */ -+#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */ -+#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */ -+ - /* Values for section header, sh_type field. */ - - #define SHT_NULL 0 /* Section header table entry unused */ ---- binutils-2.23/ld/emultempl/elf32.em -+++ binutils-2.23/ld/emultempl/elf32.em -@@ -2285,6 +2285,16 @@ fragment <<EOF - link_info.noexecstack = TRUE; - link_info.execstack = FALSE; - } -+ else if (strcmp (optarg, "execheap") == 0) -+ { -+ link_info.execheap = TRUE; -+ link_info.noexecheap = FALSE; -+ } -+ else if (strcmp (optarg, "noexecheap") == 0) -+ { -+ link_info.noexecheap = TRUE; -+ link_info.execheap = FALSE; -+ } - EOF - if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then - fragment <<EOF -@@ -2368,6 +2378,8 @@ fragment <<EOF - -z defs Report unresolved symbols in object files.\n")); - fprintf (file, _("\ - -z execstack Mark executable as requiring executable stack\n")); -+ fprintf (file, _("\ -+ -z execheap Mark executable as requiring executable heap\n")); - EOF - - if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then -@@ -2391,6 +2403,8 @@ fragment <<EOF - fragment <<EOF - fprintf (file, _("\ - -z noexecstack Mark executable as not requiring executable stack\n")); -+ fprintf (file, _("\ -+ -z noexecheap Mark executable as not requiring executable heap\n")); - EOF - if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then - fragment <<EOF ---- binutils-2.23/ld/ldgram.y -+++ binutils-2.23/ld/ldgram.y -@@ -1119,6 +1119,8 @@ phdr_type: - $$ = exp_intop (0x6474e550); - else if (strcmp (s, "PT_GNU_STACK") == 0) - $$ = exp_intop (0x6474e551); -+ else if (strcmp (s, "PT_PAX_FLAGS") == 0) -+ $$ = exp_intop (0x65041580); - else - { - einfo (_("\ ---- binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd -+++ binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd -@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -- PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8 -+ PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8 - INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 - .*Requesting program interpreter.* - LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000 - LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 - DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 - TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries: ---- binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd -+++ binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd -@@ -42,6 +42,7 @@ Program Headers: - +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 - +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: ---- binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd -+++ binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd -@@ -38,6 +38,7 @@ Program Headers: - +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 - +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 - +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries: ---- binutils-2.23/ld/testsuite/ld-elf/eh1.d -+++ binutils-2.23/ld/testsuite/ld-elf/eh1.d -@@ -22,11 +22,11 @@ Contents of the .eh_frame section: - DW_CFA_nop - DW_CFA_nop - --00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 -- DW_CFA_advance_loc: 0 to 00400078 -+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_offset: 16 - DW_CFA_offset: r6 \(rbp\) at cfa-16 -- DW_CFA_advance_loc: 0 to 00400078 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_register: r6 \(rbp\) - - 00000038 ZERO terminator ---- binutils-2.23/ld/testsuite/ld-elf/eh2.d -+++ binutils-2.23/ld/testsuite/ld-elf/eh2.d -@@ -22,11 +22,11 @@ Contents of the .eh_frame section: - DW_CFA_nop - DW_CFA_nop - --00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 -- DW_CFA_advance_loc: 0 to 00400078 -+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_offset: 16 - DW_CFA_offset: r6 \(rbp\) at cfa-16 -- DW_CFA_advance_loc: 0 to 00400078 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_register: r6 \(rbp\) - - 00000038 ZERO terminator ---- binutils-2.23/ld/testsuite/ld-elf/eh3.d -+++ binutils-2.23/ld/testsuite/ld-elf/eh3.d -@@ -22,11 +22,11 @@ Contents of the .eh_frame section: - DW_CFA_nop - DW_CFA_nop - --00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 -- DW_CFA_advance_loc: 0 to 00400078 -+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_offset: 16 - DW_CFA_offset: r6 \(rbp\) at cfa-16 -- DW_CFA_advance_loc: 0 to 00400078 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_register: r6 \(rbp\) - - 00000038 ZERO terminator ---- binutils-2.23/ld/testsuite/ld-elf/orphan-region.d -+++ binutils-2.23/ld/testsuite/ld-elf/orphan-region.d -@@ -15,7 +15,9 @@ - Program Headers: - Type.* - LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+ -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - Segment Sections... - 00 .text .rodata .moredata * -+ 01 + ---- binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd -+++ binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd -@@ -44,6 +44,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -53,6 +54,7 @@ Program Headers: - +03 +.tdata .dynamic .got .got.plt * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd -+++ binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd -@@ -42,6 +42,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -51,6 +52,7 @@ Program Headers: - +03 +.tdata .dynamic .got .got.plt * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd -+++ binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd -@@ -39,6 +39,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -46,6 +47,7 @@ Program Headers: - +01 +.tdata .dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd -+++ binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd -@@ -36,12 +36,14 @@ Program Headers: - +LOAD.* - +LOAD.* - +DYNAMIC.* -+ +PAX_FLAGS.* - - Section to Segment mapping: - +Segment Sections... - +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text * - +01 +.dynamic .got .got.plt * - +02 +.dynamic * -+ +03 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd -+++ binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd -@@ -37,6 +37,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -44,6 +45,7 @@ Program Headers: - +01 +.dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tbss * -+ +04 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23/ld/testsuite/ld-i386/tlspic.rd -+++ binutils-2.23/ld/testsuite/ld-i386/tlspic.rd -@@ -40,6 +40,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -47,6 +48,7 @@ Program Headers: - +01 +.tdata .dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23/ld/testsuite/ld-ia64/merge1.d -+++ binutils-2.23/ld/testsuite/ld-ia64/merge1.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+1e0 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23/ld/testsuite/ld-ia64/merge2.d -+++ binutils-2.23/ld/testsuite/ld-ia64/merge2.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+1e0 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23/ld/testsuite/ld-ia64/merge3.d -+++ binutils-2.23/ld/testsuite/ld-ia64/merge3.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+210 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23/ld/testsuite/ld-ia64/merge4.d -+++ binutils-2.23/ld/testsuite/ld-ia64/merge4.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+240 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23/ld/testsuite/ld-ia64/merge5.d -+++ binutils-2.23/ld/testsuite/ld-ia64/merge5.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+270 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd -+++ binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd -@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8 -- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 -+ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8 -+ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 - .*Requesting program interpreter.* - +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000 - +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 - +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8 - +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - +IA_64_UNWIND .* R +0x8 - #... - ---- binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd -+++ binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd -@@ -40,6 +40,7 @@ Program Headers: - +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 - +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8 - +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8 - #... - ---- binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d -+++ binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d -@@ -8,9 +8,9 @@ - .*: +file format.* - - Disassembly of section \.text: --004000b0 <[^>]*> 3c1c0043 lui gp,0x43 --004000b4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 --004000b8 <[^>]*> afbc0008 sw gp,8\(sp\) -+004000d0 <[^>]*> 3c1c0043 lui gp,0x43 -+004000d4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 -+004000d8 <[^>]*> afbc0008 sw gp,8\(sp\) - #... - 00408d60 <[^>]*> 3c1c0043 lui gp,0x43 - 00408d64 <[^>]*> 279c2c98 addiu gp,gp,11416 ---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd -+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd -@@ -1,7 +1,7 @@ - - Elf file type is DYN \(Shared object file\) - Entry point .* --There are 5 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -9,6 +9,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.* - * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -18,3 +19,4 @@ Program Headers: - *0*2 * \.data \.got * - *0*3 * \.dynamic * - *0*4 * -+ *0*5 * ---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd -+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC \(Executable file\) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 *\.got \.data * - *0*6 *\.dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd -+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC \(Executable file\) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * \.got \.data \.bss * - *0*6 * \.dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd -+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC \(Executable file\) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * \.got \.data \.bss * - *0*6 * \.dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd -+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC \(Executable file\) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * \.got \.data \.bss * - *0*6 * \.dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd -+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC \(Executable file\) - Entry point 0x44000 --There are 7 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -12,6 +12,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -23,3 +24,4 @@ Program Headers: - *0*4 * \.got \.data \.bss * - *0*5 * \.dynamic * - *0*6 * -+ *0*7 * ---- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd -+++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC \(Executable file\) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * \.got \.data \.bss * - *0*6 * \.dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d -+++ binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d -@@ -2,42 +2,42 @@ - - Disassembly of section .text: - --004000d0 <__start>: -- 4000d0: 3c1c0fc0 lui gp,0xfc0 -- 4000d4: 279c7f30 addiu gp,gp,32560 -- 4000d8: 0399e021 addu gp,gp,t9 -- 4000dc: 27bdfff0 addiu sp,sp,-16 -- 4000e0: afbe0008 sw s8,8\(sp\) -- 4000e4: 03a0f021 move s8,sp -- 4000e8: afbc0000 sw gp,0\(sp\) -- 4000ec: 8f998018 lw t9,-32744\(gp\) -- 4000f0: 27848028 addiu a0,gp,-32728 -- 4000f4: 0320f809 jalr t9 -- 4000f8: 00000000 nop -- 4000fc: 8fdc0000 lw gp,0\(s8\) -- 400100: 00000000 nop -- 400104: 8f998018 lw t9,-32744\(gp\) -- 400108: 27848020 addiu a0,gp,-32736 -- 40010c: 0320f809 jalr t9 -- 400110: 00000000 nop -- 400114: 8fdc0000 lw gp,0\(s8\) -- 400118: 00401021 move v0,v0 -- 40011c: 3c030000 lui v1,0x0 -- 400120: 24638000 addiu v1,v1,-32768 -- 400124: 00621821 addu v1,v1,v0 -- 400128: 7c02283b rdhwr v0,\$5 -- 40012c: 8f83801c lw v1,-32740\(gp\) -- 400130: 00000000 nop -- 400134: 00621821 addu v1,v1,v0 -- 400138: 7c02283b rdhwr v0,\$5 -- 40013c: 3c030000 lui v1,0x0 -- 400140: 24639004 addiu v1,v1,-28668 -- 400144: 00621821 addu v1,v1,v0 -- 400148: 03c0e821 move sp,s8 -- 40014c: 8fbe0008 lw s8,8\(sp\) -- 400150: 03e00008 jr ra -- 400154: 27bd0010 addiu sp,sp,16 -+00400[0-9a-f]{3} <__start>: -+ 400[0-9a-f]{3}: 3c1c0fc0 lui gp,0xfc0 -+ 400[0-9a-f]{3}: 279c7f30 addiu gp,gp,32560 -+ 400[0-9a-f]{3}: 0399e021 addu gp,gp,t9 -+ 400[0-9a-f]{3}: 27bdfff0 addiu sp,sp,-16 -+ 400[0-9a-f]{3}: afbe0008 sw s8,8\(sp\) -+ 400[0-9a-f]{3}: 03a0f021 move s8,sp -+ 400[0-9a-f]{3}: afbc0000 sw gp,0\(sp\) -+ 400[0-9a-f]{3}: 8f998018 lw t9,-32744\(gp\) -+ 400[0-9a-f]{3}: 27848028 addiu a0,gp,-32728 -+ 400[0-9a-f]{3}: 0320f809 jalr t9 -+ 400[0-9a-f]{3}: 00000000 nop -+ 400[0-9a-f]{3}: 8fdc0000 lw gp,0\(s8\) -+ 400[0-9a-f]{3}: 00000000 nop -+ 400[0-9a-f]{3}: 8f998018 lw t9,-32744\(gp\) -+ 400[0-9a-f]{3}: 27848020 addiu a0,gp,-32736 -+ 400[0-9a-f]{3}: 0320f809 jalr t9 -+ 400[0-9a-f]{3}: 00000000 nop -+ 400[0-9a-f]{3}: 8fdc0000 lw gp,0\(s8\) -+ 400[0-9a-f]{3}: 00401021 move v0,v0 -+ 400[0-9a-f]{3}: 3c030000 lui v1,0x0 -+ 400[0-9a-f]{3}: 24638000 addiu v1,v1,-32768 -+ 400[0-9a-f]{3}: 00621821 addu v1,v1,v0 -+ 400[0-9a-f]{3}: 7c02283b rdhwr v0,\$5 -+ 400[0-9a-f]{3}: 8f83801c lw v1,-32740\(gp\) -+ 400[0-9a-f]{3}: 00000000 nop -+ 400[0-9a-f]{3}: 00621821 addu v1,v1,v0 -+ 400[0-9a-f]{3}: 7c02283b rdhwr v0,\$5 -+ 400[0-9a-f]{3}: 3c030000 lui v1,0x0 -+ 400[0-9a-f]{3}: 24639004 addiu v1,v1,-28668 -+ 400[0-9a-f]{3}: 00621821 addu v1,v1,v0 -+ 400[0-9a-f]{3}: 03c0e821 move sp,s8 -+ 400[0-9a-f]{3}: 8fbe0008 lw s8,8\(sp\) -+ 400[0-9a-f]{3}: 03e00008 jr ra -+ 400[0-9a-f]{3}: 27bd0010 addiu sp,sp,16 - --00400158 <__tls_get_addr>: -- 400158: 03e00008 jr ra -- 40015c: 00000000 nop -+00400[0-9a-f]{3} <__tls_get_addr>: -+ 400[0-9a-f]{3}: 03e00008 jr ra -+ 400[0-9a-f]{3}: 00000000 nop ---- binutils-2.23/ld/testsuite/ld-powerpc/tls.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tls.d -@@ -9,45 +9,45 @@ - - Disassembly of section \.text: - --0+100000e8 <_start>: -- 100000e8: 3c 6d 00 00 addis r3,r13,0 -- 100000ec: 60 00 00 00 nop -- 100000f0: 38 63 90 78 addi r3,r3,-28552 -- 100000f4: 3c 6d 00 00 addis r3,r13,0 -- 100000f8: 60 00 00 00 nop -- 100000fc: 38 63 10 00 addi r3,r3,4096 -- 10000100: 3c 6d 00 00 addis r3,r13,0 -- 10000104: 60 00 00 00 nop -- 10000108: 38 63 90 40 addi r3,r3,-28608 -- 1000010c: 3c 6d 00 00 addis r3,r13,0 -- 10000110: 60 00 00 00 nop -- 10000114: 38 63 10 00 addi r3,r3,4096 -- 10000118: 39 23 80 48 addi r9,r3,-32696 -- 1000011c: 3d 23 00 00 addis r9,r3,0 -- 10000120: 81 49 80 50 lwz r10,-32688\(r9\) -- 10000124: e9 22 80 10 ld r9,-32752\(r2\) -- 10000128: 7d 49 18 2a ldx r10,r9,r3 -- 1000012c: 3d 2d 00 00 addis r9,r13,0 -- 10000130: a1 49 90 60 lhz r10,-28576\(r9\) -- 10000134: 89 4d 90 68 lbz r10,-28568\(r13\) -- 10000138: 3d 2d 00 00 addis r9,r13,0 -- 1000013c: 99 49 90 70 stb r10,-28560\(r9\) -- 10000140: 3c 6d 00 00 addis r3,r13,0 -- 10000144: 60 00 00 00 nop -- 10000148: 38 63 90 00 addi r3,r3,-28672 -- 1000014c: 3c 6d 00 00 addis r3,r13,0 -- 10000150: 60 00 00 00 nop -- 10000154: 38 63 10 00 addi r3,r3,4096 -- 10000158: f9 43 80 08 std r10,-32760\(r3\) -- 1000015c: 3d 23 00 00 addis r9,r3,0 -- 10000160: 91 49 80 10 stw r10,-32752\(r9\) -- 10000164: e9 22 80 08 ld r9,-32760\(r2\) -- 10000168: 7d 49 19 2a stdx r10,r9,r3 -- 1000016c: 3d 2d 00 00 addis r9,r13,0 -- 10000170: b1 49 90 60 sth r10,-28576\(r9\) -- 10000174: e9 4d 90 2a lwa r10,-28632\(r13\) -- 10000178: 3d 2d 00 00 addis r9,r13,0 -- 1000017c: a9 49 90 30 lha r10,-28624\(r9\) -+0+10000[0-9a-f]{3} <_start>: -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 78 addi r3,r3,-28552 -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 40 addi r3,r3,-28608 -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 10000[0-9a-f]{3}: 39 23 80 48 addi r9,r3,-32696 -+ 10000[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 -+ 10000[0-9a-f]{3}: 81 49 80 50 lwz r10,-32688\(r9\) -+ 10000[0-9a-f]{3}: e9 22 80 10 ld r9,-32752\(r2\) -+ 10000[0-9a-f]{3}: 7d 49 18 2a ldx r10,r9,r3 -+ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 -+ 10000[0-9a-f]{3}: a1 49 90 60 lhz r10,-28576\(r9\) -+ 10000[0-9a-f]{3}: 89 4d 90 68 lbz r10,-28568\(r13\) -+ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 -+ 10000[0-9a-f]{3}: 99 49 90 70 stb r10,-28560\(r9\) -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 00 addi r3,r3,-28672 -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 10000[0-9a-f]{3}: f9 43 80 08 std r10,-32760\(r3\) -+ 10000[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 -+ 10000[0-9a-f]{3}: 91 49 80 10 stw r10,-32752\(r9\) -+ 10000[0-9a-f]{3}: e9 22 80 08 ld r9,-32760\(r2\) -+ 10000[0-9a-f]{3}: 7d 49 19 2a stdx r10,r9,r3 -+ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 -+ 10000[0-9a-f]{3}: b1 49 90 60 sth r10,-28576\(r9\) -+ 10000[0-9a-f]{3}: e9 4d 90 2a lwa r10,-28632\(r13\) -+ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 -+ 10000[0-9a-f]{3}: a9 49 90 30 lha r10,-28624\(r9\) - --0+10000180 <\.__tls_get_addr>: -- 10000180: 4e 80 00 20 blr -+0+10000[0-9a-f]{3} <\.__tls_get_addr>: -+ 10000[0-9a-f]{3}: 4e 80 00 20 blr ---- binutils-2.23/ld/testsuite/ld-powerpc/tls.g -+++ binutils-2.23/ld/testsuite/ld-powerpc/tls.g -@@ -8,5 +8,5 @@ - .*: +file format elf64-powerpc - - Contents of section \.got: -- 100101e0 00000000 100181e0 ffffffff ffff8018 .* -- 100101f0 ffffffff ffff8058 .* -+ 10010([0-9a-f]{3}) 00000000 10018\1 ffffffff ffff8018 .* -+ 10010[0-9a-f]{3} ffffffff ffff8058 .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tls32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.d -@@ -9,42 +9,42 @@ - - Disassembly of section \.text: - --0+1800094 <_start>: -- 1800094: 3c 62 00 00 addis r3,r2,0 -- 1800098: 38 63 90 3c addi r3,r3,-28612 -- 180009c: 3c 62 00 00 addis r3,r2,0 -- 18000a0: 38 63 10 00 addi r3,r3,4096 -- 18000a4: 3c 62 00 00 addis r3,r2,0 -- 18000a8: 38 63 90 20 addi r3,r3,-28640 -- 18000ac: 3c 62 00 00 addis r3,r2,0 -- 18000b0: 38 63 10 00 addi r3,r3,4096 -- 18000b4: 39 23 80 24 addi r9,r3,-32732 -- 18000b8: 3d 23 00 00 addis r9,r3,0 -- 18000bc: 81 49 80 28 lwz r10,-32728\(r9\) -- 18000c0: 3d 22 00 00 addis r9,r2,0 -- 18000c4: a1 49 90 30 lhz r10,-28624\(r9\) -- 18000c8: 89 42 90 34 lbz r10,-28620\(r2\) -- 18000cc: 3d 22 00 00 addis r9,r2,0 -- 18000d0: 99 49 90 38 stb r10,-28616\(r9\) -- 18000d4: 3c 62 00 00 addis r3,r2,0 -- 18000d8: 38 63 90 00 addi r3,r3,-28672 -- 18000dc: 3c 62 00 00 addis r3,r2,0 -- 18000e0: 38 63 10 00 addi r3,r3,4096 -- 18000e4: 91 43 80 04 stw r10,-32764\(r3\) -- 18000e8: 3d 23 00 00 addis r9,r3,0 -- 18000ec: 91 49 80 08 stw r10,-32760\(r9\) -- 18000f0: 3d 22 00 00 addis r9,r2,0 -- 18000f4: b1 49 90 30 sth r10,-28624\(r9\) -- 18000f8: a1 42 90 14 lhz r10,-28652\(r2\) -- 18000fc: 3d 22 00 00 addis r9,r2,0 -- 1800100: a9 49 90 18 lha r10,-28648\(r9\) -+0+1800[0-9a-f]{3} <_start>: -+ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 -+ 1800[0-9a-f]{3}: 38 63 90 3c addi r3,r3,-28612 -+ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 -+ 1800[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 -+ 1800[0-9a-f]{3}: 38 63 90 20 addi r3,r3,-28640 -+ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 -+ 1800[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 1800[0-9a-f]{3}: 39 23 80 24 addi r9,r3,-32732 -+ 1800[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 -+ 1800[0-9a-f]{3}: 81 49 80 28 lwz r10,-32728\(r9\) -+ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 -+ 1800[0-9a-f]{3}: a1 49 90 30 lhz r10,-28624\(r9\) -+ 1800[0-9a-f]{3}: 89 42 90 34 lbz r10,-28620\(r2\) -+ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 -+ 1800[0-9a-f]{3}: 99 49 90 38 stb r10,-28616\(r9\) -+ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 -+ 1800[0-9a-f]{3}: 38 63 90 00 addi r3,r3,-28672 -+ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 -+ 1800[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 1800[0-9a-f]{3}: 91 43 80 04 stw r10,-32764\(r3\) -+ 1800[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 -+ 1800[0-9a-f]{3}: 91 49 80 08 stw r10,-32760\(r9\) -+ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 -+ 1800[0-9a-f]{3}: b1 49 90 30 sth r10,-28624\(r9\) -+ 1800[0-9a-f]{3}: a1 42 90 14 lhz r10,-28652\(r2\) -+ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 -+ 1800[0-9a-f]{3}: a9 49 90 18 lha r10,-28648\(r9\) - --0+1800104 <__tls_get_addr>: -- 1800104: 4e 80 00 20 blr -+0+1800[0-9a-f]{3} <__tls_get_addr>: -+ 1800[0-9a-f]{3}: 4e 80 00 20 blr - Disassembly of section \.got: - --0+1810128 <_GLOBAL_OFFSET_TABLE_-0x4>: -- 1810128: 4e 80 00 21 blrl -+0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_-0x4>: -+ 1810[0-9a-f]{3}: 4e 80 00 21 blrl - --0+181012c <_GLOBAL_OFFSET_TABLE_>: -+0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_>: - \.\.\. ---- binutils-2.23/ld/testsuite/ld-powerpc/tls32.g -+++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.g -@@ -8,4 +8,4 @@ - .*: +file format elf32-powerpc - - Contents of section \.got: -- 1810128 4e800021 00000000 00000000 00000000 .* -+ 18101[0-9a-f]{2} 4e800021 00000000 00000000 00000000 .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tls32.t -+++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.t -@@ -8,5 +8,5 @@ - .*: +file format elf32-powerpc - - Contents of section \.tdata: -- 1810108 12345678 23456789 3456789a 456789ab .* -- 1810118 56789abc 6789abcd 789abcde 00c0ffee .* -+ 18101[0-9a-f]{2} 12345678 23456789 3456789a 456789ab .* -+ 18101[0-9a-f]{2} 56789abc 6789abcd 789abcde 00c0ffee .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d -@@ -44,4 +44,4 @@ Disassembly of section \.got: - .*: 4e 80 00 21 blrl - - .* <_GLOBAL_OFFSET_TABLE_>: --.*: 01 81 02 b8 00 00 00 00 00 00 00 00 .* -+.*: 01 81 02 [bd]8 00 00 00 00 00 00 00 00 .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g -@@ -8,4 +8,4 @@ - - Contents of section \.got: - .* 00000000 00000000 00000000 4e800021 .* --.* 018102b8 00000000 00000000 .* -+.* 018102[bd]8 00000000 00000000 .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r -@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align -- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4 -- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1 -+ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4 -+ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1 - +\[Requesting program interpreter: .*\] - +LOAD .* R E 0x10000 - +LOAD .* RWE 0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0001c 0x00038 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections\.\.\. -@@ -49,6 +50,7 @@ Program Headers: - +03 +\.tdata \.dynamic \.got \.plt - +04 +\.dynamic - +05 +\.tdata \.tbss -+ +06 + - - Relocation section '\.rela\.dyn' at offset .* contains 2 entries: - Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d -@@ -9,29 +9,29 @@ - - Disassembly of section \.text: - --0+100000e8 <_start>: -- 100000e8: 48 00 00 18 b 10000100 <_start\+0x18> -- 100000ec: 60 00 00 00 nop -- 100000f0: 38 63 90 00 addi r3,r3,-28672 -- 100000f4: e8 83 00 00 ld r4,0\(r3\) -- 100000f8: 3c 6d 00 00 addis r3,r13,0 -- 100000fc: 48 00 00 0c b 10000108 <_start\+0x20> -- 10000100: 3c 6d 00 00 addis r3,r13,0 -- 10000104: 4b ff ff e8 b 100000ec <_start\+0x4> -- 10000108: 60 00 00 00 nop -- 1000010c: 38 63 10 00 addi r3,r3,4096 -- 10000110: e8 83 80 00 ld r4,-32768\(r3\) -- 10000114: 3c 6d 00 00 addis r3,r13,0 -- 10000118: 48 00 00 0c b 10000124 <_start\+0x3c> -- 1000011c: 3c 6d 00 00 addis r3,r13,0 -- 10000120: 48 00 00 14 b 10000134 <_start\+0x4c> -- 10000124: 60 00 00 00 nop -- 10000128: 38 63 90 04 addi r3,r3,-28668 -- 1000012c: e8 a3 00 00 ld r5,0\(r3\) -- 10000130: 4b ff ff ec b 1000011c <_start\+0x34> -- 10000134: 60 00 00 00 nop -- 10000138: 38 63 10 00 addi r3,r3,4096 -- 1000013c: e8 a3 80 04 ld r5,-32764\(r3\) -+0+10000[0-9a-f]{3} <_start>: -+ 10000[0-9a-f]{3}: 48 00 00 18 b 10000[0-9a-f]{3} <_start\+0x18> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 00 addi r3,r3,-28672 -+ 10000[0-9a-f]{3}: e8 83 00 00 ld r4,0\(r3\) -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 48 00 00 0c b 10000[0-9a-f]{3} <_start\+0x20> -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 4b ff ff e8 b 10000[0-9a-f]{3} <_start\+0x4> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 10000[0-9a-f]{3}: e8 83 80 00 ld r4,-32768\(r3\) -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 48 00 00 0c b 10000[0-9a-f]{3} <_start\+0x3c> -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 48 00 00 14 b 10000[0-9a-f]{3} <_start\+0x4c> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 04 addi r3,r3,-28668 -+ 10000[0-9a-f]{3}: e8 a3 00 00 ld r5,0\(r3\) -+ 10000[0-9a-f]{3}: 4b ff ff ec b 10000[0-9a-f]{3} <_start\+0x34> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 -+ 10000[0-9a-f]{3}: e8 a3 80 04 ld r5,-32764\(r3\) - --0+10000140 <\.__tls_get_addr>: -- 10000140: 4e 80 00 20 blr -+0+10000[0-9a-f]{3} <\.__tls_get_addr>: -+ 10000[0-9a-f]{3}: 4e 80 00 20 blr ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d -@@ -9,17 +9,17 @@ - - Disassembly of section \.text: - --0+1800094 <_start>: -- 1800094: 48 00 00 14 b 18000a8 <_start\+0x14> -- 1800098: 38 63 90 00 addi r3,r3,-28672 -- 180009c: 80 83 00 00 lwz r4,0\(r3\) -- 18000a0: 3c 62 00 00 addis r3,r2,0 -- 18000a4: 48 00 00 0c b 18000b0 <_start\+0x1c> -- 18000a8: 3c 62 00 00 addis r3,r2,0 -- 18000ac: 4b ff ff ec b 1800098 <_start\+0x4> -- 18000b0: 38 63 10 00 addi r3,r3,4096 -- 18000b4: 80 83 80 00 lwz r4,-32768\(r3\) -+0+18000[0-9a-f]{2} <_start>: -+ 18000[0-9a-f]{2}: 48 00 00 14 b 18000[0-9a-f]{2} <_start\+0x14> -+ 18000[0-9a-f]{2}: 38 63 90 00 addi r3,r3,-28672 -+ 18000[0-9a-f]{2}: 80 83 00 00 lwz r4,0\(r3\) -+ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 -+ 18000[0-9a-f]{2}: 48 00 00 0c b 18000[0-9a-f]{2} <_start\+0x1c> -+ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 -+ 18000[0-9a-f]{2}: 4b ff ff ec b 18000[0-9a-f]{2} <_start\+0x4> -+ 18000[0-9a-f]{2}: 38 63 10 00 addi r3,r3,4096 -+ 18000[0-9a-f]{2}: 80 83 80 00 lwz r4,-32768\(r3\) - --0+18000b8 <__tls_get_addr>: -- 18000b8: 4e 80 00 20 blr --#pass -\ No newline at end of file -+0+18000[0-9a-f]{2} <__tls_get_addr>: -+ 18000[0-9a-f]{2}: 4e 80 00 20 blr -+#pass ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d -@@ -9,17 +9,17 @@ - - Disassembly of section \.text: - --0+100000e8 <\.__tls_get_addr>: -- 100000e8: 4e 80 00 20 blr -+0+10000[0-9a-f]{3} <\.__tls_get_addr>: -+ 10000[0-9a-f]{3}: 4e 80 00 20 blr - - Disassembly of section \.no_opt1: - --0+100000ec <\.no_opt1>: -- 100000ec: 38 62 80 08 addi r3,r2,-32760 -- 100000f0: 2c 24 00 00 cmpdi r4,0 -- 100000f4: 41 82 00 10 beq- .* -- 100000f8: 4b ff ff f1 bl 100000e8 <\.__tls_get_addr> -- 100000fc: 60 00 00 00 nop -- 10000100: 48 00 00 0c b .* -- 10000104: 4b ff ff e5 bl 100000e8 <\.__tls_get_addr> -- 10000108: 60 00 00 00 nop -+0+10000[0-9a-f]{3} <\.no_opt1>: -+ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 -+ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 -+ 10000[0-9a-f]{3}: 41 82 00 10 beq- .* -+ 10000[0-9a-f]{3}: 4b ff ff f1 bl 10000[0-9a-f]{3} <\.__tls_get_addr> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 48 00 00 0c b .* -+ 10000[0-9a-f]{3}: 4b ff ff e5 bl 10000[0-9a-f]{3} <\.__tls_get_addr> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d -@@ -9,16 +9,16 @@ - - Disassembly of section \.text: - --0+1800094 <__tls_get_addr>: -- 1800094: 4e 80 00 20 blr -+0+18000[0-9a-f]{2} <__tls_get_addr>: -+ 18000[0-9a-f]{2}: 4e 80 00 20 blr - - Disassembly of section \.no_opt1: - --0+1800098 <\.no_opt1>: -- 1800098: 38 6d ff f4 addi r3,r13,-12 -- 180009c: 2c 04 00 00 cmpwi r4,0 -- 18000a0: 41 82 00 0c beq- .* -- 18000a4: 4b ff ff f1 bl 1800094 <__tls_get_addr> -- 18000a8: 48 00 00 08 b .* -- 18000ac: 4b ff ff e9 bl 1800094 <__tls_get_addr> -+0+18000[0-9a-f]{2} <\.no_opt1>: -+ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 -+ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 -+ 18000[0-9a-f]{2}: 41 82 00 0c beq- .* -+ 18000[0-9a-f]{2}: 4b ff ff f1 bl 18000[0-9a-f]{2} <__tls_get_addr> -+ 18000[0-9a-f]{2}: 48 00 00 08 b .* -+ 18000[0-9a-f]{2}: 4b ff ff e9 bl 18000[0-9a-f]{2} <__tls_get_addr> - #pass ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d -@@ -9,15 +9,15 @@ - - Disassembly of section \.text: - --0+100000e8 <\.__tls_get_addr>: -- 100000e8: 4e 80 00 20 blr -+0+10000[0-9a-f]{3} <\.__tls_get_addr>: -+ 10000[0-9a-f]{3}: 4e 80 00 20 blr - - Disassembly of section \.no_opt2: - --0+100000ec <\.no_opt2>: -- 100000ec: 38 62 80 08 addi r3,r2,-32760 -- 100000f0: 2c 24 00 00 cmpdi r4,0 -- 100000f4: 41 82 00 08 beq- .* -- 100000f8: 38 62 80 08 addi r3,r2,-32760 -- 100000fc: 4b ff ff ed bl 100000e8 <\.__tls_get_addr> -- 10000100: 60 00 00 00 nop -+0+10000[0-9a-f]{3} <\.no_opt2>: -+ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 -+ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 -+ 10000[0-9a-f]{3}: 41 82 00 08 beq- .* -+ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 -+ 10000[0-9a-f]{3}: 4b ff ff ed bl 10000[0-9a-f]{3} <\.__tls_get_addr> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d -@@ -9,15 +9,15 @@ - - Disassembly of section \.text: - --0+1800094 <__tls_get_addr>: -- 1800094: 4e 80 00 20 blr -+0+18000[0-9a-f]{2} <__tls_get_addr>: -+ 18000[0-9a-f]{2}: 4e 80 00 20 blr - - Disassembly of section \.no_opt2: - --0+1800098 <\.no_opt2>: -- 1800098: 38 6d ff f4 addi r3,r13,-12 -- 180009c: 2c 04 00 00 cmpwi r4,0 -- 18000a0: 41 82 00 08 beq- .* -- 18000a4: 38 6d ff f4 addi r3,r13,-12 -- 18000a8: 4b ff ff ed bl 1800094 <__tls_get_addr> -+0+18000[0-9a-f]{2} <\.no_opt2>: -+ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 -+ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 -+ 18000[0-9a-f]{2}: 41 82 00 08 beq- .* -+ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 -+ 18000[0-9a-f]{2}: 4b ff ff ed bl 18000[0-9a-f]{2} <__tls_get_addr> - #pass ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d -@@ -9,18 +9,18 @@ - - Disassembly of section \.text: - --00000000100000e8 <\.__tls_get_addr>: -- 100000e8: 4e 80 00 20 blr -+0000000010000[0-9a-f]{3} <\.__tls_get_addr>: -+ 10000[0-9a-f]{3}: 4e 80 00 20 blr - - Disassembly of section \.no_opt3: - --00000000100000ec <\.no_opt3>: -- 100000ec: 38 62 80 08 addi r3,r2,-32760 -- 100000f0: 48 00 00 0c b .* -- 100000f4: 38 62 80 18 addi r3,r2,-32744 -- 100000f8: 48 00 00 10 b .* -- 100000fc: 4b ff ff ed bl 100000e8 <\.__tls_get_addr> -- 10000100: 60 00 00 00 nop -- 10000104: 48 00 00 0c b .* -- 10000108: 4b ff ff e1 bl 100000e8 <\.__tls_get_addr> -- 1000010c: 60 00 00 00 nop -+0000000010000[0-9a-f]{3} <\.no_opt3>: -+ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 -+ 10000[0-9a-f]{3}: 48 00 00 0c b .* -+ 10000[0-9a-f]{3}: 38 62 80 18 addi r3,r2,-32744 -+ 10000[0-9a-f]{3}: 48 00 00 10 b .* -+ 10000[0-9a-f]{3}: 4b ff ff ed bl 10000[0-9a-f]{3} <\.__tls_get_addr> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 48 00 00 0c b .* -+ 10000[0-9a-f]{3}: 4b ff ff e1 bl 10000[0-9a-f]{3} <\.__tls_get_addr> -+ 10000[0-9a-f]{3}: 60 00 00 00 nop ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d -@@ -9,17 +9,17 @@ - - Disassembly of section \.text: - --0+1800094 <__tls_get_addr>: -- 1800094: 4e 80 00 20 blr -+0+18000[0-9a-f]{2} <__tls_get_addr>: -+ 18000[0-9a-f]{2}: 4e 80 00 20 blr - - Disassembly of section \.no_opt3: - --0+1800098 <\.no_opt3>: -- 1800098: 38 6d ff ec addi r3,r13,-20 -- 180009c: 48 00 00 0c b .* -- 18000a0: 38 6d ff f4 addi r3,r13,-12 -- 18000a4: 48 00 00 0c b .* -- 18000a8: 4b ff ff ed bl 1800094 <__tls_get_addr> -- 18000ac: 48 00 00 08 b .* -- 18000b0: 4b ff ff e5 bl 1800094 <__tls_get_addr> -+0+18000[0-9a-f]{2} <\.no_opt3>: -+ 18000[0-9a-f]{2}: 38 6d ff ec addi r3,r13,-20 -+ 18000[0-9a-f]{2}: 48 00 00 0c b .* -+ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 -+ 18000[0-9a-f]{2}: 48 00 00 0c b .* -+ 18000[0-9a-f]{2}: 4b ff ff ed bl 18000[0-9a-f]{2} <__tls_get_addr> -+ 18000[0-9a-f]{2}: 48 00 00 08 b .* -+ 18000[0-9a-f]{2}: 4b ff ff e5 bl 18000[0-9a-f]{2} <__tls_get_addr> - #pass ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d -@@ -9,40 +9,40 @@ - - Disassembly of section \.text: - --0+100000e8 <\.__tls_get_addr>: -- 100000e8: 4e 80 00 20 blr -+0+10000[0-9a-f]{3} <\.__tls_get_addr>: -+ 10000[0-9a-f]{3}: 4e 80 00 20 blr - - Disassembly of section \.opt1: - --0+100000ec <\.opt1>: -- 100000ec: 3c 6d 00 00 addis r3,r13,0 -- 100000f0: 2c 24 00 00 cmpdi r4,0 -- 100000f4: 41 82 00 10 beq- .* -- 100000f8: 60 00 00 00 nop -- 100000fc: 38 63 90 10 addi r3,r3,-28656 -- 10000100: 48 00 00 0c b .* -- 10000104: 60 00 00 00 nop -- 10000108: 38 63 90 10 addi r3,r3,-28656 -+0+10000[0-9a-f]{3} <\.opt1>: -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 -+ 10000[0-9a-f]{3}: 41 82 00 10 beq- .* -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 -+ 10000[0-9a-f]{3}: 48 00 00 0c b .* -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 - - Disassembly of section \.opt2: - --0+1000010c <\.opt2>: -- 1000010c: 3c 6d 00 00 addis r3,r13,0 -- 10000110: 2c 24 00 00 cmpdi r4,0 -- 10000114: 41 82 00 08 beq- .* -- 10000118: 3c 6d 00 00 addis r3,r13,0 -- 1000011c: 60 00 00 00 nop -- 10000120: 38 63 90 10 addi r3,r3,-28656 -+0+10000[0-9a-f]{3} <\.opt2>: -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 -+ 10000[0-9a-f]{3}: 41 82 00 08 beq- .* -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 - - Disassembly of section \.opt3: - --0+10000124 <\.opt3>: -- 10000124: 3c 6d 00 00 addis r3,r13,0 -- 10000128: 48 00 00 0c b .* -- 1000012c: 3c 6d 00 00 addis r3,r13,0 -- 10000130: 48 00 00 10 b .* -- 10000134: 60 00 00 00 nop -- 10000138: 38 63 90 10 addi r3,r3,-28656 -- 1000013c: 48 00 00 0c b .* -- 10000140: 60 00 00 00 nop -- 10000144: 38 63 90 08 addi r3,r3,-28664 -+0+10000[0-9a-f]{3} <\.opt3>: -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 48 00 00 0c b .* -+ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 -+ 10000[0-9a-f]{3}: 48 00 00 10 b .* -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 -+ 10000[0-9a-f]{3}: 48 00 00 0c b .* -+ 10000[0-9a-f]{3}: 60 00 00 00 nop -+ 10000[0-9a-f]{3}: 38 63 90 08 addi r3,r3,-28664 ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d -@@ -9,36 +9,36 @@ - - Disassembly of section \.text: - --0+1800094 <__tls_get_addr>: -- 1800094: 4e 80 00 20 blr -+0+18000[0-9a-f]{2} <__tls_get_addr>: -+ 18000[0-9a-f]{2}: 4e 80 00 20 blr - - Disassembly of section \.opt1: - --0+1800098 <\.opt1>: -- 1800098: 3c 62 00 00 addis r3,r2,0 -- 180009c: 2c 04 00 00 cmpwi r4,0 -- 18000a0: 41 82 00 0c beq- .* -- 18000a4: 38 63 90 10 addi r3,r3,-28656 -- 18000a8: 48 00 00 08 b .* -- 18000ac: 38 63 90 10 addi r3,r3,-28656 -+0+18000[0-9a-f]{2} <\.opt1>: -+ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 -+ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 -+ 18000[0-9a-f]{2}: 41 82 00 0c beq- .* -+ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 -+ 18000[0-9a-f]{2}: 48 00 00 08 b .* -+ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 - - Disassembly of section \.opt2: - --0+18000b0 <\.opt2>: -- 18000b0: 3c 62 00 00 addis r3,r2,0 -- 18000b4: 2c 04 00 00 cmpwi r4,0 -- 18000b8: 41 82 00 08 beq- .* -- 18000bc: 3c 62 00 00 addis r3,r2,0 -- 18000c0: 38 63 90 10 addi r3,r3,-28656 -+0+18000[0-9a-f]{2} <\.opt2>: -+ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 -+ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 -+ 18000[0-9a-f]{2}: 41 82 00 08 beq- .* -+ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 -+ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 - - Disassembly of section \.opt3: - --0+18000c4 <\.opt3>: -- 18000c4: 3c 62 00 00 addis r3,r2,0 -- 18000c8: 48 00 00 0c b .* -- 18000cc: 3c 62 00 00 addis r3,r2,0 -- 18000d0: 48 00 00 0c b .* -- 18000d4: 38 63 90 10 addi r3,r3,-28656 -- 18000d8: 48 00 00 08 b .* -- 18000dc: 38 63 90 08 addi r3,r3,-28664 -+0+18000[0-9a-f]{2} <\.opt3>: -+ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 -+ 18000[0-9a-f]{2}: 48 00 00 0c b .* -+ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 -+ 18000[0-9a-f]{2}: 48 00 00 0c b .* -+ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 -+ 18000[0-9a-f]{2}: 48 00 00 08 b .* -+ 18000[0-9a-f]{2}: 38 63 90 08 addi r3,r3,-28664 - #pass ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d -@@ -42,5 +42,5 @@ Disassembly of section \.got: - #... - .*: 4e 80 00 21 blrl - .* <_GLOBAL_OFFSET_TABLE_>: --.*: 00 01 03 ec .* -+.*: 00 01 [0-9a-f]{2} [0-9a-f]{2} .* - #pass ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g -@@ -9,5 +9,5 @@ - Contents of section \.got: - .* 00000000 00000000 00000000 00000000 .* - .* 00000000 00000000 00000000 00000000 .* --.* 00000000 4e800021 000103ec 00000000 .* -+.* 00000000 4e800021 00010[0-9a-f]{3} 00000000 .* - .* 00000000 .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r -@@ -35,6 +35,7 @@ Program Headers: - +LOAD .* RWE 0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+1c 0x0+38 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections\.\.\. -@@ -42,6 +43,7 @@ Program Headers: - +01 +\.tdata \.dynamic \.got \.plt - +02 +\.dynamic - +03 +\.tdata \.tbss -+ +04 + - - Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries: - Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend -@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries: - [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0 - [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0 - [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0 --[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4 --[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8 --[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8 -+[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3} -+[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3} -+[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3} - [0-9a-f ]+R_PPC_DTPMOD32 +0 - [0-9a-f ]+R_PPC_DTPREL32 +0 - [0-9a-f ]+R_PPC_DTPMOD32 +0 ---- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g -@@ -8,8 +8,8 @@ - .*: +file format elf64-powerpc - - Contents of section \.got: -- 100101a0 00000000 00000001 00000000 00000000 .* -- 100101b0 00000000 00000001 00000000 00000000 .* -- 100101c0 00000000 00000001 00000000 00000000 .* -- 100101d0 00000000 00000001 00000000 00000000 .* -- 100101e0 ffffffff ffff8060 00000000 00000000 .* -+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* -+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* -+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* -+ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* -+ 10010[0-9a-f]{3} ffffffff ffff8060 00000000 00000000 .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t -@@ -8,7 +8,7 @@ - .*: +file format elf64-powerpc - - Contents of section \.tdata: -- 10010148 00c0ffee 00000000 12345678 9abcdef0 .* -- 10010158 23456789 abcdef01 3456789a bcdef012 .* -- 10010168 456789ab cdef0123 56789abc def01234 .* -- 10010178 6789abcd ef012345 789abcde f0123456 .* -+ 10010180 00c0ffee 00000000 12345678 9abcdef0 .* -+ 10010190 23456789 abcdef01 3456789a bcdef012 .* -+ 100101a0 456789ab cdef0123 56789abc def01234 .* -+ 100101b0 6789abcd ef012345 789abcde f0123456 .* ---- binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g -+++ binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g -@@ -7,7 +7,7 @@ - .*: +file format elf64-powerpc - - Contents of section \.got: --.* 00000000 000186c0 00000000 00000000 .* -+.* 00000000 000186f8 00000000 00000000 .* - .* 00000000 00000000 00000000 00000000 .* - .* 00000000 00000000 00000000 00000000 .* - .* 00000000 00000000 00000000 00000000 .* ---- binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd -+++ binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd -@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+60 0x0+a0 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -52,6 +53,7 @@ Program Headers: - +03 +.tdata .dynamic .got * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rela.dyn' at offset .* contains 4 entries: - Offset +Info +Type +Sym.Value +Sym. Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd -+++ binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd -@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+60 0x0+a0 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -52,6 +53,7 @@ Program Headers: - +03 +.tdata .dynamic .got * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-s390/tlspic.rd -+++ binutils-2.23/ld/testsuite/ld-s390/tlspic.rd -@@ -39,6 +39,7 @@ Program Headers: - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+60 0x0+80 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -46,6 +47,7 @@ Program Headers: - +01 +.tdata .dynamic .got - +02 +.dynamic - +03 +.tdata .tbss -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: - Offset +Info +Type +Sym.Value +Sym. Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd -+++ binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd -@@ -39,6 +39,7 @@ Program Headers: - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+60 0x0+80 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -46,6 +47,7 @@ Program Headers: - +01 +.tdata .dynamic .got * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d -+++ binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d -@@ -8,7 +8,9 @@ - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg +Align - +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ [RWE ]+ +0x[0-9a-f]+ -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections\.\.\. - +00 +.text -+ +01 + ---- binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d -+++ binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d -@@ -44,6 +44,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections\.\.\. -@@ -53,6 +54,7 @@ Program Headers: - +03 +\.tdata \.dynamic \.got * - +04 +\.dynamic * - +05 +\.tdata \.tbss * -+ +06 + - - Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries: - Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d -+++ binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d -@@ -32,7 +32,7 @@ Key to Flags: - - Elf file type is DYN \(Shared object file\) - Entry point 0x[0-9a-f]+ --There are 4 program headers, starting at offset [0-9]+ -+There are [0-9] program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -@@ -40,6 +40,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS .* 0x0+18 0x0+20 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections\.\.\. -@@ -47,6 +48,7 @@ Program Headers: - +01 +\.tdata \.dynamic \.got * - +02 +\.dynamic * - +03 +\.tdata \.tbss * -+ +04 + - - Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries: - Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd -@@ -31,6 +31,7 @@ Program Headers: - +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000 - +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000 - +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: ---- binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd -@@ -31,6 +31,7 @@ Program Headers: - +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000 - +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000 - +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: ---- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd -@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align -- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4 -- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1 -+ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4 -+ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1 - .*Requesting program interpreter.* - +LOAD .* R E 0x10000 - +LOAD .* RW +0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+1060 0x0+10a0 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: ---- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd -@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8 -- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1 -+ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8 -+ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1 - .*Requesting program interpreter.* - +LOAD .* R E 0x100000 - +LOAD .* RW +0x100000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+60 0x0+a0 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: ---- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd -@@ -32,6 +32,7 @@ Program Headers: - +LOAD .* RW +0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+ 0x0+24 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries: ---- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd -@@ -32,6 +32,7 @@ Program Headers: - +LOAD .* RW +0x100000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+ 0x0+24 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: ---- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd -@@ -36,6 +36,7 @@ Program Headers: - +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000 - +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4 - +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: ---- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd -+++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd -@@ -36,6 +36,7 @@ Program Headers: - +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000 - +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8 - +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: ---- binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd -+++ binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd -@@ -36,12 +36,14 @@ Program Headers: - +LOAD.* - +LOAD.* - +DYNAMIC.* -+ +PAX_FLAGS.* - - Section to Segment mapping: - +Segment Sections... - +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text * - +01 +.dynamic .got .got.plt * - +02 +.dynamic * -+ +03 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend ---- binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd -+++ binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd -@@ -40,6 +40,7 @@ Program Headers: - +LOAD +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+244 0x0+244 RW +0x200000 - +DYNAMIC +0x0+1210 0x0+201210 0x0+201210 0x0+130 0x0+130 RW +0x8 - +TLS +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+60 0x0+80 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -47,6 +48,7 @@ Program Headers: - +01 +.tdata .dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 26acd085bb85..7a2796b48ca8 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -70,7 +70,7 @@ let }; meta = { - description = "a fast, free distributed C/C++ compiler"; + description = "A fast, free distributed C/C++ compiler"; homepage = "http://distcc.org"; license = "GPL"; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index dc7eb5cabfd0..08631fd0352b 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -1,34 +1,36 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, perl, perlPackages, buildPerlPackage }: assert stdenv ? glibc; -stdenv.mkDerivation rec { +buildPerlPackage rec { name = "ninka-${version}"; - version = "1.1"; + version = "2.0-pre"; - src = fetchurl { - url = "https://github.com/dmgerman/ninka/archive/${version}.tar.gz"; - sha256 = "1cvbsmanw3i9igiafpx0ghg658c37riw56mjk5vsgpmnn3flvhib"; + src = fetchFromGitHub { + owner = "dmgerman"; + repo = "ninka"; + rev = "b89b59ecd057dfc939d0c75acaddebb58fcd8cba"; + sha256 = "1grlis1kycbcjvjgqvn7aw81q1qx49ahvxg2k7cgyr79mvgpgi9m"; }; - buildInputs = [ perl ]; - - buildPhase = '' - cd comments - sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/local/man|$out/share/man|g" Makefile - make - ''; - - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - make install + buildInputs = with perlPackages; [ perl TestOutput DBDSQLite DBI TestPod TestPodCoverage SpreadsheetParseExcel ]; - cp -a ../{ninka.pl,extComments,splitter,filter,senttok,matcher} $out/bin + doCheck = false; # hangs + + preConfigure = '' + sed -i.bak -e 's;#!/usr/bin/perl;#!${perl}/bin/perl;g' \ + ./bin/ninka-excel ./bin/ninka ./bin/ninka-sqlite \ + ./scripts/unify.pl ./scripts/parseLicense.pl \ + ./scripts/license_matcher_modified.pl \ + ./scripts/sort_package_license_list.pl + perl Makefile.PL ''; - - meta = { + + meta = with stdenv.lib; { description = "A sentence based license detector"; homepage = "http://ninka.turingmachine.org/"; - license = stdenv.lib.licenses.agpl3Plus; + license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index 91b343b20b4c..f543d3a475c1 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 usb-modeswitch ]; meta = { - description = "device database and the rules file for 'multi-mode' USB devices"; + description = "Device database and the rules file for 'multi-mode' USB devices"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 9aad2edfa4ec..893df94d2379 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { - description = "a mode switching tool for controlling 'multi-mode' USB devices"; + description = "A mode switching tool for controlling 'multi-mode' USB devices"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 1d7e6b330423..07cc55465d10 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://furius.ca/xxdiff/"; - description = "graphical file and directories comparator and merge tool"; + description = "Graphical file and directories comparator and merge tool"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 9c781e6f7577..c68c29f86dea 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { ''; meta = { - description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior"; + description = "Load testing software for Web applications to realistically simulate user activity and analyze server behavior"; homepage = https://www.neotys.com/product/overview-neoload.html; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 594ec7de53a2..753c91aa6880 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.complang.org/ragel; description = "State machine compiler"; license = licenses.gpl2; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4a6cdc3aa34b..d5a6889c06af 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "checks CSS for syntax errors and other problems"; + description = "Checks CSS for syntax errors and other problems"; longDescription = '' CSSLint is a tool to help point out problems with your CSS code. It does basic syntax checking as well as applying a set of diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index bf8dcb1ca639..1447fed2a82e 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -8,7 +8,7 @@ assert releaseType == "alpha" || releaseType == "headless"; with stdenv.lib; let - version = "0.12.33"; + version = "0.12.35"; isHeadless = releaseType == "headless"; arch = if stdenv.system == "x86_64-linux" then { @@ -25,12 +25,12 @@ let url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; # TODO take this from 302 redirection somehow? fetchurl doesn't help. x64 = { - headless = fetchurl { inherit name url; sha256 = "073bwkpw2bwhbr3m8k3imlns89x5035xl4b7yq1c6npm4m7qcdnp"; }; - alpha = authenticatedFetch { inherit url; sha256 = "0dmq0kvzz885gcvj57h22icqhx0nvyfav4dvwsvpi15833208ca3"; }; + headless = fetchurl { inherit name url; sha256 = "1pdfd6qpzdzxsz1pvf1qasw5p6mzidi2q5d5m8x0gqyxaqdg175b"; }; + alpha = authenticatedFetch { inherit url; sha256 = "1r2q5hvx8248vfl7jg9jr0sk9kxhh5lg4qlv828j44dmgsxyhn1y"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = authenticatedFetch { inherit url; sha256 = "1yxv6kr89iavpfsg21fx3q12m97ls0m9h3x33m4xnqp8px55851v"; }; + alpha = authenticatedFetch { inherit url; sha256 = "1f3hl6m59zvmjrph0kj7fh1axdahgan1v5v3y4rdc6idamvr7rrf"; }; }; }; @@ -38,6 +38,8 @@ let use-system-read-write-data-directories=false [path] read-data=$out/share/factorio/data/ + [other] + check_updates=false ''; updateConfigSh = '' diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index d263be3ec115..143fa21ce2e5 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf(" sed '1i#include <cmath>' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \ -i Sources/Draw/SWMapRenderer.cpp + sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h ''; nativeBuildInputs = diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index b3237012eccd..5e5da9497e58 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.uberent.com/pa/; - description = "next-generation RTS that takes the genre to a planetary scale"; + description = "Next-generation RTS that takes the genre to a planetary scale"; license = stdenv.lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index cf587ce89dd6..68114bb75652 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, qt4, box2d, which, cmake }: +{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }: stdenv.mkDerivation rec { name = "tbe-${version}"; - version = "0.9.2.1"; + version = "0.9.3.1"; - src = fetchurl { - url = "https://github.com/kaa-ching/tbe/archive/v${version}.tar.gz"; - sha256 = "1cs4q9qiakfd2m1lvfsvfgf8yvhxzmc06glng5d80piwyn6ymzxg"; + src = fetchgit { + url = "https://github.com/kaa-ching/tbe"; + rev = "refs/tags/v${version}"; + sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"; }; postPatch = "sed '1i#include <vector>' -i src/model/World.h"; - buildInputs = [ qt4 box2d which cmake ]; - + buildInputs = [ + qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake + gettext + ]; enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix index 6ac61571d4cb..0d6c21bfa823 100644 --- a/pkgs/games/zandronum/bin.nix +++ b/pkgs/games/zandronum/bin.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zandronum.com/; - description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play"; + description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play"; maintainers = [ stdenv.lib.maintainers.lassulus ]; # Binary version has different version string than source code version. license = stdenv.lib.licenses.unfreeRedistributable; diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index ab7a6d7cb432..cf5e41f389a9 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "rogue-like game"; + description = "Rogue-like game"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index c1ff6cb94934..e5cd08b7f9de 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "a portable, freeware Super Nintendo Entertainment System (SNES) emulator"; + description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan."; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 52e970b5b822..14d487da82ba 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.fsij.org/pages/gnuk; - description = "an implementation of USB cryptographic token for gpg"; + description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 48b30bccbdd8..80e405d4442f 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; - description = "light-locker is a simple locker"; + description = "Light-locker is a simple locker"; longDescription = '' light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies. It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix index 2260ac08b632..e46aecbd4142 100644 --- a/pkgs/os-specific/linux/cgmanager/default.nix +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://linuxcontainers.org/cgmanager/introduction/; - description = "a central privileged daemon that manages all your cgroups"; + 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/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 619e37c2c4bc..8f7772de1fdc 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, python, pythonPackages }: stdenv.mkDerivation rec { - name = "dstat-0.7.2"; + name = "dstat-${version}"; + version = "0.7.3"; src = fetchurl { - url = "http://dag.wieers.com/home-made/dstat/${name}.tar.bz2"; - sha256 = "1bivnciwlamnl9q6i5ygr7jhs8pp833z2bkbrffvsa60szcqda9l"; + url = "https://github.com/dagwieers/dstat/archive/${version}.tar.gz"; + sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6"; }; buildInputs = with pythonPackages; [ python-wifi wrapPython ]; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index fa0797bf7a3c..fd37d35623e4 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { [ libv4l gd ]; meta = { - description = "neat and simple webcam app"; + description = "Neat and simple webcam app"; homepage = http://www.sanslogic.co.uk/fswebcam; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix index f3909950cb91..8e24b5061cd3 100644 --- a/pkgs/os-specific/linux/fusionio/vsl.nix +++ b/pkgs/os-specific/linux/fusionio/vsl.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://fusionio.com; - description = "kernel driver for accessing fusion-io cards"; + description = "Kernel driver for accessing fusion-io cards"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; broken = stdenv.system != "x86_64-linux"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 4bc501a3ba27..f12a8b0ba271 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.12"; + version = "4.4.13"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r96jyvm44615f5zh5sn04zx7y8bllpx12lx1zjkns66i4ddv0rq"; + sha256 = "1zd661l1m455f80bwllzycyvzklkyv3ppfjhknw8fid4blvkvsr7"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 6a1d8da5a92b..981e6a97c2a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.90"; - modDirVersion = "3.18.20"; + mptcpVersion = "0.90.1"; + modDirVersion = "3.18.25"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { @@ -12,7 +12,7 @@ import ./generic.nix (args // rec { src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "1wzdvd1j1wqjkysj98g451y6mxr9a5hff5kn9inxwbzm9yg4icj5"; + sha256 = "088cpxl960xzrsz7x2lkq28ksa4gzjb1hp5yf8hxshihyhdaspwl"; }; extraConfig = '' diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 09280cd9063c..40848ab4ca45 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -94,8 +94,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.5.7"; - grrev = "201606142010"; - sha256 = "00lg4zlxxcl9a27vxl4c4cv6adsdvl00kkbl6s97523vsvsvy1q0"; + grrev = "201606202152"; + sha256 = "1xa9jx6ix8ycbfh9h30lwhhcsq0313q7yqdg8zfaba26lp49mp5n"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 8d05a0d7d232..a3d212dda53b 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://linux.dell.com/libsmbios/main"; - description = "a library to obtain BIOS information"; + description = "A library to obtain BIOS information"; license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 7765f5f8b9c2..3c7ceb1270c0 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "userspace locking validation tool built on the Linux kernel"; + description = "Userspace locking validation tool built on the Linux kernel"; homepage = "https://kernel.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 82ea72af1605..eda1863ec97b 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://lxc.sourceforge.net"; - description = "userspace tools for Linux Containers, a lightweight virtualization system"; + description = "Userspace tools for Linux Containers, a lightweight virtualization system"; license = licenses.lgpl21Plus; longDescription = '' diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e0b16eb24f5b..4b3e078cb57d 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ]; meta = with stdenv.lib; { - description = "the project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; + description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; homepage = http://netfilter.org/projects/nftables; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch deleted file mode 100644 index 5fdc1fed7272..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/kernel/nv-pat.c 2015-07-03 08:39:35.417031728 +0200 -+++ b/kernel/nv-pat.c 2015-07-03 08:42:15.631838988 +0200 -@@ -35,8 +35,13 @@ - unsigned long cr0 = read_cr0(); - write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); - wbinvd(); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) - *cr4 = read_cr4(); - if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); -+#else -+ *cr4 = __read_cr4(); -+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); -+#endif - __flush_tlb(); - } - -@@ -46,7 +51,11 @@ - wbinvd(); - __flush_tlb(); - write_cr0((cr0 & 0x9fffffff)); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) - if (cr4 & 0x80) write_cr4(cr4); -+#else -+ if (cr4 & 0x80) __write_cr4(cr4); -+#endif - } - - static int nv_determine_pat_mode(void) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 321e94e3aaf4..7f0d40f6be1f 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -53,5 +53,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://pkg-shadow.alioth.debian.org/; description = "Suite containing authentication-related tools such as passwd and su"; + passthru = { + shellPath = "/bin/nologin"; + }; }; } diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index c50f0185eb52..1d1712f6b476 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "make prefix=$out install install_doc"; meta = { - description = "user-space tools for the Linux kernel ftrace subsystem"; + description = "User-space tools for the Linux kernel ftrace subsystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index b73457293126..3180238c618b 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, flex, bison, readline }: +{ stdenv, fetchurl, flex, bison, readline +, enableIPv6 ? false }: stdenv.mkDerivation rec { - name = "bird-1.5.0"; + name = "bird-1.6.0"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "0pbvq6rx4ww46vcdslpiplb5fwq3mqma83434q38kx959qjw9mbr"; + sha256 = "04qf07cb04xdjnq0qxj6y8iqwyszk1vyark9gn5v6wxcvqvzwgfv"; }; buildInputs = [ flex bison readline ]; @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir /var" - ]; + ] ++ stdenv.lib.optional enableIPv6 "--enable-ipv6"; meta = { description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/certificate-transparency/default.nix b/pkgs/servers/certificate-transparency/default.nix deleted file mode 100644 index 292ca6bc0e37..000000000000 --- a/pkgs/servers/certificate-transparency/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, pkgs, ...}: - -stdenv.mkDerivation rec { - name = "certificate-transparency-${version}"; - - version = "2016-01-14"; - rev = "250672b5aef3666edbdfc9a75b95a09e7a57ed08"; - - meta = with stdenv.lib; { - homepage = https://www.certificate-transparency.org/; - description = "Auditing for TLS certificates"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ philandstuff ]; - }; - - src = pkgs.fetchFromGitHub { - owner = "google"; - repo = "certificate-transparency"; - rev = rev; - sha256 = "1gn0bqzkf09jvc2aq3da8fwhl65y7q57msqsh6iczvd6fdmrpfdj"; - }; - - # need to disable regex support in evhtp or building will fail - libevhtp_without_regex = stdenv.lib.overrideDerivation pkgs.libevhtp - (oldAttrs: { - cmakeFlags="-DEVHTP_DISABLE_REGEX:STRING=ON -DCMAKE_C_FLAGS:STRING=-fPIC"; - }); - - buildInputs = with pkgs; [ - autoconf automake clang_34 pkgconfig - glog gmock google-gflags gperftools gtest json_c leveldb - libevent libevhtp_without_regex openssl protobuf sqlite - ]; - - patches = [ - ./protobuf-include-from-env.patch - ]; - - doCheck = false; - - preConfigure = '' - ./autogen.sh - configureFlagsArray=( - CC=clang - CXX=clang++ - GMOCK_DIR=${pkgs.gmock} - GTEST_DIR=${pkgs.gtest} - ) - ''; - - # the default Makefile constructs BUILD_VERSION from `git describe` - # which isn't available in the nix build environment - makeFlags = "BUILD_VERSION=${version}-${rev}"; - - protocFlags = "-I ${pkgs.protobuf}/include"; -} diff --git a/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch b/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch deleted file mode 100644 index a1f9a1849b63..000000000000 --- a/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch +++ /dev/null @@ -1,14 +0,0 @@ -Get protobuf include path from environment - ---- a/python/Makefile -+++ b/python/Makefile -@@ -5,7 +5,7 @@ all: ct/proto/client_pb2.py ct/proto/ct_pb2.py ct/proto/tls_options_pb2.py \ - ct/proto/test_message_pb2.py ct/proto/certificate_pb2.py - - ct/proto/%_pb2.py: ct/proto/%.proto -- $(PROTOC) $^ -I/usr/include/ -I/usr/local/include -I$(INSTALL_DIR)/include -I. --python_out=. -+ $(PROTOC) $^ $(protocFlags) -I. --python_out=. - - ct/proto/ct_pb2.py: ../proto/ct.proto - $(PROTOC) --python_out=ct/proto -I../proto ../proto/ct.proto - diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix new file mode 100644 index 000000000000..8dc062b75043 --- /dev/null +++ b/pkgs/servers/coturn/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, openssl, libevent }: + +with { inherit (stdenv.lib) optional; }; + +stdenv.mkDerivation rec { + name = "coturn-${version}"; + version = "4.5.0.3"; + + src = fetchFromGitHub { + owner = "coturn"; + repo = "coturn"; + rev = "${version}"; + sha256 = "1xr4dp3p16m4rq9mdsprs6s50rnif6hk38xx9siyykgfjnwr6i9g"; + }; + + buildInputs = [ openssl libevent ]; + + patches = [ ./pure-configure.patch ]; + + meta = with stdenv.lib; { + homepage = http://coturn.net/; + license = with licenses; [ bsd3 ]; + description = "A TURN server"; + platforms = platforms.all; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/servers/coturn/pure-configure.patch b/pkgs/servers/coturn/pure-configure.patch new file mode 100644 index 000000000000..0315a71b1844 --- /dev/null +++ b/pkgs/servers/coturn/pure-configure.patch @@ -0,0 +1,17 @@ +diff --git a/configure b/configure +index 28a0625..ea25488 100755 +--- a/configure ++++ b/configure +@@ -624,12 +624,6 @@ fi + + TMPDIR="." + +-if [ -d /var/tmp ] ; then +- TMPDIR="/var/tmp" +-elif [ -d /tmp ] ; then +- TMPDIR=/tmp +-fi +- + ${ECHO_CMD} Use TMP dir ${TMPDIR} + + ######################### diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index d52973ea12f1..aa3ea07de537 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.18"; + version = "2.4.20"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0k7xm6ldzvakzq39nw6b39190ihlkc28all2gkvckxa1vr8b0i06"; + sha1 = "cefe8ea4a3f81c7a08e36c80ebbd792c67ab361b"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix index ba7c69ef7dbf..02cf49854ac8 100644 --- a/pkgs/servers/http/micro-httpd/default.nix +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://acme.com/software/micro_httpd/"; - description = "a really small HTTP server"; + description = "A really small HTTP server"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index f35497fef8e4..20cea2708895 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mini-httpd.nongnu.org/"; - description = "a minimalistic high-performance web server"; + description = "A minimalistic high-performance web server"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix new file mode 100644 index 000000000000..ba6a54fc973d --- /dev/null +++ b/pkgs/servers/inginious/default.nix @@ -0,0 +1,71 @@ +{ pkgs, lib, pythonPackages }: +with lib; + +let + docker_1_7_2 = pythonPackages.docker.override rec { + name = "docker-py-1.7.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/docker-py/${name}.tar.gz"; + sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; + }; + }; + + webpy-custom = pythonPackages.web.override { + name = "web.py-INGI"; + src = pkgs.fetchFromGitHub { + owner = "UCL-INGI"; + repo = "webpy-INGI"; + # tip of branch "ingi" + rev = "f487e78d65d6569eb70003e588d5c6ace54c384f"; + sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd"; + }; + }; + +in pythonPackages.buildPythonApplication rec { + version = "0.3a2.dev0"; + name = "inginious-${version}"; + + disabled = pythonPackages.isPy3k; + + patchPhase = '' + # transient failures + substituteInPlace inginious/backend/tests/TestRemoteAgent.py \ + --replace "test_update_task_directory" "noop" + ''; + + propagatedBuildInputs = with pythonPackages; [ + requests2 + cgroup-utils docker_1_7_2 docutils lti mock pygments + pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib + websocket_client watchdog webpy-custom flup + ]; + + buildInputs = with pythonPackages; [ nose selenium virtual-display ]; + + /* Hydra fix exists only on github for now. + src = pkgs.fetchurl { + url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz"; + }; + */ + src = pkgs.fetchFromGitHub { + owner = "UCL-INGI"; + repo = "INGInious"; + rev = "07d111c0a3045c7cc4e464d4adb8aa28b75a6948"; + sha256 = "0kldbkc9yw1mgg5w5q5v8k2hz089c5c4rvxb5xhbagkzgm2gn230"; + }; + + # Only patch shebangs in /bin, other scripts are run within docker + # containers and will fail if patched. + dontPatchShebangs = true; + preFixup = '' + patchShebangs $prefix/bin + ''; + + meta = { + description = "An intelligent grader that allows secured and automated testing of code made by students"; + homepage = "https://github.com/UCL-INGI/INGInious"; + license = licenses.agpl3; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 39667c8ba626..c5f7a45cefea 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://directory.fedoraproject.org/; - description = "enterprise-class Open Source LDAP server for Linux"; + description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index cf8aea594325..3ecb00b64fc3 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://petidomo.sourceforge.net/"; - description = "a simple and easy to administer mailing list server"; + description = "A simple and easy to administer mailing list server"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index f45dd3b7248a..c8202b35455c 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { makeFlags = "DESTDIR=$(out) prefix="; meta = { - description = "a collection of postfix-related tools"; + description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; homepage = https://github.com/Fruneau/pfixtools; }; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 0888eb1182a0..92b529fc564c 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/vstakhov/rspamd"; license = licenses.asl20; - description = "advanced spam filtering system"; + description = "Advanced spam filtering system"; maintainers = with maintainers; [ avnik fpletz ]; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 7a558a030319..2881b2f3805d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, buildPythonApplication, pythonPackages, fetchurl, fetchFromGitHub }: +{ lib, pkgs, stdenv, buildPythonApplication, pythonPackages, fetchurl, fetchFromGitHub }: let matrix-angular-sdk = buildPythonApplication rec { name = "matrix-angular-sdk-${version}"; @@ -12,13 +12,13 @@ let in buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.14.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; - rev = "5fbdf2bcec40bf2f24fc0698440ee384595ff027"; - sha256 = "1f9flb68l0bb5fkggxz1pghv72snsx6yia3s58f85z13f9vh84cb"; + rev = "v${version}"; + sha256 = "166y1f74wjkrpks88cp67w33rcs02b4dk815yj93lfla1k9ypg6b"; }; patches = [ ./matrix-synapse.patch ]; @@ -27,7 +27,7 @@ buildPythonApplication rec { blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml - matrix-angular-sdk + matrix-angular-sdk bleach netaddr jinja2 psycopg2 ]; # Checks fail because of Tox. @@ -37,9 +37,10 @@ buildPythonApplication rec { mock setuptoolsTrial ]; - meta = { + meta = with stdenv.lib; { homepage = https://matrix.org; description = "Matrix reference homeserver"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index ffcd507653a0..8b8d1ba0ae16 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc"; }; + postPatch = '' + substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash + substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash + sed '1i#include <cmath>' -i arangod/Aql/Functions.cpp \ + -i lib/Basics/string-buffer.cpp + ''; + buildInputs = [ openssl zlib python gyp go readline ]; @@ -19,12 +26,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - patchPhase = '' - substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash - substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 1372b6a3fc36..9f119b3f1389 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,26 +1,29 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "influxdb-${rev}"; - rev = "v0.9.4"; - goPackagePath = "github.com/influxdb/influxdb"; + name = "influxdb-${version}"; + version = "0.13.0"; + + goPackagePath = "github.com/influxdata/influxdb"; src = fetchFromGitHub { - inherit rev; - owner = "influxdb"; + owner = "influxdata"; repo = "influxdb"; - sha256 = "0yarymppnlpf2xab57i8jx595v47s5mdwnf13719mc1fv3q84yqn"; + rev = "v${version}"; + sha256 = "0f7af5jb1f65qnslhc7zccml1qvk6xx5naczqfsf4s1zc556fdi4"; }; excludedPackages = "test"; + # Generated with the `gdm2nix.rb` script and the `Godeps` file from the + # influxdb repo root. goDeps = ./deps.json; meta = with lib; { description = "An open-source distributed time series database"; license = licenses.mit; homepage = https://influxdb.com/; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline zimbatm ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/nosql/influxdb/deps.json b/pkgs/servers/nosql/influxdb/deps.json index f091b58e8dc4..33388cc0fb79 100644 --- a/pkgs/servers/nosql/influxdb/deps.json +++ b/pkgs/servers/nosql/influxdb/deps.json @@ -1,21 +1,200 @@ [ { - "include": "../../libs.json", - "packages": [ - "github.com/peterh/liner", - "github.com/BurntSushi/toml", - "github.com/kimor79/gollectd", - "github.com/bmizerany/pat", - "gopkg.in/fatih/pool.v2", - "github.com/rakyll/statik", - "github.com/armon/go-metrics", - "github.com/boltdb/bolt", - "github.com/golang/snappy", - "github.com/hashicorp/go-msgpack", - "github.com/hashicorp/raft-boltdb", - "golang.org/x/crypto", - "github.com/gogo/protobuf", - "github.com/hashicorp/raft" - ] + "goPackagePath": "collectd.org", + "fetch": { + "type": "git", + "url": "https://github.com/collectd/go-collectd.git", + "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98", + "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w" + } + }, + { + "goPackagePath": "github.com/BurntSushi/toml", + "fetch": { + "type": "git", + "url": "https://github.com/BurntSushi/toml.git", + "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4", + "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf" + } + }, + { + "goPackagePath": "github.com/armon/go-metrics", + "fetch": { + "type": "git", + "url": "https://github.com/armon/go-metrics.git", + "rev": "345426c77237ece5dab0e1605c3e4b35c3f54757", + "sha256": "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5" + } + }, + { + "goPackagePath": "github.com/bmizerany/pat", + "fetch": { + "type": "git", + "url": "https://github.com/bmizerany/pat.git", + "rev": "b8a35001b773c267eb260a691f4e5499a3531600", + "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" + } + }, + { + "goPackagePath": "github.com/boltdb/bolt", + "fetch": { + "type": "git", + "url": "https://github.com/boltdb/bolt.git", + "rev": "2f846c3551b76d7710f159be840d66c3d064abbe", + "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5" + } + }, + { + "goPackagePath": "github.com/davecgh/go-spew", + "fetch": { + "type": "git", + "url": "https://github.com/davecgh/go-spew.git", + "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c", + "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232" + } + }, + { + "goPackagePath": "github.com/dgryski/go-bits", + "fetch": { + "type": "git", + "url": "https://github.com/dgryski/go-bits.git", + "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e", + "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b" + } + }, + { + "goPackagePath": "github.com/dgryski/go-bitstream", + "fetch": { + "type": "git", + "url": "https://github.com/dgryski/go-bitstream.git", + "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92", + "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6" + } + }, + { + "goPackagePath": "github.com/gogo/protobuf", + "fetch": { + "type": "git", + "url": "https://github.com/gogo/protobuf.git", + "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06", + "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b" + } + }, + { + "goPackagePath": "github.com/golang/snappy", + "fetch": { + "type": "git", + "url": "https://github.com/golang/snappy.git", + "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab", + "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s" + } + }, + { + "goPackagePath": "github.com/hashicorp/go-msgpack", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/go-msgpack.git", + "rev": "fa3f63826f7c23912c15263591e65d54d080b458", + "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k" + } + }, + { + "goPackagePath": "github.com/hashicorp/raft", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/raft.git", + "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839", + "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f" + } + }, + { + "goPackagePath": "github.com/hashicorp/raft-boltdb", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/raft-boltdb.git", + "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", + "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" + } + }, + { + "goPackagePath": "github.com/influxdata/usage-client", + "fetch": { + "type": "git", + "url": "https://github.com/influxdata/usage-client.git", + "rev": "475977e68d79883d9c8d67131c84e4241523f452", + "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy" + } + }, + { + "goPackagePath": "github.com/jwilder/encoding", + "fetch": { + "type": "git", + "url": "https://github.com/jwilder/encoding.git", + "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37", + "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq" + } + }, + { + "goPackagePath": "github.com/kimor79/gollectd", + "fetch": { + "type": "git", + "url": "https://github.com/kimor79/gollectd.git", + "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc", + "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs" + } + }, + { + "goPackagePath": "github.com/paulbellamy/ratecounter", + "fetch": { + "type": "git", + "url": "https://github.com/paulbellamy/ratecounter.git", + "rev": "5a11f585a31379765c190c033b6ad39956584447", + "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0" + } + }, + { + "goPackagePath": "github.com/peterh/liner", + "fetch": { + "type": "git", + "url": "https://github.com/peterh/liner.git", + "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f", + "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04" + } + }, + { + "goPackagePath": "github.com/rakyll/statik", + "fetch": { + "type": "git", + "url": "https://github.com/rakyll/statik.git", + "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", + "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" + } + }, + { + "goPackagePath": "golang.org/x/crypto", + "fetch": { + "type": "git", + "url": "https://github.com/golang/crypto.git", + "rev": "1f22c0103821b9390939b6776727195525381532", + "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m" + } + }, + { + "goPackagePath": "golang.org/x/tools", + "fetch": { + "type": "git", + "url": "https://github.com/golang/tools.git", + "rev": "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180", + "sha256": "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8" + } + }, + { + "goPackagePath": "gopkg.in/fatih/pool.v2", + "fetch": { + "type": "git", + "url": "https://github.com/fatih/pool.git", + "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", + "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" + } } -] +] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb new file mode 100755 index 000000000000..4c49c8a538ff --- /dev/null +++ b/pkgs/servers/nosql/influxdb/gdm2nix.rb @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +# +# +require "json" + +redirects = { + "collectd.org" => "github.com/collectd/go-collectd", + "golang.org/x/crypto" => "github.com/golang/crypto", + "golang.org/x/tools" => "github.com/golang/tools", + "gopkg.in/fatih/pool.v2" => "github.com/fatih/pool", +} + +deps = File.read("Godeps").lines.map do |line| + (name, rev) = line.split(" ") + + host = redirects.fetch(name, name) + + url = "https://#{host}.git" + + xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`) + + { + goPackagePath: name, + fetch: { + type: "git", + url: url, + rev: rev, + sha256: xxx['sha256'], + } + } +end + +File.write("deps.json", JSON.pretty_generate(deps)) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ca7e30e95e3d..127d807133e0 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "a scalable, high-performance, open source NoSQL database"; + description = "A scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; license = licenses.agpl3; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 91c4472e0492..f94ca52259e6 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "a highly scalable, robust (fully ACID) native graph database"; + description = "A highly scalable, robust (fully ACID) native graph database"; homepage = "http://www.neo4j.org/"; license = licenses.gpl3; diff --git a/pkgs/servers/nosql/riak/riak-1.3.1.patch b/pkgs/servers/nosql/riak/riak-1.3.1.patch deleted file mode 100644 index e36bd31ab88c..000000000000 --- a/pkgs/servers/nosql/riak/riak-1.3.1.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/rel/files/riak 2013-05-22 20:45:55.613299952 +0200 -+++ b/rel/files/riak 2013-06-04 03:20:47.679943612 +0200 -@@ -13,33 +13,34 @@ - fi - unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well - -+if [ -z "$RIAK_ETC_DIR" ]; then -+ echo "Must set RIAK_ETC_DIR" -+ exit 1 -+fi -+ -+if [ -z "$RIAK_LOG_DIR" ]; then -+ echo "Must set RIAK_LOG_DIR" -+ exit 1 -+fi -+ -+if [ -z "$RIAK_DATA_DIR" ]; then -+ echo "Must set RIAK_DATA_DIR" -+ exit 1 -+fi -+ - RUNNER_SCRIPT_DIR={{runner_script_dir}} - RUNNER_SCRIPT=${0##*/} - - RUNNER_BASE_DIR={{runner_base_dir}} --RUNNER_ETC_DIR={{runner_etc_dir}} -+RUNNER_ETC_DIR=$RIAK_ETC_DIR - RUNNER_LIB_DIR={{platform_lib_dir}} --RUNNER_LOG_DIR={{runner_log_dir}} -+RUNNER_LOG_DIR=$RIAK_LOG_DIR - # Note the trailing slash on $PIPE_DIR/ - PIPE_DIR={{pipe_dir}} --RUNNER_USER={{runner_user}} --PLATFORM_DATA_DIR={{platform_data_dir}} -+PLATFORM_DATA_DIR=$RIAK_DATA_DIR - SSL_DIST_CONFIG=$PLATFORM_DATA_DIR/ssl_distribution.args_file - RIAK_VERSION="git" - --WHOAMI=$(whoami) -- --# Make sure this script is running as the appropriate user --if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then -- type sudo > /dev/null 2>&1 -- if [ $? -ne 0 ]; then -- echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 -- exit 1 -- fi -- echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2 -- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@ --fi -- - # Warn the user if ulimit -n is less than 4096 - ULIMIT_F=`ulimit -n` - if [ "$ULIMIT_F" -lt 4096 ]; then -@@ -48,9 +49,6 @@ - echo "!!!!" - fi - --# Make sure CWD is set to runner base dir --cd $RUNNER_BASE_DIR -- - # Make sure log directory exists - mkdir -p $RUNNER_LOG_DIR - diff --git a/pkgs/servers/nosql/riak/riak-admin-1.3.1.patch b/pkgs/servers/nosql/riak/riak-admin-1.3.1.patch deleted file mode 100644 index 9c87a6329943..000000000000 --- a/pkgs/servers/nosql/riak/riak-admin-1.3.1.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/rel/files/riak-admin 2013-05-22 20:45:55.613299952 +0200 -+++ b/rel/files/riak-admin 2013-06-04 03:30:00.101604175 +0200 -@@ -11,31 +11,31 @@ - fi - unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well - -+ -+if [ -z "$RIAK_ETC_DIR" ]; then -+ echo "Must set RIAK_ETC_DIR" -+ exit 1 -+fi -+ -+if [ -z "$RIAK_LOG_DIR" ]; then -+ echo "Must set RIAK_LOG_DIR" -+ exit 1 -+fi -+ -+if [ -z "$RIAK_DATA_DIR" ]; then -+ echo "Must set RIAK_DATA_DIR" -+ exit 1 -+fi -+ - RUNNER_SCRIPT_DIR={{runner_script_dir}} - RUNNER_SCRIPT=${0##*/} - - RUNNER_BASE_DIR={{runner_base_dir}} --RUNNER_ETC_DIR={{runner_etc_dir}} -+RUNNER_ETC_DIR=$RIAK_ETC_DIR - RUNNER_LIB_DIR={{platform_lib_dir}} --RUNNER_LOG_DIR={{runner_log_dir}} -+RUNNER_LOG_DIR=$RIAK_LOG_DIR - RUNNER_USER={{runner_user}} - --WHOAMI=$(whoami) -- --# Make sure this script is running as the appropriate user --if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then -- type sudo > /dev/null 2>&1 -- if [ $? -ne 0 ]; then -- echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 -- exit 1 -- fi -- echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2 -- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@ --fi -- --# Make sure CWD is set to runner base dir --cd $RUNNER_BASE_DIR -- - # Extract the target node name from node.args - NAME_ARG=`egrep "^ *-s?name" $RUNNER_ETC_DIR/vm.args` - if [ -z "$NAME_ARG" ]; then diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index e518d063dd45..7546fe37afe5 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; + description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index de3689a80074..3bec62ebe039 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,6 +4,7 @@ , pam, withPAM ? false , systemd, withSystemd ? false , python2, python3, ncurses +, ruby }: let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" { @@ -20,6 +21,10 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else available = lib.listToAttrs [ (pythonPlugin python2) (pythonPlugin python3) + (lib.nameValuePair "rack" { + path = "plugins/rack"; + inputs = [ ruby ]; + }) ]; getPlugin = name: @@ -65,12 +70,12 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $pluginDir python3 uwsgiconfig.py --build nixos - ${lib.concatMapStringsSep ";" (x: "${x.interpreter} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} + ${lib.concatMapStringsSep ";" (x: "${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} ''; installPhase = '' install -Dm755 uwsgi $out/bin/uwsgi - ${lib.concatMapStringsSep "\n" (x: x.install) needed} + ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; NIX_CFLAGS_LINK = [ "-lsystemd" ]; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 16a4aeb1ce58..79b99faea9b9 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -37,7 +37,6 @@ # that point into the user's profile. let - shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; installer = writeScript "xquartz-install" '' NIX_LINK=$HOME/.nix-profile @@ -138,7 +137,7 @@ in stdenv.mkDerivation { defaultStartX="$out/bin/startx -- $out/bin/Xquartz" ruby ${./patch_plist.rb} \ - ${shellEscape (builtins.toXML { + ${lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; XQUARTZ_DEFAULT_SHELL = "${shell}"; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 45c42947c5a4..f32e6d684526 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -46,12 +46,12 @@ stdenv.mkDerivation rec { postInstall = '' cp $communityModules/mod_websocket/mod_websocket.lua $out/lib/prosody/modules/ wrapProgram $out/bin/prosody \ - --set LUA_PATH '"${luaPath};"' \ - --set LUA_CPATH '"${luaCPath};"' + --set LUA_PATH '${luaPath};' \ + --set LUA_CPATH '${luaCPath};' wrapProgram $out/bin/prosodyctl \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ - --set LUA_PATH '"${luaPath};"' \ - --set LUA_CPATH '"${luaCPath};"' + --set LUA_PATH '${luaPath};' \ + --set LUA_CPATH '${luaCPath};' ''; meta = { diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index d3104439e578..1a95b4f42e6f 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation rec { description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; hydraPlatforms = stdenv.lib.platforms.linux; }; + + passthru = { + shellPath = "/bin/dash"; + }; } diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index ba9fe29c33e6..037d1e1ec995 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -43,4 +43,8 @@ stdenv.mkDerivation { maintainers = [ maintainers.sjmackenzie ]; platforms = platforms.all; }; + + passthru = { + shellPath = "/bin/es"; + }; } diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0124f914866c..353647f15b30 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -87,4 +87,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ocharles ]; }; + + passthru = { + shellPath = "/bin/fish"; + }; } diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 696777c7f1ff..dde890a022db 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -43,4 +43,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres nckx ]; platforms = platforms.unix; }; + + passthru = { + shellPath = "/bin/mksh"; + }; } diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 473b364981b7..5191e7cd45cb 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-git-${version}"; - version = "2016-04-20"; + version = "2016-06-18"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "1b1315a777328095cd8b5f364fd4345eeae7c4bf"; - sha256 = "1bdh6k46kwggihw6iblm1q60x4hjxpbkhaqap0nfpapqvlba4nv6"; + rev = "d012402dada1ec7d8796f2f4b04744d817137b4d"; + sha256 = "1965k91jdhjpy2dkklzwcxmq6qqjc7cnwl8x670g51jr4ihawkx1"; }; phases = "installPhase"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -r $src/* $outdir cd $outdir - rm MIT-LICENSE.txt + rm LICENSE.txt rm -rf .git* chmod -R +w templates diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index b9a8397e3ba1..0b424c897771 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -22,4 +22,8 @@ buildDotnetPackage rec { platforms = platforms.all; license = with licenses; [ bsd3 gpl3 ]; }; + + passthru = { + shellPath = "/bin/pash"; + }; } diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 3232caf5848b..bbad1f8cdf47 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -35,4 +35,8 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; }; + + passthru = { + shellPath = "/bin/rush"; + }; } diff --git a/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch b/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch new file mode 100644 index 000000000000..b35d29680af4 --- /dev/null +++ b/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch @@ -0,0 +1,28 @@ +From: christos <christos> +Date: Thu, 28 May 2015 11:47:03 +0000 +Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin +Pokorny) + +--- +tc.alloc.c | 5 ++++- +1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tc.alloc.c b/tc.alloc.c +index b9aec63..c1cb330 100644 +--- a/tc.alloc.c ++++ b/tc.alloc.c +@@ -348,10 +348,13 @@ calloc(size_t i, size_t j) + { + #ifndef lint + char *cp; ++ volatile size_t k; + + i *= j; + cp = xmalloc(i); +- memset(cp, 0, i); ++ /* Stop gcc 5.x from optimizing malloc+memset = calloc */ ++ k = i; ++ memset(cp, 0, k); + + return ((memalign_t) cp); + #else diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index be182f87f1ee..419acd8d61d2 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -1,22 +1,44 @@ -{stdenv, fetchurl, ncurses}: +{ stdenv, fetchurl +, ncurses }: stdenv.mkDerivation rec { - name = "tcsh-6.18.01"; + name = "tcsh-${version}"; + version = "6.19.00"; src = fetchurl { - url = "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"; - sha256 = "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q"; + urls = [ + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz" + ]; + sha256 = "0jaw51382pqyb6d1kgfg8ir0wd3p5qr2bmg8svcmjhlyp3h73qhj"; }; + + patches = [ ./avoid-gcc5-wrong-optimisation.patch ]; - buildInputs = [ncurses]; + buildInputs = [ ncurses ]; - postInstall = - '' - ln -s tcsh $out/bin/csh + meta = with stdenv.lib;{ + description = "An enhanced version of the Berkeley UNIX C shell (csh)"; + longDescription = '' + tcsh is an enhanced but completely compatible version of the + Berkeley UNIX C shell, csh. It is a command language interpreter + usable both as an interactive login shell and a shell script + command processor. + It includes: + - command-line editor + - programmable word completion + - spelling correction + - history mechanism + - job control ''; - - meta = { homepage = http://www.tcsh.org/; - description = "An enhanced version of the Berkeley UNIX C shell (csh)"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; + + passthru = { + shellPath = "/bin/tcsh"; }; } diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 395132bc2d82..92f7f20993f7 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "0cqfrpvkgzk0q3dykavqxwfqrx61y8rbzixmwcv8pfa9r2sya24q"; + sha256= "13inkj0vs8nqdghp3j19dardawfsdmcsfzsp77hlwavmw7sqjxzi"; }; ## The logo xonsh prints during build contains unicode characters, and this @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { HOME=$TMPDIR nosetests -x ''; - buildInputs = with python3Packages; [ glibcLocales nose pygments ]; + buildInputs = with python3Packages; [ glibcLocales nose ]; propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ]; meta = with stdenv.lib; { @@ -41,4 +41,8 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ spwhitt garbas ]; platforms = platforms.all; }; + + passthru = { + shellPath = "/bin/xonsh"; + }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index fda3e77c61f4..261dbf12f8e5 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -80,4 +80,8 @@ EOF maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.unix; }; + + passthru = { + shellPath = "/bin/zsh"; + }; } diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 0b6707bf8b16..11f9a43c035e 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -70,7 +70,6 @@ rec { getCrossDrv = drv: drv.crossDrv or drv; nativeBuildInputsDrvs = map getNativeDrv nativeBuildInputs; buildInputsDrvs = map getCrossDrv buildInputs; - buildInputsDrvsAsBuildInputs = map getNativeDrv buildInputs; propagatedBuildInputsDrvs = map getCrossDrv propagatedBuildInputs; propagatedNativeBuildInputsDrvs = map getNativeDrv propagatedNativeBuildInputs; @@ -239,11 +238,4 @@ rec { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=gold"; }); }; - - dropCxx = drv: drv.override { - stdenv = if pkgs.stdenv.isDarwin - then pkgs.allStdenvs.stdenvDarwinNaked - else pkgs.stdenv; - }; - } diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 035b4fd6ee73..c7c7b9e55674 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = '' xmkmf -a ''; meta = with stdenv.lib; { - description = "virtual keyboard for X window system"; + description = "Virtual keyboard for X window system"; longDescription = '' xvkbd is a virtual (graphical) keyboard program for X Window System which provides facility to enter characters onto other clients (softwares) by clicking on a diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index c8717ad1f6cb..be7d534b3d6e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lxd-${version}"; - version = "2.0.0.rc4"; + version = "2.0.2"; rev = "lxd-${version}"; goPackagePath = "github.com/lxc/lxd"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "lxd"; - sha256 = "1rpyyj6d38d9kmb47dcmy1x41fiacj384yx01yslsrj2l6qxcdjn"; + sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; }; goDeps = ./deps.json; @@ -19,10 +19,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lxc ]; - postInstall = '' - cp go/src/$goPackagePath/scripts/lxd-images $bin/bin - ''; - meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = https://github.com/lxc/lxd; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index e73e71da51a2..b0b9444a2380 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ]; meta = { - description = "opensource disk backup software"; + description = "Opensource disk backup software"; homepage = http://www.partimage.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index bcbc8a846474..1c313beae9fd 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ python librsync gnused ]; meta = { - description = "backup system trying to combine best a mirror and an incremental backup system"; + description = "Backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index 1a14aae62636..ada58e87fd0a 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "bash script CD Burner Writer"; + description = "Bash script CD Burner Writer"; longDescription = '' It might not be the best looking application out there, but it works. It’s simple, fast and small, and can handle most things you throw at it. diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index f46ddd1c5369..d12169a0fd9a 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.bzip.org"; - description = "high-quality data compression program"; + description = "High-quality data compression program"; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 44f6a0bb7a45..cf616a21e0aa 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://lbzip2.org/; - description = "parallel bzip2 compression utility"; + description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index b0dfd79b9bac..a800a19e12b9 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/lzip/lzip.html"; - description = "a lossless data compressor based on the LZMA algorithm"; + description = "A lossless data compressor based on the LZMA algorithm"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index b2246e73328f..a5cd54bf74d9 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://savannah.nongnu.org/projects/davfs2"; - description = "mount WebDAV shares like a typical filesystem"; + description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 5b33e31958c5..a30709d4c920 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ e2fsprogs ]; meta = with stdenv.lib; { - description = "utility that can recover deleted files from an ext3 or ext4 partition"; + description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = http://extundelete.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index e9a7204f0e6c..63d3bbc3373a 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "an open source (experimental) Linux client for Google Drive"; + description = "An open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index fa0349689119..4e027a53ffcb 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://intgat.tigress.co.uk/rmy/uml/index.html; - description = "zero free blocks from ext2, ext3 and ext4 file-systems"; + description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.theuni ]; }; diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix index 579ec802e092..63bf9aae5521 100644 --- a/pkgs/tools/graphics/bins/default.nix +++ b/pkgs/tools/graphics/bins/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = { - description = "generates static HTML photo albums"; + description = "Generates static HTML photo albums"; homepage = http://bins.sautret.org; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index c9b1febcc93a..78a66721b0c9 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cgit.freedesktop.org/xorg/app/editres/"; - description = "a dynamic resource editor for X Toolkit applications"; + description = "A dynamic resource editor for X Toolkit applications"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index ba58bd86a747..819728032bb6 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; meta = with stdenv.lib; { - description = "encrypt files with Advanced Encryption Standard (AES)"; + description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = http://www.aescrypt.com/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index e479167dc159..dc170bcd14bb 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { preFixup = ''rm "$out/bin/apt-offline-gui"''; meta = with stdenv.lib; { - description = "offline APT package manager"; + description = "Offline APT package manager"; license = licenses.gpl3; maintainers = [ maintainers.falsifian ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix new file mode 100644 index 000000000000..058fa4881e84 --- /dev/null +++ b/pkgs/tools/misc/autorevision/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, asciidoc, libxml2, docbook_xml_dtd_45, libxslt +, docbook_xsl, diffutils, coreutils, gnugrep +}: + +stdenv.mkDerivation rec { + name = "autorevision-${version}"; + version = "1.14"; + + src = fetchurl { + url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; + sha256 = "0h0ig922am9qd0nbri3i6p4k789mv5iavxzxwylclg0mfgx43qd2"; + }; + + buildInputs = [ + asciidoc libxml2 docbook_xml_dtd_45 libxslt docbook_xsl + ]; + + installFlags = [ "prefix=$(out)" ]; + + postInstall = '' + sed -e "s|cmp|${diffutils}/bin/cmp|" \ + -e "s|cat|${coreutils}/bin/cat|" \ + -e "s|grep|${gnugrep}/bin/grep|" \ + -i "$out/bin/autorevision" + ''; + + meta = with stdenv.lib; { + description = "Extracts revision metadata from your VCS repository"; + homepage = https://autorevision.github.io/; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 72a8f61bf3f0..305a32edadeb 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "make install DESTDIR=$out"; meta = { - description = "a shell extension that manages your environment"; + description = "A shell extension that manages your environment"; longDescription = '' Once hooked into your shell direnv is looking for an .envrc file in your current directory before every prompt. diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index fc56c58f138c..c4b099956251 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.0.2"; + version = "2.0.3"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "08w8s33cfk7bi6g8wshqchhl0ayld647wvg4xngclc22d7l94rrm"; + sha256 = "1p6gl36g3ips5ry2mqcfsr49siki5lx7xhqjl0sy9bsx26vnzgrc"; }; dontBuild = true; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index a70f69c47834..50d75de69cce 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, wxGTK, openssl, curl }: +{ stdenv, fetchurl, wxGTK30, openssl, curl }: stdenv.mkDerivation rec { name = "hakuneko-${version}"; - version = "1.3.12"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/hakuneko/hakuneko_${version}_src.tar.gz"; - sha256 = "24e7281a7f68b24e5260ee17ecfa1c5a3ffec408c8ea6e0121ae6c161898b698"; + sha256 = "d7e066e3157445f273ccf14172c05077759da036ffe700a28a409fde862b69a7"; }; preConfigure = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --replace /bin/bash $shell ''; - buildInputs = [ wxGTK openssl curl ]; + buildInputs = [ wxGTK30 openssl curl ]; meta = { description = "Manga downloader"; diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 993a36ea9092..a51b6238cd52 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { installPhase = ''make DESTDIR="$out" PREFIX="" install''; meta = { - description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; + description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 54a6b0309b00..3bf704ca68e9 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "open source firmware for mp3 players"; + description = "Open source firmware for mp3 players"; homepage = http://www.rockbox.org; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 652c4f989050..8367bde6fddb 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,40 +1,29 @@ { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { - name = "screen-4.3.1"; + name = "screen-4.4.0"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "0qwxd4axkgvxjigz9xs0kcv6qpfkrzr2gm43w9idx0z2mvw4jh7s"; + sha256 = "12r12xwhsg59mlprikbbmn60gh8lqhrvyar7mlxg4fwsfma2lwpg"; }; - preConfigure = '' - configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc --enable-colors256" - sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in - ''; - - # TODO: remove when updating the version of screen. Only patches for 4.3.1 - patches = [ - (fetchpatch { - name = "CVE-2015-6806.patch"; - stripLen = 1; - url = "http://git.savannah.gnu.org/cgit/screen.git/patch/?id=b7484c224738247b510ed0d268cd577076958f1b"; - sha256 = "160zhpzi80qkvwib78jdvx4jcm2c2h59q5ap7hgnbz4xbkb3k37l"; - }) - ] ++ stdenv.lib.optional stdenv.isDarwin (fetchurl { - url = "http://savannah.gnu.org/file/screen-utmp.patch\?file_id=34815"; - sha256 = "192dsa8hm1zw8m638avzhwhnrddgizhyrwaxgwa96zr9vwai2nvc"; - }); + configureFlags= [ + "--enable-telnet" + "--enable-pam" + "--with-sys-screenrc=/etc/screenrc" + "--enable-colors256" + ]; buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam ++ stdenv.lib.optional stdenv.isDarwin utmp; doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/screen/; description = "A window manager that multiplexes a physical terminal"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; longDescription = '' GNU Screen is a full-screen window manager that multiplexes a physical @@ -58,7 +47,7 @@ stdenv.mkDerivation rec { terminal. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ peti jgeerds ]; + platforms = platforms.unix; + maintainers = with maintainers; [ peti jgeerds vrthra ]; }; } diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 3fc015c77043..e8b93569c729 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.12"; + version = "2.13"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "1jxvjknz2jhq773jrwx9gc1df3gfy73yqmkjkygqxzpi318yls3q"; + sha256 = "1awhjw9zjlfb8s5g3yyx63f7ddfcr1sanlbxpqifmrgq24ql198b"; }; buildInputs = [ readline ]; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "Unit conversion tool"; homepage = https://www.gnu.org/software/units/; license = [ licenses.gpl3Plus ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 4bf195977094..1a8621effd54 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -3,12 +3,12 @@ # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst pythonPackages.buildPythonApplication rec { - version = "0.11.0"; + version = "0.11.2"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1bf0vk29qdswar0q4267aamfriq3134302i2p3qcqxpmmcwx3qfv"; + sha256 = "15isw2jhjfxi213wdj9d8mwq2m58k8bwf831qnxrjcz7j7bwy7mj"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1187191185d7..9ffd66472579 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.05.21.2"; + version = "2016.06.19.1"; src = fetchurl { url = "http://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "66f94fc97012c4c7a6338dc4df6ec62af66dcfc144c5e8c8cd8b5519756f1a98"; + sha256 = "223c496be84dd57ba9f7d6a132a2732b67c79c7e26e64ecae1439472c10d0d45"; }; buildInputs = [ makeWrapper zip pandoc ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 4bc68aba29df..31f39b887c56 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization-gui; - description = "a QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; + description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 8b8b5074fc39..dbf0b9af8abc 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization; - description = "a library and command line tool to personalize YubiKeys"; + description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 106dcf2f184c..78541a5d9f2c 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,28 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 , Security }: stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.23.0"; + version = "1.24.0"; - src = fetchurl { - url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz"; - sha256 = "14qz7686zxnhbaqj6l1hqpkykhpygm74h2mzwhh13gqmcj38alaq"; + src = fetchFromGitHub { + owner = "aria2"; + repo = "aria2"; + rev = "release-${version}"; + sha256 = "0sb8s2rf2l0x7m8fx8kys7vad0lfw3k9071iai03kxplkdvg96n9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ stdenv.lib.optional stdenv.isDarwin Security; + patches = stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + url = https://github.com/aria2/aria2/commit/1e59e357af626edc870b7f53c1ae8083658d0d1a.patch; + sha256 = "1xjj4ll1v6adl6vdkl84v0mh7ma6p469ph1wpvksxrq6qp8345qj"; + }) + ]; + configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/tatsuhiro-t/aria2; + homepage = https://aria2.github.io; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; maintainers = with maintainers; [ koral jgeerds ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index c92403a1af51..2269e1a09c7b 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02jqkwihp4im58qdnyd7d6m37ym9168gy35cql8gviq2w03yznpk"; + sha256 = "10rimw6ldnaijbjz1vmkrbrr5swbbqjydjrxd4y5xj2r8whq2mph"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 1d0c9d55076e..c579d12b6bd4 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://keepalived.org; - description = "routing software written in C"; + description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 5a1095506424..41266e65aa09 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "configureFlags=--mandir=$out/share/man"; meta = { - description = "utilities for encoding and decoding binary files in MIME"; + description = "Utilities for encoding and decoding binary files in MIME"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b89d2adea6bc..23d4117f8b84 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://nbd.sourceforge.net"; - description = "map arbitrary files as block devices over the network"; + description = "Map arbitrary files as block devices over the network"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 5e8931579cb3..a24f350d3f0b 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -3,20 +3,14 @@ , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, udev, libgudev, hicolor_icon_theme }: -let - pn = "network-manager-applet"; - major = "1.0"; - # With version 1.0.12 of NM, we are no longer in sync - # version = "${networkmanager.version}.10"; - version = "${major}.10"; -in - stdenv.mkDerivation rec { - name = "network-manager-applet-${version}"; + name = "${pname}-${version}"; + pname = "network-manager-applet"; + version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; + sha256 = "02b42e7c17c9cd6c840563750da92ce58da1ec621df7f0c2402016026e727756"; }; configureFlags = [ "--sysconfdir=/etc" ]; @@ -34,10 +28,9 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; - preInstall = - '' - installFlagsArray=( "sysconfdir=$out/etc" ) - ''; + preInstall = '' + installFlagsArray=( "sysconfdir=$out/etc" ) + ''; preFixup = '' wrapProgram "$out/bin/nm-applet" \ @@ -50,10 +43,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ phreedom urkud rickynils ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/0.9.8.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 4fad1ca2ab9a..4fad1ca2ab9a 100644 --- a/pkgs/tools/networking/network-manager/0.9.8.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix diff --git a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch b/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch index 17c2966b7064..17c2966b7064 100644 --- a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch index 831b2010fcfc..831b2010fcfc 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 34506cb823d0..5b1d56c0184c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -5,12 +5,14 @@ , ethtool, gnused, coreutils, file, inetutils }: stdenv.mkDerivation rec { - name = "network-manager-${version}"; - version = "1.0.12"; + name = "network-manager-${version}"; + pname = "NetworkManager"; + major = "1.2"; + version = "${major}.2"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; - sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9"; }; preConfigure = '' @@ -61,34 +63,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; - patches = [ ./nm-platform.patch ]; - - preInstall = - '' - installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) - ''; + preInstall = '' + installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) + ''; - postInstall = - '' - mkdir -p $out/lib/NetworkManager + postInstall = '' + mkdir -p $out/lib/NetworkManager - # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy - substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' + # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy + substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' - # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service + # rename to network-manager to be in style + mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish - # aliases ourselves. - ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - ''; + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish + # aliases ourselves. + ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management tool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom urkud rickynils domenkozar ]; - platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ phreedom urkud rickynils domenkozar obadz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/l2tp-purity.patch b/pkgs/tools/networking/network-manager/l2tp-purity.patch deleted file mode 100644 index c9117c5325b6..000000000000 --- a/pkgs/tools/networking/network-manager/l2tp-purity.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c -index d2c9dc4..e61d3d2 100644 ---- a/src/nm-l2tp-service.c -+++ b/src/nm-l2tp-service.c -@@ -655,9 +655,7 @@ nm_find_ipsec (void) - { - static const char *ipsec_binary_paths[] = - { -- "/sbin/ipsec", -- "/usr/sbin/ipsec", -- "/usr/local/sbin/ipsec", -+ "@strongswan@/bin/ipsec", - NULL - }; - -@@ -677,9 +675,7 @@ nm_find_l2tpd (void) - { - static const char *l2tp_binary_paths[] = - { -- "/sbin/xl2tpd", -- "/usr/sbin/xl2tpd", -- "/usr/local/sbin/xl2tpd", -+ "@xl2tpd@/bin/xl2tpd", - NULL - }; - diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index f415b4f3bedd..3cb6034db85d 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -1,43 +1,42 @@ -{ stdenv, fetchFromGitHub, substituteAll, automake, autoconf, libtool, intltool, pkgconfig -, networkmanager, ppp, xl2tpd, strongswan +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig +, networkmanager, networkmanagerapplet, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3 }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-l2tp"; - version = "0.9.8.7"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-l2tp"; + version = networkmanager.version; src = fetchFromGitHub { - owner = "seriyps"; - repo = "NetworkManager-l2tp"; - rev = version; - sha256 = "07gl562p3f6l2wn64f3vvz1ygp3hsfhiwh4sn04c3fahfdys69zx"; + owner = "nm-l2tp"; + repo = "network-manager-l2tp"; + rev = version; + sha256 = "1zqdhm7pzhaq6q8pddj9ki25qs9m6qwqgzc5x07a0qffla2rq5j1"; }; - buildInputs = [ networkmanager ppp ] + buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ] ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; - configureScript = "./autogen.sh"; + postPatch = '' + sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c - configureFlags = - if withGnome then "--with-gnome" else "--without-gnome"; + substituteInPlace ./src/nm-l2tp-service.c \ + --replace /sbin/ipsec ${strongswan}/bin/ipsec \ + --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd + ''; - postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + preConfigure = "./autogen.sh"; - patches = - [ ( substituteAll { - src = ./l2tp-purity.patch; - inherit xl2tpd strongswan; - }) - ]; + configureFlags = + if withGnome then "--with-gnome" else "--without-gnome"; meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; homepage = https://github.com/seriyps/NetworkManager-l2tp; license = licenses.gpl2; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar obadz ]; }; } diff --git a/pkgs/tools/networking/network-manager/nm-platform.patch b/pkgs/tools/networking/network-manager/nm-platform.patch deleted file mode 100644 index 880d1a2e4921..000000000000 --- a/pkgs/tools/networking/network-manager/nm-platform.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c -index 8803377..14e5726 100644 ---- a/src/platform/nm-platform.c -+++ b/src/platform/nm-platform.c -@@ -39,6 +39,12 @@ - #include "nm-enum-types.h" - #include "nm-core-internal.h" - -+#if HAVE_LIBNL_INET6_ADDR_GEN_MODE && HAVE_KERNEL_INET6_ADDR_GEN_MODE -+#include <linux/if_link.h> -+#else -+#define IN6_ADDR_GEN_MODE_NONE 1 -+#endif -+ - #define ADDRESS_LIFETIME_PADDING 5 - - G_STATIC_ASSERT (sizeof ( ((NMPlatformLink *) NULL)->addr.data ) == NM_UTILS_HWADDR_LEN_MAX); diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 6a93100fa105..43eb681be295 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -2,15 +2,13 @@ , withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-openconnect"; - version = "1.0.2"; - -# FixMe: Change version back to "networkmanager.version" + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openconnect"; + version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "03k05s3aaxcwrip3g3r13bx80wbg7vh5sssc7mvg27c4cdc0a2hj"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "522979593e21b4e884112816708db9eb66148b3491580dacfad53472b94aafec"; }; buildInputs = [ openconnect networkmanager libsecret ] @@ -31,15 +29,6 @@ stdenv.mkDerivation rec { --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; - postConfigure = '' - substituteInPlace "./auth-dialog/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - substituteInPlace "properties/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - ''; - meta = { description = "NetworkManager's OpenConnect plugin"; inherit (networkmanager.meta) maintainers platforms; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 4b98600611e4..34e3a3e2959a 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -2,13 +2,13 @@ , withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-openvpn"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openvpn"; version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "132xwkgyfnpma7m6b06jhrd1g9xk5dlpx8alnsf03ls3z92bd0n9"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef"; }; buildInputs = [ openvpn networkmanager libsecret ] @@ -33,15 +33,6 @@ stdenv.mkDerivation rec { --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" ''; - postConfigure = '' - substituteInPlace "./auth-dialog/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - substituteInPlace "properties/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - ''; - meta = { description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch deleted file mode 100644 index 88af666b6580..000000000000 --- a/pkgs/tools/networking/network-manager/pptp-purity.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c -index 68a5759..568bbfe 100644 ---- a/src/nm-pptp-service.c -+++ b/src/nm-pptp-service.c -@@ -730,9 +730,7 @@ nm_find_pppd (void) - { - static const char *pppd_binary_paths[] = - { -- "/sbin/pppd", -- "/usr/sbin/pppd", -- "/usr/local/sbin/pppd", -+ "@ppp@/sbin/pppd", - NULL - }; - -@@ -752,9 +750,7 @@ nm_find_pptp (void) - { - static const char *pptp_binary_paths[] = - { -- "/sbin/pptp", -- "/usr/sbin/pptp", -- "/usr/local/sbin/pptp", -+ "@pptp@/sbin/pptp", - NULL - }; - diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index 1b1cf69119e4..a9bee0c74811 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig , libsecret, withGnome ? true, gnome3 }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-pptp"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-pptp"; version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "1gn1f8r32wznk4rsn2lg2slw1ccli00svz0fi4bx0qiylimlbyln"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "a72cb88ecc0a9edec836e8042c592d68b8b290c0d78082e6b25cf08b46c6be5d"; }; buildInputs = [ networkmanager pptp ppp libsecret ] @@ -17,17 +17,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; - configureFlags = - if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; + postPatch = '' + sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c - postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + substituteInPlace ./src/nm-pptp-service.c \ + --replace /sbin/pptp ${pptp}/bin/pptp \ + --replace /sbin/pppd ${ppp}/bin/pppd + ''; - patches = - [ ( substituteAll { - src = ./pptp-purity.patch; - inherit ppp pptp; - }) - ]; + configureFlags = + if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; meta = { description = "PPtP plugin for NetworkManager"; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 64de5408c7e0..97b2001d7592 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -2,13 +2,13 @@ , withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-vpnc"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-vpnc"; version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "0hycplnc78688sgpzdh3ifra6chascrh751mckqkp1j553bri0jk"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "e900f6500026f8c3ee4feb92e1d0a0c0abbee9ba507dad915b47a8ab7df9e1f3"; }; buildInputs = [ vpnc networkmanager libsecret ] @@ -30,15 +30,6 @@ stdenv.mkDerivation rec { --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; - postConfigure = '' - substituteInPlace "./auth-dialog/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - substituteInPlace "properties/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - ''; - meta = { description = "NetworkManager's VPNC plugin"; inherit (networkmanager.meta) maintainers platforms; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index 423c58450c56..00c1c86ea8b5 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "a fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; + description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; homepage = https://github.com/danrl/ratools; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 2fec2ac1bd58..b50d619b437d 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "utility for secure encrypted channels between sockets"; + description = "Utility for secure encrypted channels between sockets"; homepage = "https://www.tarsnap.com/spiped.html"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix new file mode 100644 index 000000000000..605986935f01 --- /dev/null +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, makeWrapper, python }: + +stdenv.mkDerivation rec { + name = "ssh-ident-${version}"; + version = "2016-04-21"; + src = fetchFromGitHub { + owner = "ccontavalli"; + repo = "ssh-ident"; + rev = "ebf8282728211dc4448d50f7e16e546ed03c22d2"; + sha256 = "1jf19lz1gwn7cyp57j8d4zs5bq13iw3kw31m8nvr8h6sib2pf815"; + }; + + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + install -m 755 ssh-ident $out/bin/ssh-ident + wrapProgram $out/bin/ssh-ident \ + --prefix PATH : "${python}/bin/python" + ''; + + meta = { + homepage = https://github.com/ccontavalli/ssh-ident; + description = "Start and use ssh-agent and load identities as necessary"; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ telotortium ]; + }; +} diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 96169ab294ce..2f12aaa7ee23 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "universal tls/ssl wrapper"; + description = "Universal tls/ssl wrapper"; homepage = "http://www.stunnel.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 684b9b13a804..1443c9bfb7d7 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be"; + sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index e1905e2deb65..b183b653d26e 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; - description = "virtual private network (VPN) client for Cisco's VPN concentrators"; + description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 9b9909a89432..42309b49bb8a 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -3,11 +3,11 @@ , libiconv, libpsl ? null, openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.17.1"; + name = "wget-1.18"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "1jcpvl5sxb2ag8yahpy370c5jlfb097a21k2mhsidh4wxdhrnmgy"; + sha256 = "1hcwx8ww3sxzdskkx3l7q70a7wd6569yrnjkw9pw013cf9smpddm"; }; patches = [ ./remove-runtime-dep-on-openssl-headers.patch ]; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 7f9df88abdea..89d795c8e505 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -20,4 +20,11 @@ buildGoPackage rec { ''; goDeps = ./deps.json; + + meta = with stdenv.lib; { + description = "A packaging tool built around IPFS"; + homepage = https://github.com/whyrusleeping/gx; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; } diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 195dafe3d711..912c870c27b0 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -24,4 +24,11 @@ buildGoPackage rec { src = gx.src; } ]; + + meta = with stdenv.lib; { + description = "A tool for importing go packages into gx"; + homepage = https://github.com/whyrusleeping/gx-go; + license = licenses.mit; + maintainer = with maintainers; [ zimbatm ]; + }; } diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 8593fe69733a..4766968b06fd 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "free implementation of the OpenPGP standard for encrypting and signing data"; + description = "Free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 65d43ec9dbee..932bf508c2fa 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gnupg.org/"; - description = "free implementation of the OpenPGP standard for encrypting and signing data"; + description = "Free implementation of the OpenPGP standard for encrypting and signing data"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 6119f708070d..a1cbcb458c59 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://gnupg.org; - description = "a complete and free implementation of the OpenPGP standard"; + description = "A complete and free implementation of the OpenPGP standard"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wkennington peti fpletz ]; platforms = platforms.all; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 64ebb4c0ca26..3dd00718af79 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "multi-use cryptographic tool based on the STRIBOB algorithm"; + description = "Multi-use cryptographic tool based on the STRIBOB algorithm"; homepage = "https://www.stribob.com/stricat/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 03d73183704f..961a4d4e0365 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "1n3k0bhjmbmj1rdgyifqya6135wapafqygfviv6x52ng8sa2jhk1" else - "169f90w0fl4pqq9dbhzr6pkk15gqvp7813asqqh1p7s2a32zczza"; + "08zik2id1rkcl5cw4yscdgb8rdahx342j1fps576465sziy5z06x" else + "062ddifhdbzj9hjcnvjnqb1is2ydrv9x7hzam4jkpsfvllf4hxcg"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 5a2173139403..a4aec5369fc5 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; repositories.git = https://git.torproject.org/vidalia; - description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; + description = "A cross-platform graphical controller for the Tor software, built using the Qt framework"; license = licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index bed7d5369579..511da154c507 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://code.google.com/p/volatility; - description = "advanced memory forensics framework"; + description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 27ebbf3518fc..240cc36f7266 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = with stdenv.lib; { - description = "an enhanced version of GNU dd"; + description = "An enhanced version of GNU dd"; homepage = http://dcfldd.sourceforge.net/; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 63a6e7e1fa30..1876bac496da 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://projects.gw-computing.net/projects/dfc"; - description = "displays file system space usage using graphs and colors"; + description = "Displays file system space usage using graphs and colors"; license="free"; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index b6f3de5f5cde..02c76798fd77 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/s6-rc/; - description = "a service manager for s6-based systems"; + description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ pmahoney ]; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index 304d8f21eb28..5e7ec51bf107 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "data recovery tool for damaged hardware"; + description = "Data recovery tool for damaged hardware"; longDescription = '' Safecopy is a data recovery tool which tries to extract as much data as possible from a diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 58036af1a947..a297f9371001 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; - description = "terminal mixer - multiplexer for the i/o of terminal applications"; + description = "Terminal mixer - multiplexer for the i/o of terminal applications"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.all; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index a5050047256b..00df3c45f4ff 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; - description = "command to produce a depth indented directory listing"; + description = "Command to produce a depth indented directory listing"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 8e65eda8f540..cad1230ac87a 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; - description = "task spooler - batch queue"; + description = "Task spooler - batch queue"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.all; diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index ca9de0590ca2..0eb64fe1d18a 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -18,7 +18,7 @@ buildRubyGem rec { dontStrip = true; meta = with lib; { - description = "upload code to https://gist.github.com (or github enterprise)"; + description = "Upload code to https://gist.github.com (or github enterprise)"; homepage = "http://defunkt.io/gist/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index 3bb147f7dd27..2eae12561861 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.fourmilab.ch/webtools/qprint/"; license = stdenv.lib.licenses.publicDomain; - description = "encode and decode Quoted-Printable files"; + description = "Encode and decode Quoted-Printable files"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 0d6d424fa7c4..fcd7d350f308 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "1xmvdi2nbmwkmrdwkqm3zm596dz1zx87bn8i0ylkmy8rvb8ybgdv"; + sha256 = "0mz0i41fb6yrvn5x99bwaa66wqv5c8s5wd9pbnn90mgppxbn1037"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index ffd275069da4..bdb33196db94 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -3,17 +3,18 @@ , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder , FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils , ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate -, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }: +, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor +, TextRoman, DataUniqid }: let - version = "1.9"; + version = "2.4"; pn = "biblatex-biber"; in buildPerlPackage { name = "biber-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; - sha256 = "1a3iq7l9i54f8nfzjmp1qdb6aqm7977q1g4san470010fkfbvjdc"; + sha256 = "1gccbs5vzs3fca41d9dwl6nrdljnh29yls8xzfw04hd57yrfn5w4"; }; buildInputs = [ @@ -22,6 +23,7 @@ buildPerlPackage { ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ClassAccessor TextRoman DataUniqid ]; preConfigure = "touch Makefile.PL"; buildPhase = "perl Build.PL --prefix=$out; ./Build build"; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e6c63e029561..cef212b2a134 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "a tool to search text in PDF files"; + description = "A tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [qknight]; diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index eacd0316b464..61936e766c5e 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; - description = "a system to convert (La)TeX documents to HTML and various other formats"; + description = "A system to convert (La)TeX documents to HTML and various other formats"; license = stdenv.lib.licenses.lppl12; }; } diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive-new/bin.nix index 403bea2783d8..f497444eb39a 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/bin.nix @@ -64,6 +64,12 @@ core = stdenv.mkDerivation rec { perl ]; + postPatch = '' + for i in texk/kpathsea/mktex*; do + sed -i '/^mydir=/d' "$i" + done + ''; + preConfigure = '' rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \ libs/{mpfr,pixman,poppler,potrace,xpdf,zlib,zziplib} diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 558d9102352b..29e1c45245f7 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -17,7 +17,7 @@ rec { '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; meta = { - description = "the moderncv class for TeXLive"; + description = "The moderncv class for TeXLive"; # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 189d418b0391..caa140d42c79 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -17,7 +17,7 @@ rec { '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; meta = { - description = "the moderntimeline extensions for moderncv"; + description = "The moderntimeline extensions for moderncv"; # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 34b6226ff98d..c038ca7c1bbe 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = { homepage = http://cloudinit.readthedocs.org; - description = "provides configuration and customization of cloud instance"; + description = "Provides configuration and customization of cloud instance"; maintainers = [ lib.maintainers.madjar ]; platforms = lib.platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63df5b3cce83..066c9d2c39eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,5 +1,4 @@ -{ system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling -, config, crossSystem, platform, lib +{ system, bootStdenv, noSysDirs, config, crossSystem, platform, lib , pkgsWithOverrides , ... }: self: pkgs: @@ -43,11 +42,10 @@ in overridePackages = f: pkgsWithOverrides f; # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: kernel: (import ./../..) { + forceSystem = system: kernel: (import ../..) { inherit system; platform = platform // { kernelArch = kernel; }; - inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem; + inherit bootStdenv noSysDirs config crossSystem; }; # Used by wine, firefox with debugging version of Flash, ... @@ -469,6 +467,8 @@ in apg = callPackage ../tools/security/apg { }; + autorevision = callPackage ../tools/misc/autorevision { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -499,6 +499,8 @@ in androidsdk = self.androidenv.androidsdk_6_0; + androidsdk_extras = self.androidenv.androidsdk_6_0_extras; + arc-gtk-theme = callPackage ../misc/themes/arc { }; adapta-gtk-theme = callPackage ../misc/themes/adapta { }; @@ -668,8 +670,6 @@ in gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; - certificate-transparency = callPackage ../servers/certificate-transparency { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; ccnet = callPackage ../tools/networking/ccnet { }; @@ -708,6 +708,8 @@ in contacts = callPackage ../tools/misc/contacts { }; + coturn = callPackage ../servers/coturn { }; + daemontools = callPackage ../tools/admin/daemontools { }; datamash = callPackage ../tools/misc/datamash { }; @@ -916,7 +918,8 @@ in DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX - UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter; + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ClassAccessor TextRoman DataUniqid; }; bibtextools = callPackage ../tools/typesetting/bibtex-tools { @@ -1190,6 +1193,10 @@ in cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; + cudnn5_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-5.0 { + cudatoolkit = self.cudatoolkit75; + }; + curlFull = self.curl.override { idnSupport = true; ldapSupport = true; @@ -2207,6 +2214,36 @@ in netdata = callPackage ../tools/system/netdata { }; + netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec { + + buildsystem = callPackage ../applications/misc/netsurf/buildsystem { }; + + libwapcaplet = callPackage ../applications/misc/netsurf/libwapcaplet { }; + + nsgenbind = callPackage ../applications/misc/netsurf/nsgenbind { }; + + libparserutils = callPackage ../applications/misc/netsurf/libparserutils { }; + + libcss = callPackage ../applications/misc/netsurf/libcss { }; + + libhubbub = callPackage ../applications/misc/netsurf/libhubbub { }; + + libdom = callPackage ../applications/misc/netsurf/libdom { }; + + libnsbmp = callPackage ../applications/misc/netsurf/libnsbmp { }; + + libnsgif = callPackage ../applications/misc/netsurf/libnsgif { }; + + libnsfb = callPackage ../applications/misc/netsurf/libnsfb { }; + + libnsutils = callPackage ../applications/misc/netsurf/libnsutils { }; + + libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { }; + + browser = callPackage ../applications/misc/netsurf/browser { }; + + }); + netperf = callPackage ../applications/networking/netperf { }; netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; @@ -2248,6 +2285,9 @@ in else nodePackages_4_x; + # Can be used as a user shell + nologin = shadow; + npm2nix = nodePackages.npm2nix; ldapvi = callPackage ../tools/misc/ldapvi { }; @@ -2580,7 +2620,7 @@ in netselect = callPackage ../tools/networking/netselect { }; # stripped down, needed by steam - networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8.nix { }; + networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8 { }; networkmanager = callPackage ../tools/networking/network-manager { }; @@ -3416,6 +3456,8 @@ in ssdeep = callPackage ../tools/security/ssdeep { }; + ssh-ident = callPackage ../tools/networking/ssh-ident { }; + sshpass = callPackage ../tools/networking/sshpass { }; sslscan = callPackage ../tools/security/sslscan { }; @@ -3929,9 +3971,9 @@ in # load into the Ben Nanonote gccCross = let - pkgsCross = (import ./../..) { + pkgsCross = (import ../..) { inherit system; - inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config; + inherit bootStdenv noSysDirs config; # Ben Nanonote system crossSystem = { config = "mipsel-unknown-linux"; @@ -9871,6 +9913,7 @@ in bind = callPackage ../servers/dns/bind { }; bird = callPackage ../servers/bird { }; + bird6 = bird.override { enableIPv6 = true; }; bosun = (callPackage ../servers/monitoring/bosun { }).bin // { outputs = [ "bin" ]; }; scollector = bosun; @@ -10032,6 +10075,8 @@ in nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; + nix-tour = callPackage ../applications/misc/nix-tour {}; + nsd = callPackage ../servers/dns/nsd (config.nsd or {}); nsq = callPackage ../servers/nsq { }; @@ -11586,6 +11631,11 @@ in faba-mono-icons = callPackage ../data/icons/faba-mono-icons { }; + emojione = callPackage ../data/fonts/emojione { + inherit (nodePackages) svgo; + inherit (pythonPackages) scfbuild; + }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -12619,6 +12669,8 @@ in fvwm = callPackage ../applications/window-managers/fvwm { }; + ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; + geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; @@ -12637,7 +12689,7 @@ in gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = callPackage ../applications/misc/goldendict { }; + goldendict = qt55.callPackage ../applications/misc/goldendict { }; google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; @@ -12865,7 +12917,7 @@ in libart = pkgs.gnome2.libart_lgpl; }; - idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_4_4; }); + idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -13122,6 +13174,8 @@ in inferno = callPackage_i686 ../applications/inferno { }; + inginious = callPackage ../servers/inginious {}; + inkscape = callPackage ../applications/graphics/inkscape { inherit (pythonPackages) python pyxml lxml numpy; lcms = lcms2; @@ -13278,7 +13332,9 @@ in librecad = callPackage ../applications/misc/librecad { }; librecad2 = self.librecad; # backwards compatibility alias, added 2015-10 - libreoffice = callPackage ../applications/office/libreoffice { + libreoffice = hiPrio libreoffice-still; + + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; @@ -13295,7 +13351,7 @@ in harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - }; + }); libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { inherit (perlPackages) ArchiveZip CompressZlib; @@ -14253,6 +14309,8 @@ in apiKey = config.libspotify.apiKey or null; }; + squeezelite = callPackage ../applications/audio/squeezelite { }; + ltunify = callPackage ../tools/misc/ltunify { }; src = callPackage ../applications/version-management/src/default.nix { @@ -14264,10 +14322,15 @@ in stp = callPackage ../applications/science/logic/stp {}; stumpwm = callPackage ../applications/window-managers/stumpwm { + version = "latest"; sbcl = sbcl_1_2_5; lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5); }; + stumpwm-git = stumpwm.override { + version = "git"; + }; + sublime = callPackage ../applications/editors/sublime { }; sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); @@ -15851,6 +15914,9 @@ in numix-gtk-theme = callPackage ../misc/themes/numix-gtk-theme { }; + # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build + trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; + kde5PackagesFun = self: with self; { calamares = callPackage ../tools/misc/calamares rec { @@ -16108,6 +16174,8 @@ in alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; + aspino = callPackage ../applications/science/logic/aspino {}; + coq = callPackage ../applications/science/logic/coq { inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; camlp5 = ocamlPackages_4_01_0.camlp5_transitional; @@ -16214,6 +16282,9 @@ in ginac = callPackage ../applications/science/math/ginac { }; + glucose = callPackage ../applications/science/logic/glucose { }; + glucose-syrup = callPackage ../applications/science/logic/glucose/syrup.nix { }; + hol = callPackage ../applications/science/logic/hol { }; hol_light = callPackage ../applications/science/logic/hol_light { @@ -17077,4 +17148,6 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; iterm2 = callPackage ../applications/misc/iterm2 {}; + + sequelpro = callPackage ../applications/misc/sequelpro {}; } diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 22964195ed6a..cff8671b65d5 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -19,10 +19,6 @@ && system != "x86_64-solaris" && system != "x86_64-kfreebsd-gnu") - # More flags for the bootstrapping of stdenv. -, gccWithCC ? true -, gccWithProfiling ? true - , # Allow a configuration attribute set to be passed in as an # argument. Otherwise, it's read from $NIXPKGS_CONFIG or # ~/.nixpkgs/config.nix. @@ -44,10 +40,7 @@ let # for NIXOS (nixos-rebuild): use nixpkgs.config option config = let - toPath = builtins.toPath; - getEnv = builtins.getEnv; - pathExists = name: - builtins.pathExists (toPath name); + inherit (builtins) getEnv pathExists; configFile = getEnv "NIXPKGS_CONFIG"; homeDir = getEnv "HOME"; @@ -55,8 +48,8 @@ let configExpr = if config_ != null then config_ - else if configFile != "" && pathExists configFile then import (toPath configFile) - else if homeDir != "" && pathExists configFile2 then import (toPath configFile2) + else if configFile != "" && pathExists configFile then import configFile + else if homeDir != "" && pathExists configFile2 then import configFile2 else {}; in @@ -84,8 +77,7 @@ let else config.platform or platformAuto; topLevelArguments = { - inherit system bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem platform lib; + inherit system bootStdenv noSysDirs config crossSystem platform lib; }; # Allow packages to be overridden globally via the `packageOverrides' diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0878a6adeb8b..1bf3b4c0e61b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -395,7 +395,7 @@ let }; packageRequires = [ company ghc-mod ]; meta = { - description = "company-mode completion backend for haskell-mode via ghc-mod"; + description = "Company-mode completion backend for haskell-mode via ghc-mod"; license = gpl3Plus; }; }; diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix index 70f2de75ae9e..9d2fbcbef5cc 100644 --- a/pkgs/top-level/guile-2-test.nix +++ b/pkgs/top-level/guile-2-test.nix @@ -4,7 +4,7 @@ -- ludo@gnu.org */ let - allPackages = import ./../..; + allPackages = import ../..; pkgsFun = { system ? builtins.currentSystem }: allPackages { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 5f38fdf42aa7..e652bf2d5901 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -427,7 +427,7 @@ let }; meta = with stdenv.lib; { - description = "vicious widgets for window managers"; + description = "Vicious widgets for window managers"; homepage = http://git.sysphere.org/vicious/; license = licenses.gpl2; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 340f4c454e50..0184e5237732 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2698,10 +2698,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.036"; + name = "CryptX-0.037"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "9b740a592843c48a437f5e2b434cee38382e93a9112d2331a76ed7b865d0d520"; + sha256 = "ae09e6449efb2a9bc661ffeba613c7452367bdcb13c1ee346af0f72c9803404d"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { @@ -3539,10 +3539,10 @@ let self = _self // overrides; _self = with self; { }; DBIxClass = buildPerlPackage rec { - name = "DBIx-Class-0.082821"; + name = "DBIx-Class-0.082840"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "1picibywz5sdpaa1pmbv7xfw52nbz6fh32afb1p2qwsgzbkhqvnw"; + sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; }; buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; @@ -7614,10 +7614,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999723"; + name = "Math-BigInt-1.999724"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "c67da3fdc18f6f6127b13d10f0b2d482c431b0c10d9239ace8481cdf7136f0c9"; + sha256 = "3e0c6e1c58fb89987a20da5ec8027d078a4e1d47211b86db4b75c2e1293d96f7"; }; meta = { description = "Arbitrary size integer/float math package"; @@ -8289,10 +8289,10 @@ let self = _self // overrides; _self = with self; { }; Moo = buildPerlPackage rec { - name = "Moo-2.001001"; + name = "Moo-2.002002"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "a68155b642f389cb1cc40139e2663d0c5d15eb71d9ecb0961623a73c10dd8ec0"; + sha256 = "5e684e216ebd4531f5fa69d97fa4911344abcb5e2f7f8c240240ec03fa2c5eff"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny ]; @@ -8588,10 +8588,10 @@ let self = _self // overrides; _self = with self; { }; MooseXGetopt = buildPerlPackage rec { - name = "MooseX-Getopt-0.70"; + name = "MooseX-Getopt-0.71"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "b9a95b01db3a6abf5e9a1cdbb6e283411649c8d279819cbe903bf4a662106194"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "de18f8ea0a5650cbbdebecb8f4c028f5f951fc5698332f7b8e20c7874902c259"; }; buildInputs = [ ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings self."if" ]; propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; @@ -12000,10 +12000,10 @@ let self = _self // overrides; _self = with self; { }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000030"; + name = "Test2-Suite-0.000032"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "03f2411a8b1a85be8560c25d57f465c812174bc1c062ee79aeb194b018e6b751"; + sha256 = "96be3607c018a3774acac99b0a47678322ef271e7152cddac7b5a0e9a3de5da3"; }; propagatedBuildInputs = [ TestSimple13 ]; meta = { @@ -13199,6 +13199,18 @@ let self = _self // overrides; _self = with self; { }; }; + TextRoman = buildPerlPackage rec { + name = "Text-Roman-3.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EC/ECALDER/${name}.tar.gz"; + sha256 = "1ris38kdj15l8l7cl5whdpyyvb0rz8dh9p0w36wgydi3b2pxsa25"; + }; + meta = { + description = "Allows conversion between Roman and Arabic algarisms"; + license = stdenv.lib.licenses.bsd3; + }; + }; + TextSimpleTable = buildPerlPackage { name = "Text-SimpleTable-2.03"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 014a28791006..596b8ab7050a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -597,7 +597,7 @@ in modules // { meta = { homepage = https://github.com/bitprophet/alabaster; - description = "a Sphinx theme"; + description = "A Sphinx theme"; license = licenses.bsd3; }; }; @@ -887,7 +887,7 @@ in modules // { buildInputs = with self; [ pytest ]; meta = { - description = "namespace control and lazy-import mechanism"; + description = "Namespace control and lazy-import mechanism"; homepage = "http://bitbucket.org/hpk42/apipkg"; license = licenses.mit; }; @@ -971,7 +971,7 @@ in modules // { }; meta = { - description = "reference implementation of PEP 3156"; + description = "Reference implementation of PEP 3156"; homepage = http://www.python.org/dev/peps/pep-3156; license = licenses.free; }; @@ -2059,11 +2059,11 @@ in modules // { cornice = buildPythonPackage rec { name = "cornice-${version}"; - version = "0.17.0"; + version = "1.2.1"; src = pkgs.fetchgit { url = https://github.com/mozilla-services/cornice.git; rev = "refs/tags/${version}"; - sha256 = "11xgf7mddq9gm3yag61zj8hj2kgsgabrnzwn2zpfj37xp1p0pky7"; + sha256 = "0688vrkl324jmpi8jkjh1s8nsyjinw149g3x8qlis8vz6j6a01wv"; }; propagatedBuildInputs = with self; [ pyramid simplejson ]; @@ -2465,12 +2465,12 @@ in modules // { }; bleach = buildPythonPackage rec { - version = "v1.4"; + version = "v1.4.3"; name = "bleach-${version}"; src = pkgs.fetchurl { url = "http://github.com/jsocol/bleach/archive/${version}.tar.gz"; - sha256 = "19v0zhvchz89w179rwkc4ah3cj2gbcng9alwa2yla89691g8b0b0"; + sha256 = "0mk8780ilip0m890rapbckngw8k42gca3551kri297pyylr06l5m"; }; buildInputs = with self; [ nose ]; @@ -3396,12 +3396,12 @@ in modules // { }; click-threading = buildPythonPackage rec { - version = "0.1.2"; + version = "0.4.0"; name = "click-threading-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/c/click-threading/${name}.tar.gz"; - sha256 = "0jmrv4334lfxa2ss53c06dafdwqbk1pb3ihd26izn5igw1bm8145"; + sha256 = "1lrn2inlzz5lr8ay36dz9gmlnqqvdnh14rcm2nmhaxvbbz0gl8qq"; }; propagatedBuildInputs = with self; [ click ]; @@ -3813,7 +3813,7 @@ in modules // { sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c"; }; meta = { - description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; + description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; }; propagatedBuildInputs = with self; [ self.coverage ]; }; @@ -4606,7 +4606,7 @@ in modules // { buildInputs = with self; [ covCore pytest ]; meta = { - description = "plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; homepage = https://github.com/schlamar/pytest-cov; license = licenses.mit; }; @@ -4694,7 +4694,7 @@ in modules // { TINYCSS_SKIP_SPEEDUPS_TESTS = optional isPyPy true; meta = { - description = "complete yet simple CSS parser for Python"; + description = "Complete yet simple CSS parser for Python"; license = licenses.bsd3; homepage = http://pythonhosted.org/tinycss/; }; @@ -5315,7 +5315,7 @@ in modules // { ''; meta = { - description = "integrates an Android device into a desktop"; + description = "Integrates an Android device into a desktop"; homepage = https://github.com/screenfreeze/deskcon-desktop; license = licenses.gpl3; }; @@ -5838,7 +5838,7 @@ in modules // { meta = { homepage = "http://python-eve.org/"; - description = "open source Python REST API framework designed for human beings"; + description = "Open source Python REST API framework designed for human beings"; license = licenses.bsd3; }; }; @@ -5932,7 +5932,7 @@ in modules // { doCheck = !isPy3k; # failures.. meta = { - description = "rapid multi-Python deployment"; + description = "Rapid multi-Python deployment"; license = licenses.gpl2; }; }; @@ -6559,7 +6559,7 @@ in modules // { doCheck = false; meta = { - description = "python humanize utilities"; + description = "Python humanize utilities"; homepage = https://github.com/jmoiron/humanize; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; @@ -6665,7 +6665,7 @@ in modules // { }; meta = { - description = "helpers to pass trusted data to untrusted environments and back"; + description = "Helpers to pass trusted data to untrusted environments and back"; homepage = "https://pypi.python.org/pypi/itsdangerous/"; }; }; @@ -6707,7 +6707,7 @@ in modules // { doCheck = false; meta = { - description = "tools for i3 users and developers"; + description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; platforms = platforms.linux; @@ -6965,19 +6965,31 @@ in modules // { }; }; - lti = buildPythonPackage rec { - version = "0.4.0"; + lti = let + self' = (self.override {self = self';}) // {pytest = self.pytest_27;}; + mock_1_0_1 = self'.mock.overrideDerivation (_: rec { + name = "mock-1.0.1"; + propagatedBuildInputs = null; + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz"; + sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"; + }; + }); + in buildPythonPackage rec { + version = "0.4.1"; name = "PyLTI-${version}"; + disabled = !isPy27; + propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; - buildInputs = with self; [ + buildInputs = with self'; [ flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore - pytestflakes pytestpep8 sphinx mock + pytestflakes pytestpep8 sphinx mock_1_0_1 ]; src = pkgs.fetchurl { url = "mirror://pypi/P/PyLTI/${name}.tar.gz"; - sha256 = "1lkk6qx8yfx1h0rhi4abnd44x0wakggi6zs0nvi572lajf6ydmdh"; + sha256 = "076llj10j85zw3zq2gygx2pcfqi9rgcld5m4vq1iai1fk15x60fz"; }; meta = { @@ -7109,7 +7121,7 @@ in modules // { }; meta = { - description = "dependencies for mwlib markup"; + description = "Dependencies for mwlib markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; }; @@ -7132,7 +7144,7 @@ in modules // { ]; meta = { - description = "generate pdfs from mediawiki markup"; + description = "Generate pdfs from mediawiki markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; }; @@ -7223,7 +7235,7 @@ in modules // { JPEG_DIR="${pkgs.libjpeg.dev}"; meta = { - description = "interface to netCDF library (versions 3 and 4)"; + description = "Interface to netCDF library (versions 3 and 4)"; homepage = https://pypi.python.org/pypi/netCDF4; license = licenses.free; # Mix of license (all MIT* like) }; @@ -7601,18 +7613,13 @@ in modules // { }; pyramid = buildPythonPackage rec { - name = "pyramid-1.5.7"; + name = "pyramid-1.7"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyramid/${name}.tar.gz"; - sha256 = "1d29fj86724z68zcj9ximl2nrn34pflrlr6v9mwyhcv8rdf2sc61"; + sha256 = "161qacv7qqln3q02kcqll0q2mmaypm701hn1llwdwnkaywkb3xi6"; }; - preCheck = '' - # this will be fixed for 1.6 release, see https://github.com/Pylons/pyramid/issues/1405 - rm pyramid/tests/test_response.py - ''; - buildInputs = with self; [ docutils virtualenv @@ -7763,11 +7770,11 @@ in modules // { pyramid_multiauth = buildPythonPackage rec { name = "pyramid_multiauth-${version}"; - version = "0.3.2"; + version = "0.8.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyramid_multiauth/${name}.tar.gz"; - sha256 = "c33f357e0a216cd6ef7d143d40d4679c9fb0796a1eabaf1249aeef63ed000828"; + sha256 = "1lq292qakrm4ixi4vaif8dqywzj08pn6qy0wi4gw28blh39p0msk"; }; propagatedBuildInputs = with self; [ pyramid ]; @@ -10478,7 +10485,7 @@ in modules // { buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse); meta = { - description = "automatically generated zsh completion function for Python's option parser modules"; + description = "Automatically generated zsh completion function for Python's option parser modules"; license = "BSD"; }; }; @@ -11177,70 +11184,6 @@ in modules // { }; }; - inginious = let - # patched version of docker bindings. - docker-custom = self.docker.override { - name = "docker-1.3.0-dirty"; - src = pkgs.fetchFromGitHub { - owner = "GuillaumeDerval"; - repo = "docker-py"; - # tip of branch "master" - rev = "966becd0af514e67de5afbf885257a5005e49626"; - sha256 = "09k41dh86cbb7z4b8926fi5b2qq670mm6agl5py3giacakrap66c"; - }; - }; - - webpy-custom = self.web.override { - name = "web.py-INGI"; - src = pkgs.fetchFromGitHub { - owner = "UCL-INGI"; - repo = "webpy-INGI"; - # tip of branch "ingi" - rev = "f487e78d65d6569eb70003e588d5c6ace54c384f"; - sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd"; - }; - }; - in buildPythonPackage rec { - version = "0.3a2.dev0"; - name = "inginious-${version}"; - - disabled = isPy3k; - - patchPhase = '' - # transient failures - substituteInPlace inginious/backend/tests/TestRemoteAgent.py \ - --replace "test_update_task_directory" "noop" - ''; - - propagatedBuildInputs = with self; [ - requests2 - cgroup-utils docker-custom docutils lti mock pygments - pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib - websocket_client watchdog webpy-custom - ]; - - buildInputs = with self; [ nose selenium virtual-display ]; - - /* Hydra fix exists only on github for now. - src = pkgs.fetchurl { - url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz"; - md5 = "40474dd6b6d4fc26e47a1d9c77bcf943"; - }; - */ - src = pkgs.fetchFromGitHub { - owner = "UCL-INGI"; - repo = "INGInious"; - rev = "e019a0e28c442b4201ec4a0be2a816c4ab639683"; - sha256 = "1pwbm7f7xn50rxzwrqpji58n2ami5r3lgbdpb61q0w3dwkxvvvfk"; - }; - - meta = { - description = "An intelligent grader that allows secured and automated testing of code made by students"; - homepage = "https://github.com/UCL-INGI/INGInious"; - license = licenses.agpl3; - maintainers = with maintainers; [ layus ]; - }; - }; interruptingcow = buildPythonPackage rec { name = "interruptingcow-${version}"; @@ -14221,7 +14164,7 @@ in modules // { meta = { homepage = "https://github.com/simplegeo/python-oauth2"; - description = "library for OAuth version 1.0"; + description = "Library for OAuth version 1.0"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; platforms = platforms.linux; @@ -14286,7 +14229,7 @@ in modules // { [ pyptlib argparse twisted pycrypto pyyaml ]; meta = { - description = "a pluggable transport proxy"; + description = "A pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; maintainers = with maintainers; [ phreedom thoughtpolice ]; @@ -16373,6 +16316,7 @@ in modules // { pgcli = buildPythonPackage rec { name = "pgcli-${version}"; version = "0.20.1"; + disabled = isPy35; src = pkgs.fetchFromGitHub { sha256 = "0f1ff1a1x1qrcv4ygfh29yyknx8hgwck7rp020zz0jrq9dibhjp7"; @@ -16425,6 +16369,7 @@ in modules // { mycli = buildPythonPackage rec { name = "mycli-${version}"; version = "1.6.0"; + disabled = isPy35; src = pkgs.fetchFromGitHub { sha256 = "0vvl36gxawa0h36v119j47fdylj8k73ak6hv04s5cjqn5adcjjbh"; @@ -16881,18 +16826,18 @@ in modules // { prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "1.0.1"; + version = "1.0.3"; src = pkgs.fetchurl { - sha256 = "1r0l5gfxbrxvqgqhybz6vg4zhhzm51888q3xpbajs5l1k04kmmi9"; + sha256 = "18lbmmkyjf509klc3217lq0x863pfzix779zx5kp9lms1iph4pl0"; url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; checkPhase = '' rm prompt_toolkit/win32_types.py ''; - buildInputs = with self; [ jedi ipython pygments ]; - propagatedBuildInputs = with self; [ docopt six wcwidth ]; + buildInputs = with self; [ jedi ipython ]; + propagatedBuildInputs = with self; [ docopt six wcwidth pygments ]; meta = { description = "Python library for building powerful interactive command lines"; @@ -18927,7 +18872,7 @@ in modules // { meta = { homepage = "https://github.com/asweigart/pyperclip"; license = licenses.bsdOriginal; - description = "cross-platform clipboard module"; + description = "Cross-platform clipboard module"; }; }; @@ -19499,7 +19444,7 @@ in modules // { buildInputs = with self; [ ]; meta = { - description = "job queue server"; + description = "Job queue server"; homepage = "https://github.com/pediapress/qserve"; license = licenses.bsd3; }; @@ -19696,7 +19641,7 @@ in modules // { doCheck = false; meta = with stdenv.lib; { - description = "readme"; + description = "Readme"; homepage = "https://github.com/pypa/readme"; }; }; @@ -20039,7 +19984,7 @@ in modules // { }; meta = { - description = "python refactoring library"; + description = "Python refactoring library"; homepage = http://rope.sf.net; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20058,7 +20003,7 @@ in modules // { propagatedBuildInputs = with self; [ ropemode ]; meta = { - description = "a plugin for performing python refactorings in emacs"; + description = "A plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net/ropemacs.html; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20077,7 +20022,7 @@ in modules // { propagatedBuildInputs = with self; [ rope ]; meta = { - description = "a plugin for performing python refactorings in emacs"; + description = "A plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20203,7 +20148,7 @@ in modules // { }; meta = { - description = "common routines for ruamel packages"; + description = "Common routines for ruamel packages"; homepage = https://bitbucket.org/ruamel/base; license = licenses.mit; }; @@ -20220,7 +20165,7 @@ in modules // { }; meta = { - description = "a version of dict that keeps keys in insertion resp. sorted order"; + description = "A version of dict that keeps keys in insertion resp. sorted order"; homepage = https://bitbucket.org/ruamel/ordereddict; license = licenses.mit; }; @@ -20521,7 +20466,7 @@ in modules // { doCheck = false; meta = { - description = "statisitical data visualization"; + description = "Statisitical data visualization"; homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; license = "BSD"; maintainers = with maintainers; [ fridh ]; @@ -20628,7 +20573,7 @@ in modules // { propagatedBuildInputs = with self; [ twisted ]; meta = { - description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; + description = "Setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; homepage = http://allmydata.org/trac/setuptools_trial; @@ -21029,6 +20974,21 @@ in modules // { }; }; + Theano-cuda = callPackage ../development/python-modules/theano/cuda ( + let + boost = pkgs.boost159.override { + inherit (self) python numpy scipy; + }; + in rec { + cudatoolkit = pkgs.cudatoolkit75; + cudnn = pkgs.cudnn5_cudatoolkit75; + inherit (self) numpy scipy; + pycuda = self.pycuda.override { inherit boost; }; + libgpuarray = self.libgpuarray-cuda.override { + clblas = pkgs.clblas-cuda.override { inherit boost; }; + }; + }); + tidylib = buildPythonPackage rec { version = "0.2.4"; name = "pytidylib-${version}"; @@ -21093,7 +21053,7 @@ in modules // { buildInputs = with self; [ ]; meta = { - description = "parse english textual date descriptions"; + description = "Parse english textual date descriptions"; homepage = "https://github.com/pediapress/timelib/"; license = licenses.zlib; }; @@ -22035,16 +21995,18 @@ in modules // { }; structlog = buildPythonPackage rec { - name = "structlog-15.3.0"; + name = "structlog-16.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/s/structlog/${name}.tar.gz"; - sha256 = "1h9qz4fsd7ph8rf80rqmlyj2q54xapgrmkpnyca01w1z8ww6f9w7"; + sha256 = "00dywyg3bqlkrmbrfrql21hpjjjkc4zjd6xxjyxyd15brfnzlkdl"; }; buildInputs = with self; [ pytest pretend freezegun ]; + propagatedBuildInputs = with self; [ simplejson ]; checkPhase = '' + rm tests/test_twisted.py* py.test ''; @@ -22378,7 +22340,7 @@ in modules // { propagatedBuildInputs = with self; [ testtools ]; meta = { - description = "a pyunit extension for dependency injection"; + description = "A pyunit extension for dependency injection"; homepage = https://pypi.python.org/pypi/testscenarios; license = licenses.asl20; }; @@ -22698,7 +22660,7 @@ in modules // { propagatedBuildInputs = with self; [ numpy ]; meta = { - description = "explicitly typed attributes for Python"; + description = "Explicitly typed attributes for Python"; homepage = http://pypi.python.org/pypi/traits; license = "BSD"; }; @@ -23234,7 +23196,7 @@ in modules // { }; meta = { - description = "python wrapper for Xvfb, Xephyr and Xvnc"; + description = "Python wrapper for Xvfb, Xephyr and Xvnc"; homepage = "https://github.com/ponty/pyvirtualdisplay"; license = licenses.bsdOriginal; maintainers = with maintainers; [ layus ]; @@ -23259,7 +23221,7 @@ in modules // { doCheck = false; meta = { - description = "a tool to create isolated Python environments"; + description = "A tool to create isolated Python environments"; homepage = http://www.virtualenv.org; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; @@ -23993,7 +23955,7 @@ in modules // { patches = [ ../development/python-modules/btrees-py35.patch ]; meta = { - description = "scalable persistent components"; + description = "Scalable persistent components"; homepage = http://packages.python.org/BTrees; }; }; @@ -24010,7 +23972,7 @@ in modules // { }; meta = { - description = "automatic persistence for Python objects"; + description = "Automatic persistence for Python objects"; homepage = http://www.zope.org/Products/ZODB; }; }; @@ -24568,7 +24530,7 @@ in modules // { meta = { homepage = http://liw.fi/cmdtest/; - description = "black box tests Unix command line tools"; + description = "Black box tests Unix command line tools"; }; }; @@ -24988,13 +24950,13 @@ in modules // { ujson = buildPythonPackage rec { - name = "ujson-1.33"; + name = "ujson-1.35"; disabled = isPyPy; src = pkgs.fetchurl { - url = "mirror://pypi/u/ujson/${name}.zip"; - sha256 = "68cf825f227c82e1ac61e423cfcad923ff734c27b5bdd7174495d162c42c602b"; + url = "mirror://pypi/u/ujson/${name}.tar.gz"; + sha256 = "11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n"; }; meta = { @@ -25547,7 +25509,7 @@ in modules // { }; meta = { - description = "implements a lazy string for python useful for use with gettext"; + description = "Implements a lazy string for python useful for use with gettext"; homepage = https://github.com/mitsuhiko/speaklater; license = "bsd"; maintainers = with maintainers; [ matejc ]; @@ -27040,7 +27002,7 @@ in modules // { meta = { homepage = http://github.com/bepasty/bepasty-server; - description = "binary pastebin server"; + description = "Binary pastebin server"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; @@ -27097,7 +27059,7 @@ in modules // { }; meta = { homepage = http://bitbucket.org/thomaswaldmann/xstatic; - description = "base packaged static files for python"; + description = "Base packaged static files for python"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; @@ -27112,7 +27074,7 @@ in modules // { }; meta = { homepage = https://github.com/bitprophet/alabaster; - description = "convert xlsx to csv"; + description = "Convert xlsx to csv"; license = licenses.bsd3; maintainers = with maintainers; [ jb55 ]; }; @@ -27411,7 +27373,7 @@ in modules // { }; meta = { - description = "console colouring for python"; + description = "Console colouring for python"; homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10"; license = licenses.bsdOriginal; }; @@ -27430,7 +27392,7 @@ in modules // { buildInputs = with self; [ mock ]; meta = { - description = "python test runner"; + description = "Python test runner"; homepage = "https://github.com/CleanCut/green"; licence = licenses.mit; }; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 343a3f47a4b3..b352ec0fe648 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,5 +1,5 @@ { supportedSystems -, packageSet ? (import ./../..) +, packageSet ? (import ../..) , allowTexliveBuilds ? false , scrubJobs ? true }: diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index cb21a660eb56..0fbd5e50d12e 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,7 +3,7 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 0ccb160e4f68..2774ff66f576 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -1,7 +1,7 @@ /* A small release file, with few packages to be built. The aim is to reduce the load on Hydra when testing the `stdenv-updates' branch. */ -{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] }: diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b596075a2ed0..ba99fd5a0370 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,7 +9,7 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ -{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index aeb36b8edc35..9b8cf5a03092 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -6,7 +6,7 @@ with super; rec { allStdenvs = import ../stdenv { inherit system platform config lib; - allPackages = args: import ./../.. ({ inherit config system; } // args); + allPackages = args: import ../.. ({ inherit config system; } // args); }; defaultStdenv = allStdenvs.stdenv // { inherit platform; }; @@ -21,7 +21,7 @@ rec { in if changer != null then changer { # We import again all-packages to avoid recursivities. - pkgs = import ./../.. { + pkgs = import ../.. { # We remove packageOverrides to avoid recursivities config = removeAttrs config [ "replaceStdenv" ]; }; |