From bc9c9dd6bde6b2dcf8b4b413fc7942ea2434edd1 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 27 Aug 2016 12:08:32 -0700 Subject: [PATCH 001/234] tt-rss service: Allow setting application root --- nixos/modules/services/web-apps/tt-rss.nix | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b08070f1e36..83d2b8ad5af 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -91,6 +91,15 @@ let enable = mkEnableOption "tt-rss"; + root = mkOption { + type = types.path; + default = "/var/lib/tt-rss"; + example = "/var/lib/tt-rss"; + description = '' + Root of the application. + ''; + }; + user = mkOption { type = types.str; default = "nginx"; @@ -445,9 +454,7 @@ let ###### implementation - config = let - root = "/var/lib/tt-rss"; - in mkIf cfg.enable { + config = mkIf cfg.enable { services.phpfpm.poolConfigs = if cfg.pool == "${poolName}" then { "${poolName}" = '' @@ -524,12 +531,12 @@ let else ""; in '' - rm -rf "${root}/*" - mkdir -m 755 -p "${root}" - cp -r "${pkgs.tt-rss}/"* "${root}" - ln -sf "${tt-rss-config}" "${root}/config.php" - chown -R "${cfg.user}" "${root}" - chmod -R 755 "${root}" + rm -rf "${cfg.root}/*" + mkdir -m 755 -p "${cfg.root}" + cp -r "${pkgs.tt-rss}/"* "${cfg.root}" + ln -sf "${tt-rss-config}" "${cfg.root}/config.php" + chown -R "${cfg.user}" "${cfg.root}" + chmod -R 755 "${cfg.root}" '' + (optionalString (cfg.database.type == "pgsql") '' exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ @@ -554,7 +561,7 @@ let serviceConfig = { User = "${cfg.user}"; - ExecStart = "${pkgs.php}/bin/php /var/lib/tt-rss/update.php --daemon"; + ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon"; StandardOutput = "syslog"; StandardError = "syslog"; PermissionsStartOnly = true; From 3a4db71b35dee7a4c427ae9692f8a0a8e2c1924d Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 27 Aug 2016 12:10:30 -0700 Subject: [PATCH 002/234] tt-rss service: Use the correct user to run the application --- nixos/modules/services/web-apps/tt-rss.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 83d2b8ad5af..db809903233 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -105,7 +105,7 @@ let default = "nginx"; example = "nginx"; description = '' - User account under which both the service and the web-application run. + User account under which both the update daemon and the web-application run. ''; }; @@ -462,7 +462,7 @@ let listen.owner = nginx listen.group = nginx listen.mode = 0600 - user = nginx + user = ${cfg.user} pm = dynamic pm.max_children = 75 pm.start_servers = 10 From 33d6371fd9d14f978d55ec1898c54b0380f715f2 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 27 Aug 2016 12:18:04 -0700 Subject: [PATCH 003/234] tt-rss service: Allow connecting to the database through Unix socket --- nixos/modules/services/web-apps/tt-rss.nix | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index db809903233..22a8bfc02a3 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -34,10 +34,10 @@ let define('MYSQL_CHARSET', 'UTF8'); define('DB_TYPE', '${cfg.database.type}'); - define('DB_HOST', '${cfg.database.host}'); + define('DB_HOST', '${optionalString (cfg.database.host != null) cfg.database.host}'); define('DB_USER', '${cfg.database.user}'); define('DB_NAME', '${cfg.database.name}'); - define('DB_PASS', '${escape ["'" "\\"] cfg.database.password}'); + define('DB_PASS', '${optionalString (cfg.database.password != null) (escape ["'" "\\"] cfg.database.password)}'); define('DB_PORT', '${toString dbPort}'); define('AUTH_AUTO_CREATE', ${boolToString cfg.auth.autoCreate}); @@ -141,10 +141,10 @@ let }; host = mkOption { - type = types.str; - default = "localhost"; + type = types.nullOr types.str; + default = null; description = '' - Host of the database. + Host of the database. Leave null to use Unix domain socket. ''; }; @@ -510,25 +510,23 @@ let description = "Tiny Tiny RSS feeds update daemon"; preStart = let - callSql = if cfg.database.type == "pgsql" then (e: '' - ${optionalString (cfg.database.password != null) - "PGPASSWORD=${cfg.database.password}"} ${pkgs.postgresql95}/bin/psql \ - -U ${cfg.database.user} \ - -h ${cfg.database.host} \ - --port ${toString dbPort} \ - -c '${e}' \ - ${cfg.database.name}'') + callSql = e: + if cfg.database.type == "pgsql" then '' + ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ + ${pkgs.postgresql95}/bin/psql \ + -U ${cfg.database.user} \ + ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ + -c '${e}' \ + ${cfg.database.name}'' - else if cfg.database.type == "mysql" then (e: '' - echo '${e}' | ${pkgs.mysql}/bin/mysql \ - ${optionalString (cfg.database.password != null) - "-p${cfg.database.password}"} \ - -u ${cfg.database.user} \ - -h ${cfg.database.host} \ - -P ${toString dbPort} \ - ${cfg.database.name}'') + else if cfg.database.type == "mysql" then '' + echo '${e}' | ${pkgs.mysql}/bin/mysql \ + -u ${cfg.database.user} \ + ${optionalString (cfg.database.password != null) "-p${cfg.database.password}"} \ + ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} -P ${toString dbPort}"} \ + ${cfg.database.name}'' - else ""; + else ""; in '' rm -rf "${cfg.root}/*" @@ -537,8 +535,9 @@ let ln -sf "${tt-rss-config}" "${cfg.root}/config.php" chown -R "${cfg.user}" "${cfg.root}" chmod -R 755 "${cfg.root}" - '' + (optionalString (cfg.database.type == "pgsql") '' + '' + + (optionalString (cfg.database.type == "pgsql") '' exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -547,8 +546,9 @@ let else echo 'The database contains some data. Leaving it as it is.' fi; - '') + (optionalString (cfg.database.type == "mysql") '' + '') + + (optionalString (cfg.database.type == "mysql") '' exists=$(${callSql "select count(*) > 0 from information_schema.tables where table_schema = schema()"} \ | tail -n+2 | sed -e 's/[ \n\t]*//') From 789a37f0fc279ac74ea605ce721d154da98301fa Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 27 Aug 2016 12:20:28 -0700 Subject: [PATCH 004/234] tt-rss service: #15862 has been merged; enable nginx virtualhost config --- nixos/modules/services/web-apps/tt-rss.nix | 65 +++++++++------------- 1 file changed, 25 insertions(+), 40 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 22a8bfc02a3..a0087ea786c 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -18,7 +18,6 @@ let poolName = "tt-rss"; phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; - virtualHostName = "tt-rss"; tt-rss-config = pkgs.writeText "config.php" '' Date: Sat, 27 Aug 2016 12:23:19 -0700 Subject: [PATCH 005/234] tt-rss service: Default to multiple user mode --- nixos/modules/services/web-apps/tt-rss.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index a0087ea786c..5193814da72 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -366,7 +366,7 @@ let singleUserMode = mkOption { type = types.bool; - default = true; + default = false; description = '' Operate in single user mode, disables all functionality related to From 58869cf31020c8eca25f63f8c9d6d2d89f731166 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sun, 7 Jun 2015 23:36:56 -0700 Subject: [PATCH 006/234] prometheus service: add This is based on @benleys work: https://github.com/NixOS/nixpkgs/pull/8216 I updated changed the user and group ids. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/monitoring/prometheus.nix | 418 ++++++++++++++++++ nixos/tests/prometheus.nix | 29 ++ 4 files changed, 450 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus.nix create mode 100644 nixos/tests/prometheus.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 31c93028bc5..ec678a27640 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -275,6 +275,7 @@ gocd-server = 252; terraria = 253; mattermost = 254; + prometheus = 255; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -520,6 +521,7 @@ gocd-server = 252; terraria = 253; mattermost = 254; + prometheus = 255; # 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 27fbe55cd42..c0ba73c0172 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -286,6 +286,7 @@ ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix + ./services/monitoring/prometheus.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix diff --git a/nixos/modules/services/monitoring/prometheus.nix b/nixos/modules/services/monitoring/prometheus.nix new file mode 100644 index 00000000000..50cfff19ade --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus.nix @@ -0,0 +1,418 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus; + promUser = "prometheus"; + promGroup = "prometheus"; + + # Get a submodule without any embedded metadata: + _filter = x: filterAttrs (k: v: k != "_module") x; + + # Pretty-print JSON to a file + writePrettyJSON = name: x: + pkgs.runCommand name { } '' + echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out + ''; + + # This becomes the main config file + promConfig = { + global = cfg.globalConfig; + rule_files = cfg.ruleFiles ++ [ + (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) + ]; + scrape_configs = cfg.scrapeConfigs; + }; + + cmdlineArgs = cfg.extraFlags ++ [ + "-storage.local.path=${cfg.dataDir}/metrics" + "-config.file=${writePrettyJSON "prometheus.yml" promConfig}" + "-web.listen-address=${cfg.listenAddress}" + ]; + + promTypes.globalConfig = types.submodule { + options = { + scrape_interval = mkOption { + type = types.str; + default = "1m"; + description = '' + How frequently to scrape targets by default. + ''; + }; + + scrape_timeout = mkOption { + type = types.str; + default = "10s"; + description = '' + How long until a scrape request times out. + ''; + }; + + evaluation_interval = mkOption { + type = types.str; + default = "1m"; + description = '' + How frequently to evaluate rules by default. + ''; + }; + + labels = mkOption { + type = types.attrsOf types.str; + default = {}; + description = '' + The labels to add to any timeseries that this Prometheus instance + scrapes. + ''; + }; + }; + }; + + promTypes.scrape_config = types.submodule { + options = { + job_name = mkOption { + type = types.str; + description = '' + The job name assigned to scraped metrics by default. + ''; + }; + scrape_interval = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + How frequently to scrape targets from this job. Defaults to the + globally configured default. + ''; + }; + scrape_timeout = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Per-target timeout when scraping this job. Defaults to the + globally configured default. + ''; + }; + metrics_path = mkOption { + type = types.str; + default = "/metrics"; + description = '' + The HTTP resource path on which to fetch metrics from targets. + ''; + }; + scheme = mkOption { + type = types.enum ["http" "https"]; + default = "http"; + description = '' + The URL scheme with which to fetch metrics from targets. + ''; + }; + basic_auth = mkOption { + type = types.nullOr (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; + }; + password = mkOption { + type = types.str; + description = '' + HTTP password + ''; + }; + }; + }); + default = null; + description = '' + Optional http login credentials for metrics scraping. + ''; + }; + dns_sd_configs = mkOption { + type = types.listOf promTypes.dns_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of DNS service discovery configurations. + ''; + }; + consul_sd_configs = mkOption { + type = types.listOf promTypes.consul_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of Consul service discovery configurations. + ''; + }; + file_sd_configs = mkOption { + type = types.listOf promTypes.file_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of file service discovery configurations. + ''; + }; + target_groups = mkOption { + type = types.listOf promTypes.target_group; + default = []; + apply = x: map _filter x; + description = '' + List of labeled target groups for this job. + ''; + }; + relabel_configs = mkOption { + type = types.listOf promTypes.relabel_config; + default = []; + apply = x: map _filter x; + description = '' + List of relabel configurations. + ''; + }; + }; + }; + + promTypes.target_group = types.submodule { + options = { + targets = mkOption { + type = types.listOf types.str; + description = '' + The targets specified by the target group. + ''; + }; + labels = mkOption { + type = types.attrsOf types.str; + description = '' + Labels assigned to all metrics scraped from the targets. + ''; + }; + }; + }; + + promTypes.dns_sd_config = types.submodule { + options = { + names = mkOption { + type = types.listOf types.str; + description = '' + A list of DNS SRV record names to be queried. + ''; + }; + refresh_interval = mkOption { + type = types.str; + default = "30s"; + description = '' + The time after which the provided names are refreshed. + ''; + }; + }; + }; + + promTypes.consul_sd_config = types.submodule { + options = { + server = mkOption { + type = types.str; + description = "Consul server to query."; + }; + token = mkOption { + type = types.nullOr types.str; + description = "Consul token"; + }; + datacenter = mkOption { + type = types.nullOr types.str; + description = "Consul datacenter"; + }; + scheme = mkOption { + type = types.nullOr types.str; + description = "Consul scheme"; + }; + username = mkOption { + type = types.nullOr types.str; + description = "Consul username"; + }; + password = mkOption { + type = types.nullOr types.str; + description = "Consul password"; + }; + + services = mkOption { + type = types.listOf types.str; + description = '' + A list of services for which targets are retrieved. + ''; + }; + tag_separator = mkOption { + type = types.str; + default = ","; + description = '' + The string by which Consul tags are joined into the tag label. + ''; + }; + }; + }; + + promTypes.file_sd_config = types.submodule { + options = { + names = mkOption { + type = types.listOf types.str; + description = '' + Patterns for files from which target groups are extracted. Refer + to the Prometheus documentation for permitted filename patterns + and formats. + + ''; + }; + refresh_interval = mkOption { + type = types.str; + default = "30s"; + description = '' + Refresh interval to re-read the files. + ''; + }; + }; + }; + + promTypes.relabel_config = types.submodule { + options = { + source_labels = mkOption { + type = types.listOf types.str; + description = '' + The source labels select values from existing labels. Their content + is concatenated using the configured separator and matched against + the configured regular expression. + ''; + }; + separator = mkOption { + type = types.str; + default = ";"; + description = '' + Separator placed between concatenated source label values. + ''; + }; + target_label = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Label to which the resulting value is written in a replace action. + It is mandatory for replace actions. + ''; + }; + regex = mkOption { + type = types.str; + description = '' + Regular expression against which the extracted value is matched. + ''; + }; + replacement = mkOption { + type = types.str; + default = ""; + description = '' + Replacement value against which a regex replace is performed if the + regular expression matches. + ''; + }; + action = mkOption { + type = types.enum ["replace" "keep" "drop"]; + description = '' + Action to perform based on regex matching. + ''; + }; + }; + }; + +in { + options = { + services.prometheus = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Prometheus monitoring daemon. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9090"; + description = '' + Address to listen on for the web interface, API, and telemetry. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/prometheus"; + description = '' + Directory to store Prometheus metrics data. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching Prometheus. + ''; + }; + + globalConfig = mkOption { + type = promTypes.globalConfig; + default = {}; + apply = _filter; + description = '' + Parameters that are valid in all configuration contexts. They + also serve as defaults for other configuration sections + ''; + }; + + rules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Alerting and/or Recording rules to evaluate at runtime. + ''; + }; + + ruleFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Any additional rules files to include in this configuration. + ''; + }; + + scrapeConfigs = mkOption { + type = types.listOf promTypes.scrape_config; + default = []; + apply = x: map _filter x; + description = '' + A list of scrape configurations. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus; + users.extraUsers.${promUser} = { + description = "Prometheus daemon user"; + uid = config.ids.uids.prometheus; + group = promGroup; + home = cfg.dataDir; + createHome = true; + }; + systemd.services.prometheus = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + #!/bin/sh + exec ${pkgs.prometheus}/bin/prometheus \ + ${concatStringsSep " \\\n " cmdlineArgs} + ''; + serviceConfig = { + User = promUser; + Restart = "always"; + WorkingDirectory = cfg.dataDir; + }; + }; + }; +} diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix new file mode 100644 index 00000000000..7605227100d --- /dev/null +++ b/nixos/tests/prometheus.nix @@ -0,0 +1,29 @@ +import ./make-test.nix { + name = "prometheus"; + + nodes = { + one = { config, pkgs, ... }: { + services.prometheus = { + enable = true; + globalConfig = { + labels = { foo = "bar"; }; + }; + scrapeConfigs = [{ + job_name = "prometheus"; + target_groups = [{ + targets = [ "127.0.0.1:9090" ]; + labels = { instance = "localhost"; }; + }]; + }]; + rules = [ ''testrule = count(up{job="prometheus"})'' ]; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("prometheus.service"); + $one->waitForOpenPort(9090); + $one->succeed("curl -s http://127.0.0.1:9090/metrics"); + ''; +} From d4599165010f1541219cf32278e21a18ef8db8f7 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sun, 4 Sep 2016 19:59:32 +0100 Subject: [PATCH 007/234] prometheus service: rename values to match prometheus 1.0 naming. --- nixos/modules/services/monitoring/prometheus.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus.nix b/nixos/modules/services/monitoring/prometheus.nix index 50cfff19ade..31979d2660c 100644 --- a/nixos/modules/services/monitoring/prometheus.nix +++ b/nixos/modules/services/monitoring/prometheus.nix @@ -152,8 +152,8 @@ let List of file service discovery configurations. ''; }; - target_groups = mkOption { - type = types.listOf promTypes.target_group; + static_configs = mkOption { + type = types.listOf promTypes.static_config; default = []; apply = x: map _filter x; description = '' @@ -171,7 +171,7 @@ let }; }; - promTypes.target_group = types.submodule { + promTypes.static_config = types.submodule { options = { targets = mkOption { type = types.listOf types.str; @@ -251,7 +251,7 @@ let promTypes.file_sd_config = types.submodule { options = { - names = mkOption { + files = mkOption { type = types.listOf types.str; description = '' Patterns for files from which target groups are extracted. Refer From 51b404b04899621281f44dc52613459fbb6b035d Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Sun, 4 Sep 2016 20:32:25 -0400 Subject: [PATCH 008/234] emacs24Macport: fix SDK version issue --- pkgs/applications/editors/emacs-24/macport-24.5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index 23133ec262c..885538dc883 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' From d93987b4a7b0f3a2ca1df1c9f47afd7fb8e2222a Mon Sep 17 00:00:00 2001 From: Octavian Cerna Date: Tue, 30 Aug 2016 11:38:51 +0300 Subject: [PATCH 009/234] mc: Enable support for SFTP and SMB. --- pkgs/tools/misc/mc/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 8616a40df43..fbd2c642b9d 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs -, libX11, libICE, perl, zip, unzip, gettext, slang}: +, libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}: stdenv.mkDerivation rec { name = "mc-${version}"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0fvqzffppj0aja9hi0k1xdjg5m6s99immlla1y9yzn5fp8vwpl36"; }; - buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ]; + buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs + libssh2 openssl ]; + + configureFlags = [ "--enable-vfs-smb" ]; meta = { description = "File Manager and User Shell for the GNU Project"; From 1c5d42f7109ad6d6d9026abb23fb039c182cb866 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 30 Jul 2016 10:24:36 +0200 Subject: [PATCH 010/234] udiskie: use wrap GApps and icon setup hooks --- pkgs/top-level/python-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 350843e3df7..048dfb385fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27136,6 +27136,8 @@ in modules // { buildInputs = [ pkgs.asciidoc-full # For building man page. + pkgs.hicolor_icon_theme + pkgs.wrapGAppsHook ]; propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; @@ -27147,11 +27149,6 @@ in modules // { cp -v doc/udiskie.8 $out/share/man/man8/ ''; - preFixup = '' - wrapProgram "$out/bin/"* \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - ''; - # tests require dbusmock doCheck = false; From b67db150c8bf642d359b79c5507da0b26025c028 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 7 Sep 2016 16:00:33 +0200 Subject: [PATCH 011/234] udiskie: 1.4.8 -> 1.5.1 Also switch to `fetchFromGitHub` and do minor formatting. --- pkgs/top-level/python-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 048dfb385fa..b446708824d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27121,13 +27121,15 @@ in modules // { }; }; - udiskie = buildPythonPackage rec { - version = "1.4.8"; + udiskie = buildPythonApplication rec { + version = "1.5.1"; name = "udiskie-${version}"; - src = pkgs.fetchurl { - url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz"; - sha256 = "0fj1kh6pmwyyy54ybc5fa625lhrxzhzmfx1nwz2lym5cpm4b21fl"; + src = pkgs.fetchFromGitHub { + owner = "coldfix"; + repo = "udiskie"; + rev = version; + sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; }; preConfigure = '' @@ -27140,7 +27142,10 @@ in modules // { pkgs.wrapGAppsHook ]; - propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; + propagatedBuildInputs = with self; [ + pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 + pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt + ]; postBuild = "make -C doc"; From 23b76b23f57c5b2372da85ff39371f26e74e00a1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 8 Sep 2016 16:40:54 +0800 Subject: [PATCH 012/234] support user config --- nixos/modules/system/boot/systemd.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 3fa257f9668..67751d8f72c 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -571,6 +571,16 @@ in ''; }; + systemd.user.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultCPUAccounting=yes"; + description = '' + Extra config options for systemd user instances. See man systemd-user.conf for + available options. + ''; + }; + systemd.tmpfiles.rules = mkOption { type = types.listOf types.str; default = []; @@ -665,6 +675,11 @@ in ${config.systemd.extraConfig} ''; + "systemd/user.conf".text = '' + [Manager] + ${config.systemd.user.extraConfig} + ''; + "systemd/journald.conf".text = '' [Journal] RateLimitInterval=${config.services.journald.rateLimitInterval} From 85036f1428a67c477cfbec5857a10268bee5d994 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 9 Sep 2016 16:08:13 +0200 Subject: [PATCH 013/234] libyaml: 0.1.6 -> 0.1.7 --- pkgs/development/libraries/libyaml/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 667298922ca..e441d1e6b61 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,21 +1,15 @@ { stdenv, fetchurl, fetchpatch }: let - version = "0.1.6"; + version = "0.1.7"; in stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; - sha256 = "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx"; + sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; }; - patches = [(fetchpatch { - name = "CVE-2014-9130.diff"; - url = "http://bitbucket.org/xi/libyaml/commits/2b915675/raw/"; - sha256 = "1vrkga2wk060wccg61c2mj5prcyv181qikgdfi1z4hz8ygmpvl04"; - })]; - meta = with stdenv.lib; { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; From 37a61d357a7b8609f57f4f37d7c1d93cbadef6c8 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Sat, 10 Sep 2016 01:43:42 +0200 Subject: [PATCH 014/234] beets: add copyartifacts plugin --- .../audio/beets/copyartifacts-plugin.nix | 24 +++++++++++++++++++ pkgs/tools/audio/beets/default.nix | 6 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/audio/beets/copyartifacts-plugin.nix diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix new file mode 100644 index 00000000000..d3b36d15e03 --- /dev/null +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: + +buildPythonApplication rec { + name = "beets-copyartifacts"; + + src = fetchFromGitHub { + repo = "beets-copyartifacts"; + owner = "sbarakat"; + rev = "dac4a1605111e24bb5b498aa84cead7c87480834"; + sha256 = "0p5cskfgqinzh48a58hw56f96g9lar3k3g2p0ip1m9kawzf6axng"; + }; + + postPatch = '' + sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py + sed -i -e '/namespace_packages/d' setup.py + printf 'from pkgutil import extend_path\n__path__ = extend_path(__path__, __name__)\n' >beetsplug/__init__.py + ''; + + meta = { + description = "Beets plugin to move non-music files during the import process"; + homepage = "https://github.com/sbarakat/beets-copyartifacts"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 9dcfbd10b35..30e5aaa48dd 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -15,7 +15,8 @@ , enableWeb ? true # External plugins -, enableAlternatives ? false +, enableAlternatives ? false +, enableCopyArtifacts ? false , bashInteractive, bashCompletion }: @@ -104,6 +105,9 @@ in buildPythonApplication rec { ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; + }) + ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { + inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ From 328180bc2f27d9cec92f15f1726c111d0d5dc4a9 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Sat, 10 Sep 2016 01:44:10 +0200 Subject: [PATCH 015/234] beets: fix keyfinder plugin by addind keyfinder-cli dependency --- pkgs/tools/audio/beets/default.nix | 7 +++- .../audio/beets/keyfinder-default-bin.patch | 35 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/audio/beets/keyfinder-default-bin.patch diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 30e5aaa48dd..d7fb0e2aab4 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -8,6 +8,7 @@ , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true +, enableKeyfinder ? true, keyfinder-cli ? null , enableLastfm ? true , enableMpd ? true , enableReplaygain ? true, bs1770gain ? null @@ -26,6 +27,7 @@ assert enableBadfiles -> flac != null && mp3val != null; assert enableConvert -> ffmpeg != null; assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableFetchart -> pythonPackages.responses != null; +assert enableKeyfinder -> keyfinder-cli != null; assert enableLastfm -> pythonPackages.pylast != null; assert enableMpd -> pythonPackages.mpd != null; assert enableReplaygain -> bs1770gain != null; @@ -43,6 +45,7 @@ let discogs = enableDiscogs; embyupdate = enableEmbyupdate; fetchart = enableFetchart; + keyfinder = enableKeyfinder; lastgenre = enableLastfm; lastimport = enableLastfm; mpdstats = enableMpd; @@ -55,7 +58,7 @@ let pluginsWithoutDeps = [ "beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" "export" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "hook" "ihate" - "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics" + "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" @@ -99,6 +102,7 @@ in buildPythonApplication rec { pythonPackages.requests2 ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client + ++ optional enableKeyfinder keyfinder-cli ++ optional enableLastfm pythonPackages.pylast ++ optional enableMpd pythonPackages.mpd ++ optional enableThumbnails pythonPackages.pyxdg @@ -121,6 +125,7 @@ in buildPythonApplication rec { patches = [ ./replaygain-default-bs1770gain.patch + ./keyfinder-default-bin.patch ]; postPatch = '' diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch new file mode 100644 index 00000000000..b0b573bbf31 --- /dev/null +++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch @@ -0,0 +1,35 @@ +diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py +index b6131a4..b493792 100644 +--- a/beetsplug/keyfinder.py ++++ b/beetsplug/keyfinder.py +@@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin): + def __init__(self): + super(KeyFinderPlugin, self).__init__() + self.config.add({ +- u'bin': u'KeyFinder', ++ u'bin': u'keyfinder-cli', + u'auto': True, + u'overwrite': False, + }) +@@ -59,7 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): + continue + + try: +- output = util.command_output([bin, b'-f', ++ output = util.command_output([bin, + util.syspath(item.path)]) + except (subprocess.CalledProcessError, OSError) as exc: + self._log.error(u'execution failed: {0}', exc) +diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py +index 00952fe..01ff8d4 100644 +--- a/test/test_keyfinder.py ++++ b/test/test_keyfinder.py +@@ -46,7 +46,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): + item.load() + self.assertEqual(item['initial_key'], 'C#m') + self.command_output.assert_called_with( +- ['KeyFinder', '-f', util.syspath(item.path)]) ++ ['keyfinder-cli', util.syspath(item.path)]) + + def test_add_key_on_import(self): + self.command_output.return_value = 'dbm' From 2fa41249ceb8aee3ed8403d5d5bd04f414451106 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 10 Sep 2016 12:16:39 +0200 Subject: [PATCH 016/234] udiskie: move to all-packages This is an application, not a python library and should therefore be in its own package. --- pkgs/applications/misc/udiskie/default.nix | 43 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 45 +--------------------- 3 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 pkgs/applications/misc/udiskie/default.nix diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix new file mode 100644 index 00000000000..042401a727e --- /dev/null +++ b/pkgs/applications/misc/udiskie/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, asciidoc-full, gettext +, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify +, pythonPackages, udisks2, wrapGAppsHook }: + +pythonPackages.buildPythonApplication rec { + name = "udiskie-${version}"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "coldfix"; + repo = "udiskie"; + rev = version; + sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; + }; + + buildInputs = [ + asciidoc-full # For building man page. + hicolor_icon_theme + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt + pythonPackages.pygobject3 pythonPackages.pyyaml udisks2 + ]; + + postBuild = "make -C doc"; + + postInstall = '' + mkdir -p $out/share/man/man8 + cp -v doc/udiskie.8 $out/share/man/man8/ + ''; + + # tests require dbusmock + doCheck = false; + + meta = with stdenv.lib; { + description = "Removable disk automounter for udisks"; + license = licenses.mit; + homepage = https://github.com/coldfix/udiskie; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86fa34a3b43..edb3a0da39e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14672,6 +14672,8 @@ in udevil = callPackage ../applications/misc/udevil {}; + udiskie = callPackage ../applications/misc/udiskie { }; + sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b446708824d..02c2408ac63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27121,49 +27121,8 @@ in modules // { }; }; - udiskie = buildPythonApplication rec { - version = "1.5.1"; - name = "udiskie-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "coldfix"; - repo = "udiskie"; - rev = version; - sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; - }; - - preConfigure = '' - export XDG_RUNTIME_DIR=/tmp - ''; - - buildInputs = [ - pkgs.asciidoc-full # For building man page. - pkgs.hicolor_icon_theme - pkgs.wrapGAppsHook - ]; - - propagatedBuildInputs = with self; [ - pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 - pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt - ]; - - postBuild = "make -C doc"; - - postInstall = '' - mkdir -p $out/share/man/man8 - cp -v doc/udiskie.8 $out/share/man/man8/ - ''; - - # tests require dbusmock - doCheck = false; - - meta = { - description = "Removable disk automounter for udisks"; - license = licenses.mit; - homepage = https://github.com/coldfix/udiskie; - maintainers = with maintainers; [ AndersonTorres ]; - }; - }; + # For backwards compatibility. Please use nixpkgs.udiskie instead. + udiskie = pkgs.udiskie.override { pythonPackages = self; }; # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { From 2efaf6ff1fbbb85f3e1e8634bfc9b41f017134a6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 9 Sep 2016 16:08:37 +0200 Subject: [PATCH 017/234] pythonPackages.pyyaml: 3.11 -> 3.12 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 350843e3df7..4123c59fa49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20486,11 +20486,11 @@ in modules // { pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.11"; + name = "PyYAML-3.12"; src = pkgs.fetchurl { url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9"; + sha256 = "19s1lxi0idq4a0bpvld866pv5b16lqxypyswmsdi5ys4210jxj2s"; }; buildInputs = with self; [ pkgs.pyrex ]; From 5c6bcee944a3c03b0c0274a9e91e0c61b6bd5b33 Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Sat, 10 Sep 2016 13:45:40 +0000 Subject: [PATCH 018/234] Fix #18316 - Revert #14398, Using self prevent aliasing overriden packages. --- pkgs/top-level/all-packages.nix | 480 ++++++++++++++++---------------- 1 file changed, 242 insertions(+), 238 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c71bfcf6d1..28de419d837 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,7 +417,7 @@ in arcanist = callPackage ../development/tools/misc/arcanist {}; - arduino = self.arduino-core.override { withGui = true; }; + arduino = arduino-core.override { withGui = true; }; arduino-core = callPackage ../development/arduino/arduino-core { jdk = jdk; @@ -471,12 +471,12 @@ in amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (self.amule.override { + amuleDaemon = appendToName "daemon" (amule.override { monolithic = false; daemon = true; }); - amuleGui = appendToName "gui" (self.amule.override { + amuleGui = appendToName "gui" (amule.override { monolithic = false; client = true; }); @@ -521,9 +521,9 @@ in pkgs_i686 = pkgsi686Linux; }; - inherit (self.androidenv) androidsdk_4_4 androidndk; + inherit (androidenv) androidsdk_4_4 androidndk; - androidsdk = self.androidenv.androidsdk_6_0; + androidsdk = androidenv.androidsdk_6_0; androidsdk_extras = self.androidenv.androidsdk_6_0_extras; @@ -534,7 +534,7 @@ in aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; - aria = self.aria2; + aria = aria2; at = callPackage ../tools/system/at { }; @@ -662,15 +662,15 @@ in btfs = callPackage ../os-specific/linux/btfs { }; - cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: { + cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { isLibrary = false; enableSharedExecutables = false; - executableToolDepends = [ self.makeWrapper ]; + executableToolDepends = [ makeWrapper ]; postInstall = '' exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} install -D $out/bin/${drv.pname} $exe rm -rf $out/{bin,lib,share} - makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${self.nix-prefetch-scripts}/bin" + makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/bash-completion/completions $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} ''; @@ -924,12 +924,12 @@ in enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (self.asciidoc.override { + asciidoc-full = appendToName "full" (asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; }); - asciidoc-full-with-plugins = appendToName "full-with-plugins" (self.asciidoc.override { + asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; enableExtraPlugins = true; @@ -1032,9 +1032,9 @@ in mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; - libceph = self.ceph.lib; + libceph = ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; - ceph-dev = self.ceph; + ceph-dev = ceph; #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); cfdg = callPackage ../tools/graphics/cfdg { @@ -1066,7 +1066,7 @@ in gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; - clementineFree = self.clementine.free; + clementineFree = clementine.free; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -1236,15 +1236,15 @@ in cudatoolkit7 cudatoolkit75; - cudatoolkit = self.cudatoolkit7; + cudatoolkit = cudatoolkit7; cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; cudnn5_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-5.0 { - cudatoolkit = self.cudatoolkit75; + cudatoolkit = cudatoolkit75; }; - curlFull = self.curl.override { + curlFull = curl.override { idnSupport = true; ldapSupport = true; gssSupport = true; @@ -1810,17 +1810,17 @@ in gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; - gnupg1 = self.gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 + gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; gnupg21 = callPackage ../tools/security/gnupg/21.nix { }; - gnupg = self.gnupg21; + gnupg = gnupg21; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; - gnuplot_qt = self.gnuplot.override { withQt = true; }; + gnuplot_qt = gnuplot.override { withQt = true; }; # must have AquaTerm installed separately - gnuplot_aquaterm = self.gnuplot.override { aquaterm = true; }; + gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; gnused = callPackage ../tools/text/gnused { }; @@ -1909,15 +1909,15 @@ in trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; - grub2 = self.grub2_full; + grub2 = grub2_full; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = self.grub2_full.override { + grub2_efi = grub2_full.override { efiSupport = true; }; - grub2_light = self.grub2_full.override { + grub2_light = grub2_full.override { zfsSupport = false; }; @@ -2018,16 +2018,16 @@ in mpi = null; }; - hdf5-mpi = appendToName "mpi" (self.hdf5.override { + hdf5-mpi = appendToName "mpi" (hdf5.override { szip = null; mpi = pkgs.openmpi; }); - hdf5-cpp = appendToName "cpp" (self.hdf5.override { + hdf5-cpp = appendToName "cpp" (hdf5.override { cpp = true; }); - hdf5-fortran = appendToName "fortran" (self.hdf5.override { + hdf5-fortran = appendToName "fortran" (hdf5.override { inherit gfortran; }); @@ -2145,7 +2145,7 @@ in iperf2 = callPackage ../tools/networking/iperf/2.nix { }; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; - iperf = self.iperf3; + iperf = iperf3; ipfs = callPackage ../applications/networking/ipfs { }; @@ -2165,7 +2165,7 @@ in ised = callPackage ../tools/misc/ised {}; - isl = self.isl_0_15; + isl = isl_0_15; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; @@ -4215,7 +4215,7 @@ in }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; - libxfs = self.xfsprogs.dev; # outputs TODO + libxfs = xfsprogs.dev; # outputs TODO xml2 = callPackage ../tools/text/xml/xml2 { }; @@ -4410,7 +4410,7 @@ in clangUnwrapped = llvm: pkg: callPackage pkg { inherit llvm; }; - clangSelf = self.clangWrapSelf llvmPackagesSelf.clang; + clangSelf = clangWrapSelf llvmPackagesSelf.clang; clangWrapSelf = build: callPackage ../build-support/cc-wrapper { cc = build; @@ -4713,7 +4713,7 @@ in releaseType = "update"; sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; }; - gcc-arm-embedded = self.gcc-arm-embedded-5; + gcc-arm-embedded = gcc-arm-embedded-5; gforth = callPackage ../development/compilers/gforth {}; @@ -4727,7 +4727,7 @@ in overrides = config.haskellPackageOverrides or (self: super: {}); }; - inherit (self.haskellPackages) ghc; + inherit (haskellPackages) ghc; cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install; @@ -4772,7 +4772,7 @@ in stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; }); - go = self.go_1_7; + go = go_1_7; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -4790,7 +4790,7 @@ in jdk = jdk8; }; - icedtea_web = self.icedtea8_web; + icedtea_web = icedtea8_web; idrisPackages = callPackage ../development/idris-modules { inherit (haskellPackages) idris; @@ -4818,50 +4818,50 @@ in bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; }; - openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8; + openjdk = if stdenv.isDarwin then openjdk7 else openjdk8; - jdk7 = self.openjdk7 // { outputs = [ "out" ]; }; + jdk7 = openjdk7 // { outputs = [ "out" ]; }; jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (self.openjdk7.jre // { outputs = [ "jre" ]; })); + (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = self.openjdk8 // { outputs = [ "out" ]; }; + jdk8 = openjdk8 // { outputs = [ "out" ]; }; jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (self.openjdk8.jre // { outputs = [ "jre" ]; })); + (openjdk8.jre // { outputs = [ "jre" ]; })); - jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8; - jre = if stdenv.isDarwin then self.jre7 else self.jre8; + jdk = if stdenv.isDarwin then jdk7 else jdk8; + jre = if stdenv.isDarwin then jre7 else jre8; openshot-qt = callPackage ../applications/video/openshot-qt { }; - oraclejdk = self.jdkdistro true false; + oraclejdk = pkgs.jdkdistro true false; - oraclejdk7 = self.oraclejdk7distro true false; + oraclejdk7 = pkgs.oraclejdk7distro true false; - oraclejdk7psu = self.oraclejdk7psu_distro true false; + oraclejdk7psu = pkgs.oraclejdk7psu_distro true false; - oraclejdk8 = self.oraclejdk8distro true false; + oraclejdk8 = pkgs.oraclejdk8distro true false; - oraclejdk8psu = self.oraclejdk8psu_distro true false; + oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; - oraclejre = lowPrio (self.jdkdistro false false); + oraclejre = lowPrio (pkgs.jdkdistro false false); - oraclejre7 = lowPrio (self.oraclejdk7distro false false); + oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); - oraclejre7psu = lowPrio (self.oraclejdk7psu_distro false false); + oraclejre7psu = lowPrio (pkgs.oraclejdk7psu_distro false false); - oraclejre8 = lowPrio (self.oraclejdk8distro false false); + oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); - oraclejre8psu = lowPrio (self.oraclejdk8psu_distro false false); + oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); - jrePlugin = self.jre8Plugin; + jrePlugin = jre8Plugin; - jre6Plugin = lowPrio (self.jdkdistro false true); + jre6Plugin = lowPrio (pkgs.jdkdistro false true); - jre7Plugin = lowPrio (self.oraclejdk7distro false true); + jre7Plugin = lowPrio (pkgs.oraclejdk7distro false true); - jre8Plugin = lowPrio (self.oraclejdk8distro false true); + jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); supportsJDK = system == "i686-linux" || @@ -4917,17 +4917,17 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; - llvm = self.llvmPackages.llvm; + llvm = llvmPackages.llvm; - llvm_38 = self.llvmPackages_38.llvm; - llvm_37 = self.llvmPackages_37.llvm; - llvm_36 = self.llvmPackages_36.llvm; - llvm_35 = self.llvmPackages_35.llvm; - llvm_34 = self.llvmPackages_34.llvm; + llvm_38 = llvmPackages_38.llvm; + llvm_37 = llvmPackages_37.llvm; + llvm_36 = llvmPackages_36.llvm; + llvm_35 = llvmPackages_35.llvm; + llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs self.llvmPackages_37; + llvmPackages = recurseIntoAttrs llvmPackages_37; - llvmPackagesSelf = self.llvmPackages_34.override { + llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; }; @@ -5748,10 +5748,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; javacSupport = true; odbcSupport = true; }; - erlang = self.erlangR18; - erlang_odbc = self.erlangR18_odbc; - erlang_javac = self.erlangR18_javac; - erlang_odbc_javac = self.erlangR18_odbc_javac; + erlang = erlangR18; + erlang_odbc = erlangR18_odbc; + erlang_javac = erlangR18_javac; + erlang_odbc_javac = erlangR18_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; @@ -5775,7 +5775,7 @@ in guile_2_0 = callPackage ../development/interpreters/guile { }; - guile = self.guile_2_0; + guile = guile_2_0; hadoop = callPackage ../applications/networking/cluster/hadoop { }; @@ -5803,7 +5803,7 @@ in love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love = self.love_0_10; + love = love_0_10; ### LUA MODULES @@ -5818,22 +5818,22 @@ in lua5_3_compat = callPackage ../development/interpreters/lua-5/5.3.nix { compat = true; }; - lua5 = self.lua5_2_compat; - lua = self.lua5; + lua5 = lua5_2_compat; + lua = lua5; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); - luaPackages = self.lua52Packages; + luaPackages = lua52Packages; - lua5_1_sockets = self.lua51Packages.luasocket; + lua5_1_sockets = lua51Packages.luasocket; lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; luajit = callPackage ../development/interpreters/luajit {}; - luarocks = self.luaPackages.luarocks; + luarocks = luaPackages.luarocks; toluapp = callPackage ../development/tools/toluapp { lua = lua5_1; # doesn't work with any other :( @@ -6062,7 +6062,7 @@ in version = "2.8"; }; - amdappsdk = self.amdappsdk28; + amdappsdk = amdappsdk28; amdappsdkFull = callPackage ../development/misc/amdapp-sdk { version = "2.8"; @@ -6133,7 +6133,7 @@ in antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; - ant = self.apacheAnt; + ant = apacheAnt; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; @@ -6157,7 +6157,7 @@ in autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = self.automake115x; + automake = automake115x; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -6187,7 +6187,7 @@ in bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = if stdenv.isDarwin then self.darwin.binutils else self.binutils-raw; + binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw; binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; @@ -6205,7 +6205,7 @@ in bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; - bison = self.bison3; + bison = bison3; bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; @@ -6307,9 +6307,9 @@ in inherit (darwin) ps; }; - cmakeCurses = self.cmake.override { useNcurses = true; }; + cmakeCurses = cmake.override { useNcurses = true; }; - cmakeWithGui = self.cmakeCurses.override { useQt4 = true; }; + cmakeWithGui = cmakeCurses.override { useQt4 = true; }; # Does not actually depend on Qt 5 extra-cmake-modules = qt5.ecmNoHooks; @@ -6397,7 +6397,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - doxygen_gui = lowPrio (self.doxygen.override { inherit qt4; }); + doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); drush = callPackage ../development/tools/misc/drush { }; @@ -6460,11 +6460,11 @@ in gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; - gnumake3 = self.gnumake382; + gnumake3 = gnumake382; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = self.gnumake42; + gnumake = gnumake42; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); @@ -6551,7 +6551,7 @@ in lenmus = callPackage ../applications/misc/lenmus { }; - libtool = self.libtool_2; + libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -6814,7 +6814,7 @@ in inherit (gnu) mig; }; - gdbGuile = lowPrio (self.gdb.override { inherit guile; }); + gdbGuile = lowPrio (gdb.override { inherit guile; }); gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { target = crossSystem; @@ -6962,7 +6962,7 @@ in boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost = self.boost160; + boost = boost160; boost_process = callPackage ../development/libraries/boost-process { }; @@ -7043,7 +7043,7 @@ in clucene_core_1 = callPackage ../development/libraries/clucene-core { }; - clucene_core = self.clucene_core_1; + clucene_core = clucene_core_1; clutter = callPackage ../development/libraries/clutter { }; @@ -7134,15 +7134,15 @@ in # Make bdb5 the default as it is the last release under the custom # bsd-like license - db = self.db5; - db4 = self.db48; + db = db5; + db4 = db48; db44 = callPackage ../development/libraries/db/db-4.4.nix { }; db45 = callPackage ../development/libraries/db/db-4.5.nix { }; db47 = callPackage ../development/libraries/db/db-4.7.nix { }; db48 = callPackage ../development/libraries/db/db-4.8.nix { }; - db5 = self.db53; + db5 = db53; db53 = callPackage ../development/libraries/db/db-5.3.nix { }; - db6 = self.db60; + db6 = db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; dbus = callPackage ../development/libraries/dbus { }; @@ -7157,9 +7157,9 @@ in dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; # FIXME: deprecate these. - dbus_tools = self.dbus.out; - dbus_libs = self.dbus; - dbus_daemon = self.dbus.daemon; + dbus_tools = dbus.out; + dbus_libs = dbus; + dbus_daemon = dbus.daemon; dee = callPackage ../development/libraries/dee { }; @@ -7243,11 +7243,11 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases - ffmpeg_0 = self.ffmpeg_0_10; - ffmpeg_1 = self.ffmpeg_1_2; - ffmpeg_2 = self.ffmpeg_2_8; - ffmpeg_3 = self.ffmpeg_3_1; - ffmpeg = self.ffmpeg_3; + ffmpeg_0 = ffmpeg_0_10; + ffmpeg_1 = ffmpeg_1_2; + ffmpeg_2 = ffmpeg_2_8; + ffmpeg_3 = ffmpeg_3_1; + ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin @@ -7279,9 +7279,9 @@ in }; fftw = callPackage ../development/libraries/fftw { }; - fftwSinglePrec = self.fftw.override { precision = "single"; }; - fftwFloat = self.fftwSinglePrec; # the configure option is just an alias - fftwLongDouble = self.fftw.override { precision = "long-double"; }; + fftwSinglePrec = fftw.override { precision = "single"; }; + fftwFloat = fftwSinglePrec; # the configure option is just an alias + fftwLongDouble = fftw.override { precision = "long-double"; }; filter-audio = callPackage ../development/libraries/filter-audio {}; @@ -7334,7 +7334,7 @@ in funambol = callPackage ../development/libraries/funambol { }; - fam = self.gamin; + fam = gamin; gamin = callPackage ../development/libraries/gamin { }; @@ -7350,7 +7350,7 @@ in gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; gecode_4 = callPackage ../development/libraries/gecode { }; - gecode = self.gecode_4; + gecode = gecode_4; gephi = callPackage ../applications/science/misc/gephi { }; @@ -7364,7 +7364,7 @@ in geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; - geoipWithDatabase = self.geoip.override { + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; }; @@ -7413,7 +7413,7 @@ in inherit (darwin.apple_sdk.frameworks) AGL; }; - glfw = self.glfw3; + glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; @@ -7479,7 +7479,7 @@ in gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; - gmp = self.gmp6; + gmp = gmp6; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp @@ -7555,7 +7555,7 @@ in gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = self.gnutls34; + gnutls = gnutls34; gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { guileBindings = config.gnutls.guile or false; @@ -7598,7 +7598,7 @@ in gtkmathview = callPackage ../development/libraries/gtkmathview { }; glib = callPackage ../development/libraries/glib { }; - glib-tested = self.glib.override { # checked version separate to break cycles + glib-tested = glib.override { # checked version separate to break cycles doCheck = true; libffi = libffi.override { doCheck = true; }; }; @@ -7641,7 +7641,7 @@ in gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - gtk = self.gtk2; + gtk = pkgs.gtk2; gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; @@ -7662,7 +7662,7 @@ in libgnomeprintui GConf; }; - gtk-sharp = self.gtk-sharp-2_0; + gtk-sharp = gtk-sharp-2_0; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; @@ -7682,10 +7682,10 @@ in # TODO : Let admin choose. # We are using mit-krb5 because it is better maintained - kerberos = self.libkrb5; + kerberos = libkrb5; heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; - libheimdal = self.heimdalFull.override { type = "lib"; }; + libheimdal = heimdalFull.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz-icu = callPackage ../development/libraries/harfbuzz { @@ -7699,7 +7699,7 @@ in herqq = callPackage ../development/libraries/herqq { }; - heyefi = self.haskellPackages.heyefi; + heyefi = haskellPackages.heyefi; hidapi = callPackage ../development/libraries/hidapi { libusb = libusb1; @@ -7835,13 +7835,13 @@ in krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = self.krb5Full.override { type = "lib"; }; + libkrb5 = krb5Full.override { type = "lib"; }; lasso = callPackage ../development/libraries/lasso { }; LASzip = callPackage ../development/libraries/LASzip { }; - lcms = self.lcms1; + lcms = lcms1; lcms1 = callPackage ../development/libraries/lcms { }; @@ -7901,8 +7901,9 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; - libav = self.libav_11; # branch 11 is API-compatible with branch 10 - inherit (callPackages ../development/libraries/libav { }) libav_0_8 libav_11; + libav = libav_11; # branch 11 is API-compatible with branch 10 + libav_all = callPackage ../development/libraries/libav { }; + inherit (libav_all) libav_0_8 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -7923,10 +7924,10 @@ in libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; - libcanberra_gtk3 = self.libcanberra.override { gtk = gtk3; }; + libcanberra_gtk3 = libcanberra.override { gtk = gtk3; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) - then self.libcanberra.override { gtk = null; } - else self.libcanberra; + then libcanberra.override { gtk = null; } + else libcanberra; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -8001,7 +8002,7 @@ in sqlite = null; }; - libdbiDrivers = self.libdbiDriversBase.override { + libdbiDrivers = libdbiDriversBase.override { inherit sqlite libmysql; }; @@ -8019,7 +8020,7 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - libdevil-nox = self.libdevil.override { + libdevil-nox = libdevil.override { libX11 = null; mesa = null; }; @@ -8120,7 +8121,7 @@ in liblo = callPackage ../development/libraries/liblo { }; - liblrdf = self.librdf; + liblrdf = librdf; liblscp = callPackage ../development/libraries/liblscp { }; @@ -8341,7 +8342,7 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; - libjpeg = if stdenv.isLinux then self.libjpeg_turbo else self.libjpeg_original; # some problems, both on FreeBSD and Darwin + libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -8411,7 +8412,7 @@ in libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - libmusicbrainz = self.libmusicbrainz3; + libmusicbrainz = libmusicbrainz3; libmwaw = callPackage ../development/libraries/libmwaw { }; @@ -8480,7 +8481,7 @@ in libpgf = callPackage ../development/libraries/libpgf { }; libpng = callPackage ../development/libraries/libpng { }; - libpng_apng = self.libpng.override { apngSupport = true; }; + libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; libpaper = callPackage ../development/libraries/libpaper { }; @@ -8609,7 +8610,7 @@ in libupnp = callPackage ../development/libraries/pupnp { }; - giflib = self.giflib_5_1; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; @@ -8641,7 +8642,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libv4l = lowPrio (self.v4l_utils.override { + libv4l = lowPrio (v4l_utils.override { alsaLib = null; libX11 = null; qt4 = null; @@ -8680,7 +8681,7 @@ in libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = self.libwnck2; + libwnck = libwnck2; libwnck2 = callPackage ../development/libraries/libwnck { }; libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; @@ -8707,12 +8708,12 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky name = "libxml2+py-${self.libxml2.version}"; - paths = with self.libxml2; [ dev bin py ]; - inherit (self.libxml2) passthru; + paths = with libxml2; [ dev bin py ]; + inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv postBuild = '' mkdir "$out/nix-support" - cp '${self.libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/" + cp '${libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/" ''; }; @@ -9025,7 +9026,7 @@ in openslp = callPackage ../development/libraries/openslp {}; - libressl = self.libressl_2_4; + libressl = libressl_2_4; libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { fetchurl = fetchurlBoot; }; @@ -9185,7 +9186,7 @@ in libpng = libpng12; }; - qt4 = self.kde4.qt4; + qt4 = pkgs.kde4.qt4; qt4_clang = lowPrio (self.qt4.override { stdenv = clangStdenv; }); @@ -9232,7 +9233,7 @@ in let imported = import ../development/libraries/qt-5/5.7 { inherit pkgs; }; in recurseIntoAttrs (imported.override (super: qt5LibsFun)); - qt5 = self.qt56; + qt5 = qt56; qt5ct = qt5.callPackage ../tools/misc/qt5ct { }; @@ -10225,7 +10226,7 @@ in rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = self.apacheHttpd_2_4; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; @@ -10268,7 +10269,7 @@ in cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra = self.cassandra_3_0; + cassandra = cassandra_3_0; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jdk; @@ -10278,7 +10279,7 @@ in java = jdk; }; - fuseki = self.apache-jena-fuseki; + fuseki = apache-jena-fuseki; apcupsd = callPackage ../servers/apcupsd { }; @@ -10849,7 +10850,7 @@ in atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; - libaudit = self.audit; + libaudit = audit; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; @@ -10866,7 +10867,7 @@ in # Needed for LibreOffice bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); - bluez = self.bluez5; + bluez = bluez5; inherit (pythonPackages) bedup; @@ -10946,7 +10947,7 @@ in stubs = callPackages ../os-specific/darwin/stubs {}; }; - devicemapper = self.lvm2; + devicemapper = lvm2; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; @@ -10995,7 +10996,7 @@ in ebtables = callPackage ../os-specific/linux/ebtables { }; - eject = self.utillinux; + eject = utillinux; facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; @@ -11008,7 +11009,7 @@ in ffadoFull = callPackage ../os-specific/linux/ffado { inherit (pythonPackages) python pyqt4 dbus-python; }; - libffado = self.ffadoFull.override { prefix = "lib"; }; + libffado = ffadoFull.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -11036,7 +11037,7 @@ in ncurses = null; # Keep curses disabled for lack of value }; - gpm-ncurses = self.gpm.override { inherit ncurses; }; + gpm-ncurses = gpm.override { inherit ncurses; }; gradm = callPackage ../os-specific/linux/gradm { flex = flex_2_5_35; @@ -11129,7 +11130,7 @@ in # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders = self.linuxHeaders_4_4; + linuxHeaders = linuxHeaders_4_4; linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix { cross = assert crossSystem != null; crossSystem; @@ -11144,12 +11145,12 @@ in linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; # We can choose: - linuxHeadersCrossChooser = ver : if ver == "2.4" then self.linuxHeaders24Cross - else if ver == "2.6" then self.linuxHeaders26Cross + linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross + else if ver == "2.6" then linuxHeaders26Cross else throw "Unknown linux kernel version"; linuxHeadersCross = assert crossSystem != null; - self.linuxHeadersCrossChooser crossSystem.platform.kernelMajor; + linuxHeadersCrossChooser crossSystem.platform.kernelMajor; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -11284,7 +11285,7 @@ in ]; }; - linux_chromiumos_latest = self.linux_chromiumos_3_18; + linux_chromiumos_latest = linux_chromiumos_3_18; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -11415,38 +11416,38 @@ in }; # The current default kernel / kernel modules. - linuxPackages = self.linuxPackages_4_4; - linux = self.linuxPackages.kernel; + linuxPackages = linuxPackages_4_4; + linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_7; - linux_latest = self.linuxPackages_latest.kernel; + linuxPackages_latest = linuxPackages_4_7; + linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. - linuxPackages_mptcp = self.linuxPackagesFor self.linux_mptcp linuxPackages_mptcp; - linuxPackages_rpi = self.linuxPackagesFor self.linux_rpi linuxPackages_rpi; - linuxPackages_3_10 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_10 linuxPackages_3_10); - linuxPackages_3_10_tuxonice = self.linuxPackagesFor self.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; - linuxPackages_3_12 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_12 linuxPackages_3_12); - linuxPackages_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_14 linuxPackages_3_14); - linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18); - linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1); - linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); - linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); - linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp linuxPackages_mptcp; + linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi; + linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); + linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; + linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); + linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); + linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); + linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); + linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); + linuxPackages_4_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_6 linuxPackages_4_6); + linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7 linuxPackages_4_7); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. - linuxPackages_testing = self.linuxPackagesFor self.linux_testing linuxPackages_testing; + linuxPackages_testing = linuxPackagesFor pkgs.linux_testing linuxPackages_testing; linuxPackages_custom = {version, src, configfile}: - let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; - allowImportFromDerivation=true;}) + let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; + allowImportFromDerivation=true;}) linuxPackages_self); in recurseIntoAttrs linuxPackages_self; # Build a kernel for Xen dom0 - linuxPackages_latest_xen_dom0 = recurseIntoAttrs (self.linuxPackagesFor (self.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); # Grsecurity packages @@ -11483,9 +11484,9 @@ in }; # ChromiumOS kernels - linuxPackages_chromiumos_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); - linuxPackages_chromiumos_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); - linuxPackages_chromiumos_latest = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_latest linuxPackages_chromiumos_latest); + linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); + linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); + linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest linuxPackages_chromiumos_latest); # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; @@ -11725,8 +11726,8 @@ in }; # Provided with sysfsutils. - libsysfs = self.sysfsutils; - systool = self.sysfsutils; + libsysfs = sysfsutils; + systool = sysfsutils; sysklogd = callPackage ../os-specific/linux/sysklogd { }; @@ -12001,9 +12002,9 @@ in docbook_xsl docbook_xsl_ns; - docbook_xml_xslt = self.docbook_xsl; + docbook_xml_xslt = docbook_xsl; - docbook5_xsl = self.docbook_xsl_ns; + docbook5_xsl = docbook_xsl_ns; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; @@ -12076,7 +12077,7 @@ in liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; - liberation_ttf = self.liberation_ttf_binary; + liberation_ttf = liberation_ttf_binary; liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { }; @@ -12354,7 +12355,7 @@ in ao = callPackage ../applications/graphics/ao {}; - ardour = self.ardour4; + ardour = ardour4; ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { inherit (gnome) libgnomecanvas libgnomecanvasmm; @@ -12395,8 +12396,8 @@ in altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { callPackage = newScope { boost = boost155; }; } ); - bitcoin = self.altcoins.bitcoin; - bitcoin-xt = self.altcoins.bitcoin-xt; + bitcoin = altcoins.bitcoin; + bitcoin-xt = altcoins.bitcoin-xt; go-ethereum = self.altcoins.go-ethereum; ethabi = self.altcoins.ethabi; @@ -12432,7 +12433,7 @@ in cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; }; - awesome = self.awesome-3-5; + awesome = awesome-3-5; awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; @@ -12442,7 +12443,7 @@ in backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; - backintime = self.backintime-qt4; + backintime = backintime-qt4; bandwidth = callPackage ../tools/misc/bandwidth { }; @@ -12559,7 +12560,7 @@ in inherit (darwin) IOKit; }; - cdparanoia = self.cdparanoiaIII; + cdparanoia = cdparanoiaIII; cdparanoiaIII = callPackage ../applications/audio/cdparanoia { inherit (darwin) IOKit; @@ -12594,9 +12595,9 @@ in chronos = callPackage ../applications/networking/cluster/chronos { }; - chromiumBeta = lowPrio (self.chromium.override { channel = "beta"; }); + chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - chromiumDev = lowPrio (self.chromium.override { channel = "dev"; }); + chromiumDev = lowPrio (chromium.override { channel = "dev"; }); chuck = callPackage ../applications/audio/chuck { }; @@ -12655,7 +12656,7 @@ in comical = callPackage ../applications/graphics/comical { }; conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; - conkeror = self.wrapFirefox conkeror-unwrapped { }; + conkeror = wrapFirefox conkeror-unwrapped { }; cpp_ethereum = callPackage ../applications/misc/webthree-umbrella { withOpenCL = true; @@ -12747,7 +12748,7 @@ in djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; djview = callPackage ../applications/graphics/djview { }; - djview4 = self.djview; + djview4 = pkgs.djview; dmenu = callPackage ../applications/misc/dmenu { }; @@ -12755,9 +12756,10 @@ in dmenu2 = callPackage ../applications/misc/dmenu2 { }; - dmtx = self.dmtx-utils; + dmtx = dmtx-utils; - dmtx-utils = callPackage ../tools/graphics/dmtx-utils { }; + dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { + }; docker = callPackage ../applications/virtualization/docker { btrfs-progs = btrfs-progs_4_4_1; @@ -12812,10 +12814,10 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = self.emacs24; - emacsPackages = self.emacs24Packages; - emacsPackagesNg = self.emacs24PackagesNg; - emacsMelpa = self.emacs24PackagesNg; # for backward compatibility + emacs = emacs24; + emacsPackages = emacs24Packages; + emacsPackagesNg = emacs24PackagesNg; + emacsMelpa = emacs24PackagesNg; # for backward compatibility emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features @@ -12829,7 +12831,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; }; - emacs24-nox = lowPrio (appendToName "nox" (self.emacs24.override { + emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { withX = false; withGTK2 = false; withGTK3 = false; @@ -13212,8 +13214,8 @@ in enableGTK3 = false; }) firefox-unwrapped firefox-esr-unwrapped; - firefox = self.wrapFirefox firefox-unwrapped { }; - firefox-esr = self.wrapFirefox firefox-esr-unwrapped { }; + firefox = wrapFirefox firefox-unwrapped { }; + firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; @@ -13221,7 +13223,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-bin = self.wrapFirefox firefox-bin-unwrapped { + firefox-bin = wrapFirefox firefox-bin-unwrapped { browserName = "firefox"; name = "firefox-bin-" + (builtins.parseDrvName firefox-bin-unwrapped.name).version; @@ -13252,9 +13254,9 @@ in debug = config.flashplayer.debug or false; }; - flashplayer-standalone = self.pkgsi686Linux.flashplayer.sa; + flashplayer-standalone = pkgsi686Linux.flashplayer.sa; - flashplayer-standalone-debugger = (self.pkgsi686Linux.flashplayer.override { debug = true; }).sa; + flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa; fluxbox = callPackage ../applications/window-managers/fluxbox { }; @@ -13305,7 +13307,7 @@ in wrapPython = pythonPackages.wrapPython; }; - gimp = self.gimp_2_8; + gimp = gimp_2_8; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { gimp = gimp_2_8; @@ -13326,7 +13328,7 @@ in gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (self.gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; gitMinimal = git.override { withManual = false; @@ -13467,9 +13469,9 @@ in google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; - google-chrome-beta = self.google-chrome.override { channel = "beta"; }; + google-chrome-beta = google-chrome.override { channel = "beta"; }; - google-chrome-dev = self.google-chrome.override { channel = "dev"; }; + google-chrome-dev = google-chrome.override { channel = "dev"; }; googleearth = callPackage_i686 ../applications/misc/googleearth { }; @@ -13611,7 +13613,7 @@ in inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; - imagemagick_light = self.imagemagick.override { + imagemagick_light = imagemagick.override { bzip2 = null; zlib = null; libX11 = null; @@ -13631,7 +13633,7 @@ in libwebp = null; }; - imagemagick = self.imagemagickBig.override { + imagemagick = imagemagickBig.override { ghostscript = null; }; @@ -13687,7 +13689,7 @@ in jackmeter = callPackage ../applications/audio/jackmeter { }; jackmix = callPackage ../applications/audio/jackmix { }; - jackmix_jack1 = self.jackmix.override { jack = jack1; }; + jackmix_jack1 = jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { }; @@ -13822,7 +13824,7 @@ in libowfat = callPackage ../development/libraries/libowfat { }; librecad = callPackage ../applications/misc/librecad { }; - librecad2 = self.librecad; # backwards compatibility alias, added 2015-10 + librecad2 = librecad; # backwards compatibility alias, added 2015-10 libreoffice = hiPrio libreoffice-still; @@ -13877,7 +13879,7 @@ in ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger { }; - ledger = self.ledger3; + ledger = ledger3; ledger-web = callPackage ../applications/office/ledger-web { }; lighthouse = callPackage ../applications/misc/lighthouse { }; @@ -14786,7 +14788,7 @@ in sxiv = callPackage ../applications/graphics/sxiv { }; - bittorrentSync = self.bittorrentSync14; + bittorrentSync = bittorrentSync14; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; @@ -14799,7 +14801,7 @@ in withQt5 = false; }; - lightdm_qt = self.lightdm.override { withQt5 = true; }; + lightdm_qt = lightdm.override { withQt5 = true; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; @@ -15411,23 +15413,23 @@ in }; kodiPlain = callPackage ../applications/video/kodi { }; - xbmcPlain = self.kodiPlain; + xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { kodi = kodiPlain; }); - xbmcPlugins = self.kodiPlugins; + xbmcPlugins = kodiPlugins; - kodi = self.wrapKodi { + kodi = wrapKodi { kodi = kodiPlain; }; - xbmc = self.kodi; + xbmc = kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; }; - xbmc-retroarch-advanced-launchers = self.kodi-retroarch-advanced-launchers; + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; xca = callPackage ../applications/misc/xca { }; @@ -15723,16 +15725,16 @@ in freeglut = null; }); - construo = self.construoBase.override { + construo = construoBase.override { inherit mesa freeglut; }; crack_attack = callPackage ../games/crack-attack { }; crafty = callPackage ../games/crafty { }; - craftyFull = appendToName "full" (self.crafty.override { fullVariant = true; }); + craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); - crawlTiles = self.crawl.override { + crawlTiles = crawl.override { tileMode = true; }; @@ -15749,8 +15751,10 @@ in duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); - inherit (self.dwarf-fortress-packages) - dwarf-fortress dwarf-therapist; + + dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { }; + + dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -16256,15 +16260,15 @@ in gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); - gnome3 = self.gnome3_20; + gnome3 = gnome3_20; - gnome = recurseIntoAttrs self.gnome2; + gnome = recurseIntoAttrs gnome2; hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs self.kde414; + kde4 = recurseIntoAttrs pkgs.kde414; kde414 = kdePackagesFor @@ -16591,7 +16595,7 @@ in withLapack = false; }; - atlasWithLapack = self.atlas.override { withLapack = true; }; + atlasWithLapack = atlas.override { withLapack = true; }; blas = callPackage ../development/libraries/science/math/blas { }; @@ -16608,11 +16612,11 @@ in # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; - liblapackWithoutAtlas = self.liblapackWithAtlas.override { atlas = null; }; + liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = self.liblapack_3_5_0WithAtlas.override { atlas = null; }; - liblapack = self.liblapackWithAtlas; - liblapack_3_5_0 = self.liblapack_3_5_0WithAtlas; + liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; + liblapack = liblapackWithAtlas; + liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -16907,7 +16911,7 @@ in z3 = callPackage ../applications/science/logic/z3 {}; z3_opt = callPackage ../applications/science/logic/z3_opt {}; - boolector = self.boolector15; + boolector = boolector15; boolector15 = callPackage ../applications/science/logic/boolector {}; boolector16 = lowPrio (callPackage ../applications/science/logic/boolector { useV16 = true; @@ -17118,7 +17122,7 @@ in enableAllFeatures = false; }; - dblatexFull = appendToName "full" (self.dblatex.override { + dblatexFull = appendToName "full" (dblatex.override { enableAllFeatures = true; }); @@ -17138,7 +17142,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = self.faust2; + faust = faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -17191,7 +17195,7 @@ in cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); }; - ghostscriptX = appendToName "with-X" (self.ghostscript.override { + ghostscriptX = appendToName "with-X" (ghostscript.override { x11Support = true; }); @@ -17217,11 +17221,11 @@ in hplip = callPackage ../misc/drivers/hplip { }; - hplipWithPlugin = self.hplip.override { withPlugin = true; }; + hplipWithPlugin = hplip.override { withPlugin = true; }; hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; - hplipWithPlugin_3_15_9 = self.hplip_3_15_9.override { withPlugin = true; }; + hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -17229,7 +17233,7 @@ in jack2Full = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; }; - libjack2 = self.jack2Full.override { prefix = "lib"; }; + libjack2 = jack2Full.override { prefix = "lib"; }; libjack2-git = callPackage ../misc/jackaudio/git.nix { }; keynav = callPackage ../tools/X11/keynav { }; @@ -17505,7 +17509,7 @@ in }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; - inherit (self.kde4) rekonq; + inherit (kde4) rekonq; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; From 0628215f9e53306972c92106e2746272ff997bf9 Mon Sep 17 00:00:00 2001 From: aske Date: Sat, 10 Sep 2016 20:18:39 +0300 Subject: [PATCH 019/234] linuxPackages.mba6x_bl: 2016-02-12 -> 2016-04-22 --- pkgs/os-specific/linux/mba6x_bl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 2a0e53b3925..350915c55b5 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -6,13 +6,14 @@ let pkgName = "mba6x_bl"; in stdenv.mkDerivation rec { - name = "${pkgName}-2016-02-12"; + name = "${pkgName}-${version}"; + version = "2016-04-22"; src = fetchFromGitHub { owner = "patjak"; repo = pkgName; - rev = "9c2de8a24e7d4e8506170a19d32d6f11f380a142"; - sha256 = "1zaypai8lznqcaszb6an643amsvr5qjnqj6aq6jkr0qk37x0fjff"; + rev = "d05c125efe182376ddab30d486994ec00e144650"; + sha256 = "15h90z3ijq4lv37nmx70xqggcvn21vr7mki2psk1jyj88in3j3xn"; }; enableParallelBuilding = true; From ffc3e24e0bb457b85c98647d9b5128626f02ea05 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:43:18 -0400 Subject: [PATCH 020/234] cua-mode: md5->sha256 --- pkgs/applications/editors/emacs-modes/cua/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix index a03c6447622..0305be28ad6 100644 --- a/pkgs/applications/editors/emacs-modes/cua/default.nix +++ b/pkgs/applications/editors/emacs-modes/cua/default.nix @@ -3,6 +3,6 @@ builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/cua-mode-2.10.el; - md5 = "5bf5e43f5f38c8383868c7c6c5baca09"; + sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b"; }; } From ce44f8df5cc1643647ee17bf873c5a975b1f3114 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:46:06 -0400 Subject: [PATCH 021/234] batik: md5->sha256 --- pkgs/applications/graphics/batik/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 3c121211e3f..a27590ccd4d 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/batik-1.6.zip; - md5 = "edff288fc64f968ff96ca49763d50f3c"; + sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6"; }; buildInputs = [unzip]; From df3bd28097b12308f32d1eace70e62948f07c160 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:46:49 -0400 Subject: [PATCH 022/234] docbook-ebnf: md5->sha256 --- pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index 0df76cd2876..e9ff03f7843 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { builder = ./builder.sh; dtd = fetchurl { url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; - md5 = "e50f7d38caf4285965c7a247e026fa7c"; + sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; From 2b7a9a8d7381d3d38ab746c4c12d93aadcab79c3 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:47:23 -0400 Subject: [PATCH 023/234] docbook 4.3: md5->sha256 --- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 478dd68e8bb..19ad49aa928 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -5,7 +5,7 @@ import ./generic.nix { name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; - md5 = "ab200202b9e136a144db1e0864c45074"; + sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"; }; meta = { branch = "4.3"; From e417a63e6119a4d6bd96cc664607137e25d7aec8 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:50:10 -0400 Subject: [PATCH 024/234] scilab: md5->sha256 --- pkgs/applications/science/math/scilab/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 8482bd6fe94..d6170f8f58e 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { name = "scilab-${version}"; src = fetchurl { url = "http://www.scilab.org/download/${version}/${name}-src.tar.gz"; - # md5 coming from http://www.scilab.org/download/index_download.php - md5 = "17a7a6aa52918f33d96777a0dc423658"; + sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; buildInputs = [gfortran ncurses] From f7c0a9c9ccbe8fe36cbcd9aaae72db8e5266d845 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:51:20 -0400 Subject: [PATCH 025/234] kdesvn: md5->sha256 --- pkgs/applications/version-management/kdesvn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index a3301d8acff..d4c67776b52 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { name = "kdesvn-1.6.0"; src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2"; - md5 = "7e6adc98ff4777a06d5752d3f2b58fa3"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/7e6adc98ff4777a06d5752d3f2b58fa3/${name}.tar.bz2"; + sha256 = "15hg6xyx5rqldfhi1yhq5ss15y6crm2is3zqm680z0bndcj6ys05"; }; prePatch = '' From 6f32f2cc25cea502e16e0baecae2e1de753abaf5 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:56:04 -0400 Subject: [PATCH 026/234] ocaml 3.08.0: md5->sha256 --- pkgs/development/compilers/ocaml/3.08.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index fd684fd93e8..3b0ab46bcd5 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/ocaml-3.08.0.tar.gz; - md5 = "c6ef478362295c150101cdd2efcd38e0"; + sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx"; }; configureScript = ./configure-3.08.0; dontAddPrefix = "True"; From c9d609d0e2dd8fd6293120b3200287af1c2e690a Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 13:57:03 -0400 Subject: [PATCH 027/234] lua-4: md5->sha256 --- pkgs/development/interpreters/lua-4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index d6f385f5b50..a89f4b1e5d7 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.lua.org/ftp/lua-4.0.1.tar.gz; - md5 = "a31d963dbdf727f9b34eee1e0d29132c"; + sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z"; }; configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config"; From 5ee369902fd44c1f3f223f98b693a307ec4604f0 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 14:03:58 -0400 Subject: [PATCH 028/234] pythonPackages.breathe: md5->sha256 --- pkgs/development/python-modules/breathe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index bf53d330245..6e86235cf23 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - md5 = "e35f6ce54485663857129370047f6057"; + sha256 = "0m3w8yx24nm01xxx6aj08cklnifwlzzmczc5b0ni40l63lhvm3lp"; }; propagatedBuildInputs = [ docutils six sphinx ]; From 316f5e86088b0cb291f8a3c26e6c72d6e9bba419 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 14:04:49 -0400 Subject: [PATCH 029/234] pythonPackages.rhpl: md5->sha256 --- pkgs/development/python-modules/rhpl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index ee1d0ec1738..7ba1c79cd05 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; - md5 = "a72c6b66df782ca1d4950959d2aad292"; + sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16"; }; inherit python; From 5a3560fecf87da478afea4269d46dc4e345c675a Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 14:06:13 -0400 Subject: [PATCH 030/234] gnumake-3.80: md5->sha256 --- pkgs/development/tools/build-managers/gnumake/3.80/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix index 08dd0acb42b..ad855df7353 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tarballs.nixos.org/make-3.80.tar.bz2; - md5 = "0bbd1df101bc0294d440471e50feca71"; + sha256 = "06rgz6npynr8whmf7rxgkyvcz0clf3ggwf4cyhj3fcscn3kkk6x9"; }; patches = [./log.patch]; From d1e23ed8ed309f90ee8a30657db35ca9c86e5d2b Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 10 Sep 2016 14:08:26 -0400 Subject: [PATCH 031/234] mk: md5->sha256 --- pkgs/development/tools/build-managers/mk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 98ddd9d34e9..f510752d385 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "mk-2006-01-31"; src = fetchurl { url = http://tarballs.nixos.org/mk-20060131.tar.gz; - md5 = "167fd4e0eea4f49def01984ec203289b"; + sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr"; }; builder = ./builder.sh; From e9342310297beb705d3bcf5caf1ad9a4ac59f392 Mon Sep 17 00:00:00 2001 From: Tom von Schwerdtner Date: Sat, 10 Sep 2016 17:41:40 -0400 Subject: [PATCH 032/234] gocd-server: add startupOptions, empty extraOptions The extraOptions option has default values which seems surprising. This moves those values to startupOptions (which is what gocd-agent uses) and empties out the default extraOptions. The gocd-agent startupOptions description was also changed to remove the mention of the example (given there isn't one). --- .../continuous-integration/gocd-agent/default.nix | 2 +- .../continuous-integration/gocd-server/default.nix | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 21f319f7fcf..d60b55e83d1 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -98,7 +98,7 @@ in { ]; description = '' Specifies startup command line arguments to pass to Go.CD agent - java process. Example contains debug and gcLog arguments. + java process. ''; }; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 2d198630121..4bb792055d2 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -90,7 +90,7 @@ in { ''; }; - extraOptions = mkOption { + startupOptions = mkOption { default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -103,6 +103,15 @@ in { "-Dcruise.server.port=${toString cfg.port}" "-Dcruise.server.ssl.port=${toString cfg.sslPort}" ]; + + description = '' + Specifies startup command line arguments to pass to Go.CD server + java process. + ''; + }; + + extraOptions = mkOption { + default = [ ]; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" @@ -169,7 +178,8 @@ in { script = '' ${pkgs.git}/bin/git config --global --add http.sslCAinfo /etc/ssl/certs/ca-certificates.crt - ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.extraOptions} \ + ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.startupOptions} \ + ${concatStringsSep " " cfg.extraOptions} \ -jar ${pkgs.gocd-server}/go-server/go.jar ''; From 18f26f35632858a671b0d0185e133ab1157d05f4 Mon Sep 17 00:00:00 2001 From: Tom von Schwerdtner Date: Sat, 10 Sep 2016 18:19:58 -0400 Subject: [PATCH 033/234] gocd-server: 16.7.0-3819 -> 16.9.0-4001 --- .../tools/continuous-integration/gocd-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 474bcba6c71..8982ca5f77a 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-server-${version}-${rev}"; - version = "16.7.0"; - rev = "3819"; + version = "16.9.0"; + rev = "4001"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; - sha256 = "3fae89741726eac69adab8dd64cd18918343188eeb43496e88d4f3abbe0998ad"; + sha256 = "0x5pmjbhrka6p27drkrca7872vgsjxaa5j0cbxsa2ds02wrn57a7"; }; meta = with stdenv.lib; { From 9a2f40c024cc1d88bf3db59f24cbb336c457d7aa Mon Sep 17 00:00:00 2001 From: Tom von Schwerdtner Date: Sat, 10 Sep 2016 18:24:31 -0400 Subject: [PATCH 034/234] gocd-agent: 16.7.0-3819 -> 16.9.0-4001 --- .../tools/continuous-integration/gocd-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index e252362a059..cdc4e6db2c2 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-agent-${version}-${rev}"; - version = "16.7.0"; - rev = "3819"; + version = "16.9.0"; + rev = "4001"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; - sha256 = "24cc47099d2e9cc1d3983e1ab65957316770f791632e572189b1e6c0183403b7"; + sha256 = "1xcwwjf2khhng6v1y7dvi579y2j643al9n0x80m0c46qb9mzd04x"; }; meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; From 4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 11 Sep 2016 16:47:48 +0200 Subject: [PATCH 035/234] nixos/modules/rename: Remove docker-registry This is a follow-up to 9c1cdedcba2fd5233c71f0988d2eb725cc8f32ad and fed3501b0722e187284f9f6e1532f5b6e0572d6e. Discussion: https://github.com/NixOS/nixpkgs/issues/18209#issuecomment-245968857 Signed-off-by: aszlig Cc: @domenkozar Issue: #18209 --- nixos/modules/rename.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 412cccc20d5..34b9724442e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -15,7 +15,6 @@ with lib; (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) - (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ]) (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) @@ -154,5 +153,7 @@ with lib; "See the 16.03 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") + (mkRemovedOptionModule [ "services" "dockerRegistry" ] + "docker-registry has been deprecated upstream since a long time.") ]; } From 70e4eab55b103207e42ae252ecd2683d7d9406eb Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 11 Sep 2016 16:17:57 +0100 Subject: [PATCH 036/234] steam: Some games use Mono --- pkgs/games/steam/chrootenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9a766455055..8c86371ecab 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -51,6 +51,7 @@ in buildFHSUserEnv rec { gst_all_1.gstreamer gst_all_1.gst-plugins-ugly libdrm + mono (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; From b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 11 Sep 2016 17:27:07 +0200 Subject: [PATCH 037/234] nixos/lib/testing: Fix unsetting $xchg Regression introduced by 4dcb685af940efd74a7b2b66ae917129ef232d83. Unsetting the environment variable shortly before using it is not going to end up very well, so let's just filter out the variable from the output of export and unset it shortly afterwards. This fixes the runInMachine NixOS test. Signed-off-by: aszlig --- nixos/lib/testing.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 109959cd512..7fad5cbc3cd 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -181,9 +181,11 @@ rec { eval $i2=/tmp/xchg/$_basename ${coreutils}/bin/ls -la $xchg done - unset i i2 _basename xchg - export > $xchg/saved-env + unset i i2 _basename + export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env + unset xchg + export tests='${testScript}' ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ From 272c59a75bb6aefc24775c3b8867e432248a439b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Sep 2016 20:21:40 +0200 Subject: [PATCH 038/234] go_1_7: 1.7 -> 1.7.1 --- pkgs/development/compilers/go/1.7.nix | 4 ++-- pkgs/development/compilers/go/remove-tools-1.7.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index bc298924eb8..d623d800bd7 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2"; + sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch index b2e380f34fc..b53e48e1a51 100644 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ b/pkgs/development/compilers/go/remove-tools-1.7.patch @@ -1,8 +1,8 @@ diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 +index 9706b8b..f250751 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { +@@ -1513,7 +1513,7 @@ func init() { } // ToolDir is the directory containing build tools. @@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644 // IsLocalImport reports whether the import path is // a local import path, like ".", "..", "./foo", or "../foo". diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 +index 441dcd9..a50277e 100644 --- a/src/runtime/extern.go +++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot +@@ -230,6 +230,17 @@ func GOROOT() string { + return sys.DefaultGoroot } +// GOTOOLDIR returns the root of the Go tree. From e917e470452391b033a6b65532a225dd72fe86fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 11 Sep 2016 20:38:20 +0200 Subject: [PATCH 039/234] android-studio: 2.1.2.0 -> 2.1.3.0 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 85b9e7c4368..4d972a54e37 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -20,8 +20,8 @@ let - version = "2.1.2.0"; - build = "143.2915827"; + version = "2.1.3.0"; + build = "143.3101438"; androidStudio = stdenv.mkDerivation { name = "android-studio"; @@ -61,7 +61,7 @@ let ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams"; + sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj"; }; }; From fc74bf2ccc025c993b97ab67e2ad4737fd425484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 11 Sep 2016 21:19:53 +0200 Subject: [PATCH 040/234] qgis: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit dccf8c5f27ed4a1af47f1fc052e9ac206f3a61b7) Signed-off-by: Domen Kožar --- pkgs/applications/gis/qgis/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 880053e05c2..cce683067e7 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags +, qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: stdenv.mkDerivation rec { name = "qgis-2.16.2"; - buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla + buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with pythonPackages; [ numpy psycopg2 requests2 ]) ++ [ pythonPackages.qscintilla ]; + (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' - export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH ''; src = fetchurl { @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} ''; meta = { From 6a72c10d5863718635ef104b37673eac6bc5d3f0 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 11 Sep 2016 21:50:16 +0200 Subject: [PATCH 041/234] sonarr: 2.0.0.4230 -> 2.0.0.4323 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 91e292944a6..b44b173c05c 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4230"; + version = "2.0.0.4323"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "16nx0v5hpqlwna2hzpcpzvm7qc361yjxbqnwz5bfnnkb0h7ik5m6"; + sha256 = "1c50z7cwkm3pfn5inac96b7lazvxr2778aix4cp5b0rm01r2414x"; }; buildInputs = [ From e6eeaf3ac1f462ba3558a46261688ea511f74021 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 11 Sep 2016 21:51:28 +0200 Subject: [PATCH 042/234] emby: 3.0.6400 -> 3.0.7100 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 14c4873beb4..7ce23d5d6b3 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.6400"; + version = "3.0.7100"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "08zwqqilfs3y2kjqfan4ya0s9pns6g1pgh6wciabjzv2v2ra9kq3"; + sha256 = "0fxqk4p8p72bjzlbl8da988xr6bryr1zpvaaf8if6vnclly4vmny"; }; propagatedBuildInputs = with pkgs; [ From fef56e8b258b7b0346df4220ae4659254e0797af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Sep 2016 14:38:23 +0200 Subject: [PATCH 043/234] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v2.0.1-8-g914b77b using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/aa7348b0fd9e10d5d339f6c20bcdd2ab61ad64f2 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/56135ef31ada6f0ad74b1ffbf769a369f31fd2ef - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/8b7d8b236d0c477eda978deba79f0f71cc02916d --- .../haskell-modules/configuration-lts.nix | 23 + .../haskell-modules/hackage-packages.nix | 1028 ++++++++++++++--- 2 files changed, 876 insertions(+), 175 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index 5ccc5a7351e..850f78c5ecb 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -398,6 +398,7 @@ self: super: { "HDBC-mysql" = dontDistribute super."HDBC-mysql"; "HDBC-odbc" = dontDistribute super."HDBC-odbc"; "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = doDistribute super."HDBC-session_0_1_0_1"; "HDRUtils" = dontDistribute super."HDRUtils"; "HERA" = dontDistribute super."HERA"; "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; @@ -1118,6 +1119,7 @@ self: super: { "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-coerce" = dontDistribute super."aeson-coerce"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_5_1"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-flatten" = dontDistribute super."aeson-flatten"; @@ -1223,6 +1225,7 @@ self: super: { "anticiv" = dontDistribute super."anticiv"; "antigate" = dontDistribute super."antigate"; "antimirov" = dontDistribute super."antimirov"; + "antiprimes" = dontDistribute super."antiprimes"; "antiquoter" = dontDistribute super."antiquoter"; "antisplice" = dontDistribute super."antisplice"; "antlrc" = dontDistribute super."antlrc"; @@ -2042,6 +2045,7 @@ self: super: { "concraft-pl" = dontDistribute super."concraft-pl"; "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrency" = dontDistribute super."concurrency"; "concurrent-barrier" = dontDistribute super."concurrent-barrier"; "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; "concurrent-machines" = dontDistribute super."concurrent-machines"; @@ -2469,6 +2473,8 @@ self: super: { "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; "derive-monoid" = dontDistribute super."derive-monoid"; + "derive-storable" = dontDistribute super."derive-storable"; + "derive-storable-plugin" = dontDistribute super."derive-storable-plugin"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = doDistribute super."deriving-compat_0_2"; @@ -4253,6 +4259,7 @@ self: super: { "hs-carbon" = dontDistribute super."hs-carbon"; "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-di" = dontDistribute super."hs-di"; "hs-dotnet" = dontDistribute super."hs-dotnet"; "hs-duktape" = dontDistribute super."hs-duktape"; "hs-excelx" = dontDistribute super."hs-excelx"; @@ -4481,6 +4488,7 @@ self: super: { "hubigraph" = dontDistribute super."hubigraph"; "hubris" = dontDistribute super."hubris"; "huckleberry" = dontDistribute super."huckleberry"; + "huff" = dontDistribute super."huff"; "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; @@ -5000,6 +5008,7 @@ self: super: { "layout" = dontDistribute super."layout"; "layout-bootstrap" = dontDistribute super."layout-bootstrap"; "lazy-io" = dontDistribute super."lazy-io"; + "lazy-io-streams" = dontDistribute super."lazy-io-streams"; "lazy-search" = dontDistribute super."lazy-search"; "lazyarray" = dontDistribute super."lazyarray"; "lazyio" = dontDistribute super."lazyio"; @@ -5270,6 +5279,8 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_5_1"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_8"; + "machines-io" = doDistribute super."machines-io_0_2_0_12"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5421,6 +5432,7 @@ self: super: { "mighttpd" = dontDistribute super."mighttpd"; "mighttpd2" = dontDistribute super."mighttpd2"; "mikmod" = dontDistribute super."mikmod"; + "mikrokosmos" = dontDistribute super."mikrokosmos"; "miku" = dontDistribute super."miku"; "milena" = dontDistribute super."milena"; "mime" = dontDistribute super."mime"; @@ -5588,6 +5600,7 @@ self: super: { "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; "multiaddr" = dontDistribute super."multiaddr"; + "multifile" = dontDistribute super."multifile"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5963,6 +5976,8 @@ self: super: { "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "pango" = doDistribute super."pango_0_13_1_1"; "papa" = dontDistribute super."papa"; + "papa-base" = dontDistribute super."papa-base"; + "papa-include" = dontDistribute super."papa-include"; "papa-lens" = dontDistribute super."papa-lens"; "papa-prelude" = dontDistribute super."papa-prelude"; "papa-prelude-core" = dontDistribute super."papa-prelude-core"; @@ -6372,6 +6387,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psi" = dontDistribute super."psi"; "psqueues" = doDistribute super."psqueues_0_2_2_1"; "pstemmer" = dontDistribute super."pstemmer"; "pub" = dontDistribute super."pub"; @@ -6750,6 +6766,8 @@ self: super: { "rosa" = dontDistribute super."rosa"; "rose-trie" = dontDistribute super."rose-trie"; "roshask" = dontDistribute super."roshask"; + "rosmsg" = dontDistribute super."rosmsg"; + "rospkg" = dontDistribute super."rospkg"; "rosso" = dontDistribute super."rosso"; "rot13" = dontDistribute super."rot13"; "roundRobin" = dontDistribute super."roundRobin"; @@ -6953,6 +6971,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-github-webhook" = dontDistribute super."servant-github-webhook"; "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-matrix-param" = dontDistribute super."servant-matrix-param"; @@ -7214,6 +7233,8 @@ self: super: { "snm" = dontDistribute super."snm"; "snow-white" = dontDistribute super."snow-white"; "snowball" = dontDistribute super."snowball"; + "snowflake-core" = dontDistribute super."snowflake-core"; + "snowflake-server" = dontDistribute super."snowflake-server"; "snowglobe" = dontDistribute super."snowglobe"; "soap" = doDistribute super."soap_0_2_3_0"; "sock2stream" = dontDistribute super."sock2stream"; @@ -7759,9 +7780,11 @@ self: super: { "timeprint" = dontDistribute super."timeprint"; "timers" = dontDistribute super."timers"; "timers-updatable" = dontDistribute super."timers-updatable"; + "timespan" = dontDistribute super."timespan"; "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; "timestamper" = dontDistribute super."timestamper"; "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timezone-series" = doDistribute super."timezone-series_0_1_5_1"; "timing-convenience" = dontDistribute super."timing-convenience"; "tinyMesh" = dontDistribute super."tinyMesh"; "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e9ec33c96e0..dd5ae329c20 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7094,7 +7094,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "HDBC-session" = callPackage + "HDBC-session_0_1_0_1" = callPackage ({ mkDerivation, base, HDBC }: mkDerivation { pname = "HDBC-session"; @@ -7104,6 +7104,19 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Bracketed connection for HDBC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HDBC-session" = callPackage + ({ mkDerivation, base, HDBC }: + mkDerivation { + pname = "HDBC-session"; + version = "0.1.1.0"; + sha256 = "4ad37a6c9d17b8f2f049ec4f3c4ea5efc8d866b02b226c6c066ab11153fc80b9"; + libraryHaskellDepends = [ base HDBC ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Bracketed connection for HDBC"; + license = stdenv.lib.licenses.bsd3; }) {}; "HDBC-sqlite3" = callPackage @@ -10400,7 +10413,6 @@ self: { testHaskellDepends = [ base base-compat carray fft JuicyPixels time ]; - doCheck = false; homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; description = "Scale JuicyPixels images with DCT"; license = stdenv.lib.licenses.bsd3; @@ -18520,8 +18532,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.3"; - sha256 = "d62e8062e1a2d2f00d8e6d8a707fb798ae5b5cc2c48a513375d5634fef116fd4"; + version = "0.1.0.4"; + sha256 = "79e55f9ae14054c8673f25325503c75af2bb750e0068f5fefbce3a98c7e04d94"; libraryHaskellDepends = [ base parsec ]; homepage = "xy30.com"; description = "A library to parse xml"; @@ -20642,7 +20654,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson-compat" = callPackage + "aeson-compat_0_3_5_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans , bytestring, containers, exceptions, hashable, nats, QuickCheck , quickcheck-instances, scientific, semigroups, tagged, tasty @@ -20669,6 +20681,34 @@ self: { homepage = "https://github.com/phadej/aeson-compat#readme"; description = "Compatibility layer for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "aeson-compat" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans + , bytestring, containers, exceptions, hashable, nats, QuickCheck + , quickcheck-instances, scientific, semigroups, tagged, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.5.2"; + sha256 = "e9bd5a327e086eafe673b2e2f4f04f51f54e23c6c4c261bf30b46d7be8071e90"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring containers exceptions + hashable nats scientific semigroups tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable nats QuickCheck quickcheck-instances + scientific semigroups tagged tasty tasty-hunit tasty-quickcheck + text time time-locale-compat unordered-containers vector + ]; + homepage = "https://github.com/phadej/aeson-compat#readme"; + description = "Compatibility layer for aeson"; + license = stdenv.lib.licenses.bsd3; }) {}; "aeson-diff" = callPackage @@ -20927,6 +20967,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-pretty_0_8_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , cmdargs, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-pretty"; + version = "0.8.2"; + sha256 = "6cb429821040bdd6f819b1c6170cac630a4155fa57fa24eb3d496c06030fb9b0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring scientific text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring cmdargs + ]; + homepage = "http://github.com/informatikr/aeson-pretty"; + description = "JSON pretty-printing library and command-line tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-qq" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim , haskell-src-meta, hspec, parsec, scientific, template-haskell @@ -21734,31 +21797,29 @@ self: { "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, hxt, megaparsec, mtl - , optparse-applicative, path, path-io, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, hspec, hxt + , megaparsec, mtl, optparse-applicative, path, path-io, QuickCheck + , random, text, tf-random, transformers, yaml }: mkDerivation { pname = "alga"; - version = "0.2.1"; - sha256 = "157f622f2851da9bcc2a05df9c192c8abb955745d22d4acdfc8d3a89b765d8e7"; + version = "0.2.2"; + sha256 = "3e90507199b1eb960bdad6bf6a531068cc60898d1fa289d52fa230500ee920f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline hxt megaparsec mtl path random - text tf-random transformers + base containers exceptions haskeline hxt megaparsec mtl path + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline hxt megaparsec mtl optparse-applicative path path-io - random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline hxt megaparsec mtl optparse-applicative path + path-io QuickCheck random text tf-random transformers yaml ]; testHaskellDepends = [ - base containers hxt megaparsec mtl QuickCheck random test-framework - test-framework-quickcheck2 text tf-random transformers + base containers hspec hxt megaparsec mtl QuickCheck random text + tf-random transformers ]; - jailbreak = true; homepage = "https://github.com/mrkkrp/alga"; description = "Algorithmic automation for various DAWs"; license = stdenv.lib.licenses.gpl3; @@ -24097,12 +24158,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ansigraph_0_3_0_0" = callPackage + "ansigraph_0_3_0_1" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.0"; - sha256 = "0eb9433a0f282e07ee5f0eabba5bda296daedc801293a6a3c54915b0fbbc510f"; + version = "0.3.0.1"; + sha256 = "fbaa1bdb68753777bb345c834aee316e01698cd3fafc2b9ed9e3b1c77ee8d6c7"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -24220,6 +24281,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiprimes" = callPackage + ({ mkDerivation, base, hspec, primes }: + mkDerivation { + pname = "antiprimes"; + version = "0.1.0.1"; + sha256 = "8e8b457ec223b9df3c3036d1c5fd1fd4c62144a911a4284a3e38fc2a1a9c292b"; + libraryHaskellDepends = [ base primes ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/wokibe/antiprimes#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "antiquoter" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -26322,6 +26396,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-dejafu_0_1_3_0" = callPackage + ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit + , hunit-dejafu + }: + mkDerivation { + pname = "async-dejafu"; + version = "0.1.3.0"; + sha256 = "d893a14c85af9cb947e3b3298b77c3665112a54cc8876dca8fc08e6871952afd"; + libraryHaskellDepends = [ base concurrency exceptions ]; + testHaskellDepends = [ + base concurrency dejafu HUnit hunit-dejafu + ]; + jailbreak = true; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Run MonadConc operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-extras" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base , monad-control, SafeSemaphore, stm, transformers-base @@ -26461,8 +26554,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.4.0"; - sha256 = "4e4cac3e768e7488772751264b8ecf217841a8bc45e0fc2931398d1b056f416b"; + version = "0.4.4.1"; + sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -31682,6 +31775,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bitcoin-payment-channel_0_2_3_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base58string + , base64-bytestring, binary, bytestring, cereal, errors + , haskoin-core, hexstring, QuickCheck, scientific, text, time + }: + mkDerivation { + pname = "bitcoin-payment-channel"; + version = "0.2.3.1"; + sha256 = "b987da47e8f1c0d60dacc6b09a07097f6b390e80b0110adc4401974bbc2fd1ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring base58string base64-bytestring binary + bytestring cereal errors haskoin-core hexstring scientific text + time + ]; + executableHaskellDepends = [ + aeson base base16-bytestring base58string base64-bytestring binary + bytestring cereal haskoin-core hexstring QuickCheck text time + ]; + homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; + description = "Library for working with Bitcoin payment channels"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bitcoin-rpc" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, ghc-prim, HTTP, HUnit, mtl, network, QuickCheck @@ -33732,8 +33851,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.8"; - sha256 = "f730fd999e070700d90d36aadf8716aaf7d86094900f204f06f6593b5e5b1382"; + version = "0.9"; + sha256 = "3e13c7ec5be06e416fc609e565e765e91f2cdf967aa97589fcff4dc0f73b3d40"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -39927,8 +40046,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.0.0.1"; - sha256 = "3df8f7120fa540415fd83d7ddc43b9fc088cc1cefc97bc08ca32c711b636c47e"; + version = "1.0.0.2"; + sha256 = "a4fa52c6b571df5cc98c1cebf97b41085104a17b2e23c2221cd2061ec7a9c262"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -42643,6 +42762,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "concurrency" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.0.0.0"; + sha256 = "541f9e730c18464ec8399214097a5fb62cfce319baa3495bf3349e0f4d9cf19d"; + revision = "1"; + editedCabalFile = "3de0faeb048451ba463026c4d88e9cedf21470c4568a044be0b4bff460ad1c90"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -43091,34 +43229,6 @@ self: { }) {}; "conduit-combinators" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; - version = "1.0.5"; - sha256 = "b6e65bcfec9a9b57e268a7a16f067af500f1e8b8f7dad9b96e9aad7bf603c6cd"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-combinators_1_0_6" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers , directory, filepath, hspec, monad-control, mono-traversable, mtl @@ -43144,7 +43254,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-connection" = callPackage @@ -45144,8 +45253,8 @@ self: { }: mkDerivation { pname = "cplex-hs"; - version = "0.2.0.2"; - sha256 = "5f6de007fa0b2548d40fdb18cb44b37b8f02cc7cbe631e74ba20ab1aec811554"; + version = "0.3.0.0"; + sha256 = "56afdd13c508767615baa4a529fab0eebc73cd679ac040ef1592023489c42355"; libraryHaskellDepends = [ base containers mtl primitive transformers vector ]; @@ -47825,6 +47934,51 @@ self: { license = "GPL"; }) {inherit (pkgs) curl;}; + "darcs_2_12_3" = callPackage + ({ mkDerivation, array, async, attoparsec, base, base16-bytestring + , binary, bytestring, cmdargs, containers, cryptohash, curl + , data-ordlist, directory, fgl, filepath, FindBin, graphviz + , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network + , network-uri, old-time, parsec, process, QuickCheck, random + , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar + , terminfo, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-compat, unix, unix-compat, utf8-string, vector + , zip-archive, zlib + }: + mkDerivation { + pname = "darcs"; + version = "2.12.3"; + sha256 = "68ed535dce4bd2d8349ba04258bb56df7d47853dac9d3365fc0325a86db1cde5"; + configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async attoparsec base base16-bytestring binary bytestring + containers cryptohash data-ordlist directory fgl filepath graphviz + hashable haskeline html HTTP mmap mtl network network-uri old-time + parsec process random regex-applicative regex-compat-tdfa sandi tar + terminfo text time transformers transformers-compat unix + unix-compat utf8-string vector zip-archive zlib + ]; + librarySystemDepends = [ curl ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + array base bytestring cmdargs containers directory filepath FindBin + HUnit mtl QuickCheck shelly split test-framework + test-framework-hunit test-framework-quickcheck2 text zip-archive + ]; + doCheck = false; + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv contrib/darcs_completion $out/etc/bash_completion.d/darcs + ''; + homepage = "http://darcs.net/"; + description = "a distributed, interactive, smart revision control system"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) curl;}; + "darcs-benchmark" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, datetime , directory, filepath, hs-gchart, html, HTTP, json, mtl, network @@ -51177,6 +51331,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_0_4_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, dpor + , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "dejafu"; + version = "0.4.0.0"; + sha256 = "876c92c590cce573cb600a1bb575b42ed2c2fb332c59803c5f0667a675df80d4"; + libraryHaskellDepends = [ + base concurrency containers deepseq dpor exceptions monad-loops mtl + ref-fd semigroups transformers transformers-base + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Systematic testing for Haskell concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -51669,6 +51842,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-storable" = callPackage + ({ mkDerivation, base, generic-storable, hspec, QuickCheck }: + mkDerivation { + pname = "derive-storable"; + version = "0.1.0.2"; + sha256 = "76e8ae7d85fe9befa23a8667c4531b212cea777db7e1d6b573be54d3ce8681f5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base generic-storable hspec QuickCheck ]; + homepage = "https://www.github.com/mkloczko/derive-storable/"; + description = "Derive Storable instances with help of GHC.Generics."; + license = stdenv.lib.licenses.mit; + }) {}; + + "derive-storable-plugin" = callPackage + ({ mkDerivation, base, derive-storable, ghc, ghci }: + mkDerivation { + pname = "derive-storable-plugin"; + version = "0.1.0.2"; + sha256 = "d9b080fb359169b2edd8e32cef46681666204673bd460e24dcd6bfb13ec8abcd"; + libraryHaskellDepends = [ base derive-storable ghc ghci ]; + homepage = "https://www.github.com/mkloczko/derive-storable-plugin/"; + description = "GHC core plugin supporting the derive-storable package"; + license = stdenv.lib.licenses.mit; + }) {}; + "derive-topdown" = callPackage ({ mkDerivation, base, derive, mtl, template-haskell , template-haskell-util @@ -51745,6 +51943,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_3_3" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.3.3"; + sha256 = "b977e5f819c84443a355521579712a0cf138d5102d383e823381576a87898c21"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell transformers + transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck template-haskell + transformers transformers-compat + ]; + jailbreak = true; + homepage = "https://github.com/haskell-compat/deriving-compat"; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -52981,23 +53203,25 @@ self: { }) {}; "difftodo" = callPackage - ({ mkDerivation, base, bytestring, diff-parse, highlighting-kate - , optparse-applicative, protolude, tasty, tasty-hunit, text + ({ mkDerivation, base, bytestring, diff-parse, highlighter2 + , optparse-applicative, pretty-show, process, protolude, tasty + , tasty-hunit, text }: mkDerivation { pname = "difftodo"; - version = "0.1.0"; - sha256 = "ab1c892daec3ecee50d16f8353e6da6195d3da86e1bca0ab8f3cb908a9746066"; + version = "0.2.0"; + sha256 = "bdb2c473e15455ae2af37623283bb78fd6cf52491d86eb9a04b1241011fab899"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base diff-parse highlighting-kate protolude text + base bytestring diff-parse highlighter2 protolude text ]; executableHaskellDepends = [ - base optparse-applicative protolude text + base bytestring optparse-applicative process protolude text ]; testHaskellDepends = [ - base bytestring highlighting-kate protolude tasty tasty-hunit text + base bytestring highlighter2 pretty-show protolude tasty + tasty-hunit text ]; homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; @@ -54746,8 +54970,8 @@ self: { ({ mkDerivation, base, dlist, hspec }: mkDerivation { pname = "do-list"; - version = "0.9.0"; - sha256 = "f7f0af10c6e0f817afba7939e070671b232f152adf2f9d72b6656d4b9417dfef"; + version = "0.9.1"; + sha256 = "db524f3d62271d79f6f675e13dbe069ce9d3faf0b1512d5b26a61fdd6234ccf8"; libraryHaskellDepends = [ base dlist ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/tserduke/do-list"; @@ -57842,8 +58066,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "1.0.4"; - sha256 = "39f8ec1e64c1a5025f4568ff59b52470e846d777f3cd343176b7a25d672989d3"; + version = "1.0.5"; + sha256 = "29badb1eb03e5960da6f0d89cb7ba8211ca18dc687840c72c3cce9bef1b11270"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63133,8 +63357,8 @@ self: { }: mkDerivation { pname = "fixfile"; - version = "0.5.0.0"; - sha256 = "ebac16bee38bc0fd05790429d40b1c4a0089b82a53da45d2e74d226c4bdf8d65"; + version = "0.6.0.0"; + sha256 = "37183ade31510ba1c3801adf5df112f7ef6291b478934d0c51839510e536888c"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath hashable hashtables lens mtl temporary vector @@ -66938,6 +67162,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-deriving_1_11_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec + , template-haskell + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.11.1"; + sha256 = "b38d427f990f3080108c565a81284217290a47be63bab7bf59036ece2e2cb0e9"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base hspec template-haskell ]; + jailbreak = true; + homepage = "https://github.com/dreixel/generic-deriving"; + description = "Generic programming library for generalised deriving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -69284,8 +69527,8 @@ self: { "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobjectIntrospection, gstreamer, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { pname = "gi-gst"; @@ -69296,20 +69539,18 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gst_all_1) gstreamer;}; + }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; @@ -69320,18 +69561,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gst_plugins_base, haskell-gi, haskell-gi-base - , text, transformers + , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstbase"; @@ -69342,18 +69585,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstvideo"; @@ -69364,13 +69609,15 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -71262,8 +71509,10 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.15"; - sha256 = "1179f60fc18d4ad3f15241a810f5063f5da1aece2d2b50d8cd04c3af2f562457"; + version = "2.16"; + sha256 = "cb6129842e91bf08c13841ce9409f52c4c827533ca8b75d6ea557567e84190ba"; + revision = "1"; + editedCabalFile = "ff2ebb1142cb8d3d6613a70050b237b454cd6d177ffaee0bed694fe68c82703d"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -71639,8 +71888,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.4.6"; - sha256 = "bca26c14be41205c86082e303885bd2c031634dbb7b31336ab71f37efc4f654b"; + version = "0.4.8"; + sha256 = "93e860fbbff04561621cd923081b111602a900dd2eb9306e1c77dc26b63b1912"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71663,8 +71912,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.4.6"; - sha256 = "d4cecdff03ee9d1b30a804a17a186b2fc1ad84bde59031285cd21e9f550db1ff"; + version = "0.4.8"; + sha256 = "145a86d1ef7c2a8c0dd10b258a6b93497986ae3789fe79b1389ecb02ab5b8178"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71687,8 +71936,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.4.6"; - sha256 = "c22a6f59bf4e3eddcdfd00500eaef16a9065113b52f97252c1270fdd29e1ad27"; + version = "0.4.8"; + sha256 = "9612eb9054420ae4f467b167356f1cbe1ed43ad2f62726810dbdd012c38a4501"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71710,8 +71959,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.4.6"; - sha256 = "595d107c5153ed6ac93b2b0f27fb154e76975f05c6780b78ffa2618cc395dc62"; + version = "0.4.8"; + sha256 = "3e75fea965b3d83e57c1ade5354811a96707111b912840b5c7c46c2d02ae330a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77942,6 +78191,8 @@ self: { pname = "hakyll-shakespeare"; version = "0.1.0.0.2"; sha256 = "ebaa9c1cf33b3c59e91f7000ae4fc320f8b7d6c47c3a0088da9604c91dc9d0ad"; + revision = "1"; + editedCabalFile = "8e81f615162a066f96dff257a9efea27478c87cd345bb708d1cdd4ba565c838d"; libraryHaskellDepends = [ base blaze-html containers hakyll shakespeare text ]; @@ -81842,17 +82093,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec, pretty + ({ mkDerivation, base, containers, filepath, parsec3, pretty , process }: mkDerivation { pname = "haskelzinc"; - version = "0.1.0.1"; - sha256 = "82d828d7fd75f58db210169a167f24856aaa88fb7ac7e7cae16a1a46a0e56146"; + version = "0.2.0.3"; + sha256 = "a7248945f8c53b1a0f36e1c184c236fcb2bea27c970fc0453bcc0e88be767a72"; libraryHaskellDepends = [ - base containers filepath parsec pretty process + base containers filepath parsec3 pretty process ]; - jailbreak = true; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -86159,7 +86409,7 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) systemd;}; + }) {systemd = null;}; "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: @@ -90958,6 +91208,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-di" = callPackage + ({ mkDerivation, base, compose-ltr, hspec, MissingH, QuickCheck + , template-haskell, time + }: + mkDerivation { + pname = "hs-di"; + version = "0.2.2"; + sha256 = "103128607f0303625dccb039d78d3de5790088a4f5b7bedae7e45e488ee53901"; + libraryHaskellDepends = [ base compose-ltr template-haskell ]; + testHaskellDepends = [ + base compose-ltr hspec MissingH QuickCheck template-haskell time + ]; + homepage = "https://github.com/Wizek/hs-di#readme"; + description = "Dependency Injection library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-dotnet" = callPackage ({ mkDerivation, base, ghc-prim, ole32, oleaut32 }: mkDerivation { @@ -94477,6 +94744,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; + "htaglib_1_0_4" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , taglib, text + }: + mkDerivation { + pname = "htaglib"; + version = "1.0.4"; + sha256 = "0b23c25f6ef721e193176fd2c4e491376235c5cb04dea0d75ebf721bd10b40a7"; + libraryHaskellDepends = [ base bytestring text ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ base directory filepath hspec ]; + jailbreak = true; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) taglib;}; + "htags" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src, mtl }: mkDerivation { @@ -96056,6 +96341,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "huff" = callPackage + ({ mkDerivation, alex, alex-tools, array, base, containers + , hashable, heaps, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "huff"; + version = "0.1.0.1"; + sha256 = "ff2e9051fb45d4694bf2e1a0a84452943856b043cf58cbcb1755ac424212ca3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alex-tools array base containers hashable heaps template-haskell + text unordered-containers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/elliottt/huff"; + description = "A fast-foward-based planner"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "huffman" = callPackage ({ mkDerivation, base, containers, fingertree }: mkDerivation { @@ -96186,6 +96492,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_0_3_0_2" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "0.3.0.2"; + sha256 = "eba6ff1b350a7b4a1e09abfc694d4c3ac47bbc36fea23439f512a763c531a7a3"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -99274,8 +99593,10 @@ self: { ({ mkDerivation, base, mtl, time, transformers }: mkDerivation { pname = "implicit-logging"; - version = "0.1.0.0"; - sha256 = "98032042eee95714c2f0e0c1a25a03f15e75223bacc85b9857b1d66d639805c0"; + version = "0.2.0.0"; + sha256 = "81b1c538b50963067410e7cbb6d60f42c0e90f068518d20505cc942e633ec3e3"; + revision = "1"; + editedCabalFile = "da2dc77f11f48a07772f4528408f90fad91d0c413d4bf855f14670df5765a60b"; libraryHaskellDepends = [ base mtl time transformers ]; jailbreak = true; homepage = "https://github.com/revnull/implicit-logging"; @@ -100184,6 +100505,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.0.0"; sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e"; + revision = "1"; + editedCabalFile = "2775fc971c86a62caa0590f0f8c5ea74c3c4b59c96f9c45b0bcbc1760bc438e7"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -108060,6 +108383,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lazy-io-streams" = callPackage + ({ mkDerivation, base, bytestring, io-streams }: + mkDerivation { + pname = "lazy-io-streams"; + version = "0.1.0.0"; + sha256 = "beef343b717030f28fabb7e55bbf687d96769b16081ff8c0bd5bb73da3065d08"; + libraryHaskellDepends = [ base bytestring io-streams ]; + description = "Get lazy with your io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazy-search" = callPackage ({ mkDerivation, base, size-based }: mkDerivation { @@ -109465,10 +109799,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "libltdl"; - version = "0.1.0.3"; - sha256 = "f96f21553b2d6758aab7f59ecd96ad93b01dd61ae9aeca812214081e08a24415"; + version = "0.1.1"; + sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828"; libraryHaskellDepends = [ base ]; - homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi"; + homepage = "https://github.com/mainland/libltdl"; description = "FFI interface to libltdl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109741,7 +110075,7 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) systemd;}; + }) {systemd = null;}; "libtagc" = callPackage ({ mkDerivation, base, bytestring, glib, taglib }: @@ -113654,7 +113988,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "machines-directory" = callPackage + "machines-directory_0_2_0_8" = callPackage ({ mkDerivation, base, directory, filepath, machines, machines-io , transformers }: @@ -113669,9 +114003,26 @@ self: { homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "machines-io" = callPackage + "machines-directory" = callPackage + ({ mkDerivation, base, directory, filepath, machines, machines-io + , transformers + }: + mkDerivation { + pname = "machines-directory"; + version = "0.2.0.9"; + sha256 = "38e1e5874431f8cad71b3067bc16258e3dfa13b09bf9d8698d6e28d5e0fabf24"; + libraryHaskellDepends = [ + base directory filepath machines machines-io transformers + ]; + homepage = "http://github.com/aloiscochard/machines-directory"; + description = "Directory (system) utilities for the machines library"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "machines-io_0_2_0_12" = callPackage ({ mkDerivation, base, bytestring, chunked-data, machines , transformers }: @@ -113686,6 +114037,23 @@ self: { homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "machines-io" = callPackage + ({ mkDerivation, base, bytestring, chunked-data, machines + , transformers + }: + mkDerivation { + pname = "machines-io"; + version = "0.2.0.13"; + sha256 = "4d579d5e9e94fafcfca91322734263498999d2e2af45c40ff0d1db78f4a8f5d4"; + libraryHaskellDepends = [ + base bytestring chunked-data machines transformers + ]; + homepage = "http://github.com/aloiscochard/machines-io"; + description = "IO utilities for the machines library"; + license = stdenv.lib.licenses.asl20; }) {}; "machines-process" = callPackage @@ -116813,30 +117181,29 @@ self: { "mida" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, HCodecs, megaparsec, mtl - , optparse-applicative, path, path-io, process, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, HCodecs, hspec + , megaparsec, mtl, optparse-applicative, path, path-io, process + , QuickCheck, random, text, tf-random, transformers, yaml }: mkDerivation { pname = "mida"; - version = "1.0.1"; - sha256 = "97e76f04d0bad25eefc19fdb7df6f53ce351918fc52815bf9a163417b730b859"; + version = "1.0.2"; + sha256 = "902ce590e9fb57138676eacc4bdcb4ed536f54df054f4c606a4c6c71b6f475f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline HCodecs megaparsec mtl random - text tf-random transformers + base containers exceptions haskeline HCodecs megaparsec mtl + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline HCodecs megaparsec mtl optparse-applicative path path-io - process random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline HCodecs megaparsec mtl optparse-applicative + path path-io process QuickCheck random text tf-random transformers + yaml ]; testHaskellDepends = [ - base containers HCodecs megaparsec mtl QuickCheck random - test-framework test-framework-quickcheck2 text tf-random - transformers + base containers HCodecs hspec megaparsec mtl QuickCheck random text + tf-random transformers ]; homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; @@ -117071,6 +117438,24 @@ self: { license = "LGPL"; }) {}; + "mikrokosmos" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, haskeline, HUnit + , mtl, multimap, parsec + }: + mkDerivation { + pname = "mikrokosmos"; + version = "0.1.0"; + sha256 = "49547246b9a22a9d2037424d99017d09823a2f321a9d0f6cec3309b85c5880a4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base containers haskeline HUnit mtl multimap parsec + ]; + homepage = "https://github.com/M42/mikrokosmos"; + description = "Lambda calculus interpreter"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "miku" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , containers, filepath, http-types, mtl, wai, wai-extra @@ -120762,6 +121147,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multifile" = callPackage + ({ mkDerivation, base, HaXml }: + mkDerivation { + pname = "multifile"; + version = "0.1.0.0"; + sha256 = "a0d4e0c033e8f17991fa62be64efd16d04b76befbe74cd84f547fbbdd17bef9d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base HaXml ]; + homepage = "xy30.com"; + description = "create many files from one"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multifocal" = callPackage ({ mkDerivation, array, base, containers, haskell-src-exts, HaXml , hxt, hxt-xpath, mtl, parsec, pointless-haskell, pointless-lenses @@ -125860,6 +126259,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "octane_0_16_1" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, binary-bits + , bytestring, containers, data-binary-ieee754, data-default-class + , deepseq, file-embed, http-client, http-client-tls + , overloaded-records, regex-compat, tasty, tasty-hspec + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "octane"; + version = "0.16.1"; + sha256 = "8b42c80e4274d8e9677eec6a349a3c7d337b129fa4194d05a288ac91ad3406ec"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary binary-bits bytestring containers + data-binary-ieee754 data-default-class deepseq file-embed + overloaded-records regex-compat text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls + ]; + testHaskellDepends = [ + base binary binary-bits bytestring containers tasty tasty-hspec + tasty-quickcheck text + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -125933,7 +126363,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; - inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; + inherit (pkgs) mesa; ovr = null; systemd = null;}; "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text @@ -126494,6 +126924,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_5_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.5.1.1"; + sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -128890,14 +129347,16 @@ self: { }) {inherit (pkgs.gnome) pango;}; "papa" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-lens - , papa-prelude, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, papa-base + , papa-include, papa-prelude, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.0.1"; - sha256 = "066d3e396e227d3775ab4d636e8c71c67ad2b883053ae593a1f4f7eb128491b3"; - libraryHaskellDepends = [ base papa-lens papa-prelude ]; + version = "0.1.0"; + sha256 = "65e86b5cda900e60856216f000cd95931780f7ba437e5ecc5924da698a9fc730"; + libraryHaskellDepends = [ + base papa-base papa-include papa-prelude + ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -128907,6 +129366,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "papa-base" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-base"; + version = "0.1.0"; + sha256 = "532ddec481ae97e7fdf074c653c3549a150f34a701572ed33aadab3f4899dcdf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-base"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-include" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, semigroupoids, semigroups, template-haskell + }: + mkDerivation { + pname = "papa-include"; + version = "0.1.0"; + sha256 = "d39ff3c7bdfe065878f53f1722c9852db6bc1d8a0ea3c6152f759e1fa65a14ff"; + libraryHaskellDepends = [ base lens semigroupoids semigroups ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-include"; + description = "Third party libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papa-lens" = callPackage ({ mkDerivation, base, directory, doctest, filepath, lens , QuickCheck, template-haskell @@ -128925,22 +129418,17 @@ self: { }) {}; "papa-prelude" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-prelude-core, papa-prelude-lens, papa-prelude-semigroupoids - , papa-prelude-semigroups, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell }: mkDerivation { pname = "papa-prelude"; - version = "0.0.1"; - sha256 = "6336946e1164a30f1bb0b21e5b7f316a06488b2b329db7ef9ebb892168b2fc99"; - libraryHaskellDepends = [ - base papa-prelude-core papa-prelude-lens papa-prelude-semigroupoids - papa-prelude-semigroups - ]; + version = "0.1.1"; + sha256 = "5af67b6e0a8e49b36dd1bfdf7a9daeec1459ab4a6688f04fb87c4fd54e8f5ef1"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/data61/papa-prelude"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; @@ -134958,14 +135446,13 @@ self: { }: mkDerivation { pname = "posix-acl"; - version = "0.2.0.0"; - sha256 = "3b1f8858ae8acb6d3c50a3900406b0b7b018709447c4c17aee8d2f83f12a38e2"; + version = "0.2.0.1"; + sha256 = "e3e56ee3a8cc9e84c255a17593289b86c685b167d98fee0281481509454671d2"; libraryHaskellDepends = [ base bytestring containers lifted-base monad-control transformers transformers-base unix ]; librarySystemDepends = [ acl ]; - jailbreak = true; homepage = "https://github.com/tensor5/posix-acl"; description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; @@ -136553,10 +137040,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "printf-safe"; - version = "0.1.0.0"; - sha256 = "492389dad3146efa2ab91fb2518c47c5dc6f94c993098e8e346cc5a77e3b5ed3"; + version = "0.1.0.1"; + sha256 = "54c6aadd6b084064cd2dfdddd80eec7fc03ccf0cb91ec544c82641836eff6a9d"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Type safe interface for Text.Printf"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -136640,12 +137126,11 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.5"; - sha256 = "1dccf0a260f37f0725f02d2f1d4f1cd61da67477dacc77caf5007584ec53a9c0"; + version = "0.2.5.1"; + sha256 = "d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming"; description = "Probabilistic Functional Programming"; license = stdenv.lib.licenses.bsd3; @@ -137415,8 +137900,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.1.2"; - sha256 = "a6baace79c8dd9782985836304494bf3cc4159ae6df398c9ee9d613a418a8e47"; + version = "3.2.0"; + sha256 = "6fac41cf8b4cb5a6eab97afe583f27810f6bce89b78ab0985bb11114725cd9e9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137996,6 +138481,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psi" = callPackage + ({ mkDerivation, base, bytestring, deepseq, semigroups, text }: + mkDerivation { + pname = "psi"; + version = "0.1.0.0"; + sha256 = "c8f6a8bf9359362817ae4f1f3464cb20bd70429eb2366039fba71b7828e30831"; + libraryHaskellDepends = [ + base bytestring deepseq semigroups text + ]; + description = "Yet another custom Prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "psql-helpers" = callPackage ({ mkDerivation, base, postgresql-simple }: mkDerivation { @@ -142424,8 +142922,8 @@ self: { pname = "reflex"; version = "0.4.0"; sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c"; - revision = "1"; - editedCabalFile = "5d0a189f2906a9172bee253fa9763c490f92f7ab4b71461401260321bb103b56"; + revision = "2"; + editedCabalFile = "e88ff0200373c04d57ff4b3232ada2a6965f61a23d99a8ef6bcbf96603c9d992"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -142435,7 +142933,7 @@ self: { base containers dependent-map MemoTrie mtl ref-tf ]; jailbreak = true; - homepage = "https://github.com/ryantrinkle/reflex"; + homepage = "https://github.com/reflex-frp/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142470,8 +142968,8 @@ self: { pname = "reflex-dom"; version = "0.3"; sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a"; - revision = "1"; - editedCabalFile = "908cf399bc1af34e18674cad421c0046b667ee8172254fce6e59dae83ce96a6a"; + revision = "2"; + editedCabalFile = "b569e2b08dac72a37173f680be5eaeb9ad57900c08301bf7b958f1cf52ac6055"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -144980,8 +145478,8 @@ self: { }: mkDerivation { pname = "result"; - version = "0.2.4.0"; - sha256 = "043012086322e95b7b8a1f44e1603363b017a3348aa03115237b50e2baf2dec2"; + version = "0.2.5.0"; + sha256 = "92a488febc3d847a84a7d500613a0fa58450530c6c6ca64a94784023a4412c2d"; libraryHaskellDepends = [ base bifunctors keys mtl semigroups transformers ]; @@ -146193,6 +146691,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rosmsg" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, data-default + , lens-family, pureMD5, template-haskell, text + }: + mkDerivation { + pname = "rosmsg"; + version = "0.4.4.0"; + sha256 = "be16282c302f6ae7ed080460aae939c313253f364b76afbe182ff262b6c74e84"; + libraryHaskellDepends = [ + attoparsec base binary bytestring data-default lens-family pureMD5 + template-haskell text + ]; + homepage = "https://github.com/RoboticsHS/rosmsg#readme"; + description = "ROS message parser, render, TH"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rospkg" = callPackage + ({ mkDerivation, async, base, bytestring, directory, fast-tagsoup + , filepath, split, tagsoup, text + }: + mkDerivation { + pname = "rospkg"; + version = "0.2.2.1"; + sha256 = "904d31b3b2efd0807e4db2d6d7b83ff07ed2c19ee9cd5984ce93ee8cb6d19695"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring directory fast-tagsoup filepath split tagsoup + text + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/RoboticsHS/rospkg#readme"; + description = "ROS package system information"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosso" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -150717,6 +151253,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-github-webhook" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto + , github, http-types, servant, servant-server, string-conversions + , text, wai + }: + mkDerivation { + pname = "servant-github-webhook"; + version = "0.1.0.0"; + sha256 = "6d7f7c782a3652204bcf85c765212b71815f025d03e2939f1fea304af5326649"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring Crypto github http-types + servant servant-server string-conversions text wai + ]; + jailbreak = true; + homepage = "https://github.com/tsani/servant-github-webhook"; + description = "Servant combinators to facilitate writing GitHub webhooks"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , deepseq, either, exceptions, hashable, haxl, hspec, http-client @@ -151271,8 +151826,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "8"; - editedCabalFile = "134f4bb4d23eb291360e897c9f83e74f22de17918452b6de79b2044c97197c6b"; + revision = "9"; + editedCabalFile = "a30c9b97b94cd82fe83b4ad43943e82edba51428ce421ab59166a8cd3622b7bb"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -156604,6 +157159,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "snowflake-core" = callPackage + ({ mkDerivation, base, QuickCheck, time-exts }: + mkDerivation { + pname = "snowflake-core"; + version = "0.1.0.1"; + sha256 = "442427fa86bee84c422c3c14e02e0f33f1d04504172dfd2620c50b3aa2ef8954"; + libraryHaskellDepends = [ base time-exts ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/jiakai0419/snowflake#readme"; + description = "twitter's snowflake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "snowflake-server" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, random + , snap-core, snap-server, snowflake-core + }: + mkDerivation { + pname = "snowflake-server"; + version = "0.1.0.0"; + sha256 = "af3baefdf4c9c51c7c0eb1441b24af8d9185ef41fae3890f961effbdca789c1c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers mtl random snap-core snap-server + snowflake-core + ]; + description = "snowflake http server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snowglobe" = callPackage ({ mkDerivation, base, bytestring, containers, gl-capture, GLUT , OpenGL, OpenGLRaw, random @@ -159629,13 +160215,12 @@ self: { }: mkDerivation { pname = "statsd-client"; - version = "0.2.0.1"; - sha256 = "7ef148b3909594fe4e845a1ebc49041af5cacaf1c557b4460f117a35a59457a5"; + version = "0.3.0.0"; + sha256 = "540cfad1006bad0f38e2ebb4550c7508f3dd7c21fd4711f87371fbe03d35df06"; libraryHaskellDepends = [ base byteable bytestring crypto-api cryptohash digest-pure DRBG network network-uri old-time random time-units ]; - jailbreak = true; homepage = "https://github.com/keithduncan/statsd-client"; description = "Statsd UDP client"; license = stdenv.lib.licenses.mit; @@ -160410,8 +160995,10 @@ self: { }: mkDerivation { pname = "store"; - version = "0.2.1.0"; - sha256 = "8f6724dc7fcf97af160106bc546d33b07ac290c81349a6c72b5db18dea6a8d6d"; + version = "0.2.1.1"; + sha256 = "e61242e5309d4efa9c7a676465dcc57a78b6b34b019bf053b6cfa5e38a449cd1"; + revision = "1"; + editedCabalFile = "12fe7b5c31b015214596f7b077529d55ac52a6589481b4eb1feea71b042aee6e"; libraryHaskellDepends = [ array base base-orphans base64-bytestring bytestring conduit containers cryptohash deepseq directory fail filepath ghc-prim @@ -160443,8 +161030,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.2.0.0"; - sha256 = "52ef7fab49c7dbd6c287de92c2f852c78f25cb32a415e56b3f21ca6b9aa5bd0a"; + version = "0.2.0.1"; + sha256 = "f4945175ef4342e6d6cc51a67d11ad1109b757f0876dc70ca4fb645c2458fa94"; libraryHaskellDepends = [ base bytestring fail ghc-prim primitive text transformers ]; @@ -164590,6 +165177,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_0_3_0_2" = callPackage + ({ mkDerivation, base, dejafu, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "0.3.0.2"; + sha256 = "1f1d2ebbad76c763e036871ec481f40c532334f7692dc187a94b77519dbe2f5d"; + libraryHaskellDepends = [ base dejafu tagged tasty ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -167067,8 +167667,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.7"; - sha256 = "7d1c215b0d244bcd947ecb9094eec845da22109502557a5dde2e931d06496c7c"; + version = "0.7.1"; + sha256 = "db24d7da5fbdacbf3ec774c3bc0fd574023f4b00e493267f3275d2dc673eeb45"; libraryHaskellDepends = [ base deepseq text vector ]; description = "A text editor zipper library"; license = stdenv.lib.licenses.bsd3; @@ -169059,6 +169659,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timespan" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "timespan"; + version = "0.1.0.0"; + sha256 = "37500d586e16bad624a5a9419b750abf82e5107e3588dd873d6505e6e56253f8"; + libraryHaskellDepends = [ base time ]; + homepage = "https://github.com/agrafix/timespan#readme"; + description = "Useful timespan datatype and functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "timestamp-subprocess-lines" = callPackage ({ mkDerivation, base, bytestring, old-locale, process, split, time , transformers @@ -169100,12 +169712,11 @@ self: { pname = "timezone-olson"; version = "0.1.7"; sha256 = "232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa"; - revision = "1"; - editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652"; + revision = "2"; + editedCabalFile = "2b056e050fea1cd6133901097f1c5338323f343b31f19bf042ded410ec8d44eb"; libraryHaskellDepends = [ base binary bytestring extensible-exceptions time timezone-series ]; - jailbreak = true; homepage = "http://projects.haskell.org/time-ng/"; description = "A pure Haskell parser and renderer for binary Olson timezone files"; license = stdenv.lib.licenses.bsd3; @@ -169128,7 +169739,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "timezone-series" = callPackage + "timezone-series_0_1_5_1" = callPackage ({ mkDerivation, base, time }: mkDerivation { pname = "timezone-series"; @@ -169139,6 +169750,19 @@ self: { homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "timezone-series" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "timezone-series"; + version = "0.1.6"; + sha256 = "f95ba0ad126009f98a05d1637247b677a32a087cc5036e6cfc22e77f165bdd01"; + libraryHaskellDepends = [ base time ]; + homepage = "http://projects.haskell.org/time-ng/"; + description = "Enhanced timezone handling for Data.Time"; + license = stdenv.lib.licenses.bsd3; }) {}; "timing-convenience" = callPackage @@ -170319,6 +170943,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_4_4" = callPackage + ({ mkDerivation, base, containers, directory, mtl, random, stm + , time, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.4.4"; + sha256 = "da8d580e5fab1d43d791dbcc193fbe028925efdfb1b4bbcd017bccddff4dc382"; + libraryHaskellDepends = [ + base containers directory mtl random stm time transformers + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Making composable programs with multithreading, events and distributed computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -176475,6 +177116,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_10_4" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.10.4"; + sha256 = "b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -182214,6 +182867,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xdcc_1_1_3" = callPackage + ({ mkDerivation, ascii-progress, async, base, bytestring + , case-insensitive, concurrent-output, errors, iproute, irc-client + , irc-dcc, monad-control, network, optparse-applicative, path + , random, safe-exceptions, signal, stm, text, transformers + , transformers-base, unix-compat + }: + mkDerivation { + pname = "xdcc"; + version = "1.1.3"; + sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ascii-progress async base bytestring case-insensitive + concurrent-output errors iproute irc-client irc-dcc monad-control + network optparse-applicative path random safe-exceptions signal stm + text transformers transformers-base unix-compat + ]; + homepage = "https://github.com/JanGe/xdcc"; + description = "A wget-like utility for retrieving files from XDCC bots on IRC"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xdg-basedir" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { @@ -184032,8 +184710,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.18.5"; - sha256 = "90875ae906872f0b2d3cc38f265f11347c80643d4b64a6c5965183e1b700e5c3"; + version = "0.8.18.6"; + sha256 = "587f913263bf871190c24aff57808f346b72906f23ed9c1bb96e9aca63732e0a"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; From 80f38e9032a8fc3af44a04800e1e149f30b00603 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Sep 2016 23:20:26 +0200 Subject: [PATCH 044/234] prometheus service: move to separate folder --- nixos/modules/module-list.nix | 2 +- .../monitoring/{prometheus.nix => prometheus/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename nixos/modules/services/monitoring/{prometheus.nix => prometheus/default.nix} (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8adf1977af..7a74fe2d785 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -287,7 +287,7 @@ ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix - ./services/monitoring/prometheus.nix + ./services/monitoring/prometheus/default.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix diff --git a/nixos/modules/services/monitoring/prometheus.nix b/nixos/modules/services/monitoring/prometheus/default.nix similarity index 100% rename from nixos/modules/services/monitoring/prometheus.nix rename to nixos/modules/services/monitoring/prometheus/default.nix From 0d919d47557d015197b9a81af1cc3948b7f88a11 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 10 Sep 2016 22:49:58 +0200 Subject: [PATCH 045/234] libopus: 1.1.2 -> 1.1.3 --- pkgs/development/libraries/libopus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 07a95887ab4..82bf9a48679 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.2"; + version = "1.1.3"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f"; + sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq"; }; outputs = [ "out" "dev" ]; From 300adc84580c7fdc35112052f168aa714eca977d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 10 Sep 2016 22:50:19 +0200 Subject: [PATCH 046/234] mpd: 0.19.15 -> 0.19.19 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d656e8ded3a..e273bd110e2 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -30,13 +30,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "15"; + minor = "19"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c"; + sha256 = "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw"; }; patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch; From 5646c2aba68bc6d5eb3c20fb37d4c1071de79d60 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 20 Aug 2016 04:32:09 -0400 Subject: [PATCH 047/234] root: add support for x86_64-darwin 1) add pcre dependency (for some reason builtin_pcre doesn't work) 2) Disable dependencies that are currently not supported by the expression. Most users should not need those. These are disabled to prevent cmake from picking them up from system and causing impurities. Once there is a user who needs these they will have to update the expression. 3) disable some OSX detection code that relies on /usr/bin/sw_vers that chooses c++ library, silences warnings and sets macosx-version-min. macosx-version-min is already set by nix using MACOSX_DEPLOYMENT_TARGET environment variable. --- .../science/misc/root/default.nix | 39 +++++++- .../science/misc/root/sw_vers.patch | 90 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/science/misc/root/sw_vers.patch diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 10c777d8601..a736bdad2ea 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python -, libX11, libXpm, libXft, libXext, zlib, lzma, gsl }: +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python +, libX11, libXpm, libXft, libXext, zlib, lzma, gsl, Cocoa }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -10,13 +10,17 @@ stdenv.mkDerivation rec { sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9"; }; - buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma gsl ]; + buildInputs = [ cmake pcre pkgconfig python zlib lzma gsl ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa ] + ; patches = [ (fetchpatch { url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch"; sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; }) + ./sw_vers.patch ]; preConfigure = '' @@ -27,6 +31,33 @@ stdenv.mkDerivation rec { "-Drpath=ON" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-Dalien=OFF" + "-Dbonjour=OFF" + "-Dcastor=OFF" + "-Dchirp=OFF" + "-Ddavix=OFF" + "-Ddcache=OFF" + "-Dfftw3=OFF" + "-Dfitsio=OFF" + "-Dfortran=OFF" + "-Dgfal=OFF" + "-Dgviz=OFF" + "-Dhdfs=OFF" + "-Dkrb5=OFF" + "-Dldap=OFF" + "-Dmonalisa=OFF" + "-Dmysql=OFF" + "-Dodbc=OFF" + "-Dopengl=OFF" + "-Doracle=OFF" + "-Dpgsql=OFF" + "-Dpythia6=OFF" + "-Dpythia8=OFF" + "-Drfio=OFF" + "-Dsqlite=OFF" + "-Dssl=OFF" + "-Dxml=OFF" + "-Dxrootd=OFF" ] ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"; @@ -35,6 +66,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch new file mode 100644 index 00000000000..3de2b839bf4 --- /dev/null +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -0,0 +1,90 @@ +diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh +--- a/build/unix/compiledata.sh ++++ b/build/unix/compiledata.sh +@@ -49,7 +49,7 @@ fi + + if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \ + [ "$ARCH" = "macosxicc" ]; then +- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` ++ macosx_minor=7 + SOEXT="so" + if [ $macosx_minor -ge 5 ]; then + if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then +diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake +--- a/cmake/modules/SetUpMacOS.cmake ++++ b/cmake/modules/SetUpMacOS.cmake +@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6) + #--------------------------------------------------------------------------------------------------------- + + if (CMAKE_SYSTEM_NAME MATCHES Darwin) +- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" +- COMMAND cut -d . -f 1-2 +- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}") +- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" +- COMMAND cut -d . -f 2 +- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE) +- +- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) + set(libcxx ON CACHE BOOL "Build using libc++" FORCE) +- endif() + +- if(${MACOSX_MINOR} GREATER 4) + #TODO: check haveconfig and rpath -> set rpath true + #TODO: check Thread, define link command + #TODO: more stuff check configure script +- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT) +- if(${SYSCTL_OUTPUT} MATCHES 64) +- MESSAGE(STATUS "Found a 64bit system") + set(ROOT_ARCHITECTURE macosx64) + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64") +@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") + SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64") +- else(${SYSCTL_OUTPUT} MATCHES 64) +- MESSAGE(STATUS "Found a 32bit system") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") +- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32") +- endif(${SYSCTL_OUTPUT} MATCHES 64) +- endif() +- +- if(MACOSX_VERSION VERSION_GREATER 10.6) +- set(MACOSX_SSL_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.7) +- set(MACOSX_ODBC_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.8) +- set(MACOSX_GLU_DEPRECATED ON) +- set(MACOSX_KRB5_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.9) +- set(MACOSX_LDAP_DEPRECATED ON) +- endif() + + if (CMAKE_COMPILER_IS_GNUCXX) + message(STATUS "Found GNU compiler collection") +@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + endif() + + #---Set Linker flags---------------------------------------------------------------------- +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib") + + + else (CMAKE_SYSTEM_NAME MATCHES Darwin) +diff --git a/config/root-config.in b/config/root-config.in +--- a/config/root-config.in ++++ b/config/root-config.in +@@ -304,7 +304,7 @@ macosxicc) + ;; + macosx64) + # MacOS X with gcc (GNU cc v4.x) in 64 bit mode +- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` ++ macosx_minor=7 + # cannot find the one linked to libGraf if relocated after built + if [ $macosx_minor -le 4 ]; then + rootlibs="$rootlibs -lfreetype" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9262c8c144a..fccd6e21fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17022,7 +17022,9 @@ in megam = callPackage ../applications/science/misc/megam { }; - root = callPackage ../applications/science/misc/root { }; + root = callPackage ../applications/science/misc/root { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; simgrid = callPackage ../applications/science/misc/simgrid { }; From ce4f1f828366a488003e52369f5515bfb789b0ae Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Mon, 12 Sep 2016 02:12:14 +0300 Subject: [PATCH 048/234] mandb: fix apropos --- pkgs/tools/misc/man-db/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 9724278b608..b049e0706e9 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpipeline db groff ]; troff="${groff}/bin/groff"; + postPatch = '' + substituteInPlace src/man_db.conf.in \ + --replace "/usr/local/share" "/run/current-system/sw/share" \ + --replace "/usr/share" "/run/current-system/sw/share" + ''; + configureFlags = [ "--disable-setuid" "--localstatedir=/var" From ea2270aa7cd60e426481eeeeab3b76ff70a36af5 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 10 Sep 2016 00:36:36 +0200 Subject: [PATCH 049/234] go-md2man: init at 1.0.6 --- .../development/tools/misc/md2man/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/misc/md2man/default.nix diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix new file mode 100644 index 00000000000..9e458f2aca5 --- /dev/null +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }: + +with lib; + +buildGoPackage rec { + name = "go-md2man-${version}"; + version = "1.0.6"; + + goPackagePath = "github.com/cpuguy83/go-md2man"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "cpuguy83"; + repo = "go-md2man"; + sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; + }; + + meta = { + description = "Go tool to convert markdown to man pages"; + license = licenses.mit; + homepage = https://github.com/cpuguy83/go-md2man; + maintainers = with maintainers; [offline]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c199d9b487..6bbe7485177 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6577,6 +6577,8 @@ in maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + go-md2man = callPackage ../development/tools/misc/md2man {}; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; From 71782da1036a0c5d9dd9a5ebf445fd13381a5dee Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 21 May 2016 18:18:24 +0200 Subject: [PATCH 050/234] runc: init at 2016-06-15 --- .../virtualization/runc/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/virtualization/runc/default.nix diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix new file mode 100644 index 00000000000..d6686557364 --- /dev/null +++ b/pkgs/applications/virtualization/runc/default.nix @@ -0,0 +1,62 @@ +{ stdenv, lib, fetchFromGitHub, go-md2man +, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: + +with lib; + +stdenv.mkDerivation rec { + name = "runc-${version}"; + version = "2016-06-15"; + + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "runc"; + rev = "cc29e3dded8e27ba8f65738f40d251c885030a28"; + sha256 = "18fwb3kq10zhhx184yn3j396gpbppy3y4ypb8m2b2pdms39s6pyx"; + }; + + outputs = [ "out" "man" ]; + + hardeningDisable = ["fortify"]; + + buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + + makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; + + preBuild = '' + patchShebangs . + substituteInPlace libcontainer/apparmor/apparmor.go \ + --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser + ''; + + installPhase = '' + install -Dm755 runc $out/bin/runc + + # Include contributed man pages + man/md2man-all.sh -q + manRoot="$man/share/man" + mkdir -p "$manRoot" + for manDir in man/man?; do + manBase="$(basename "$manDir")" # "man1" + for manFile in "$manDir"/*; do + manName="$(basename "$manFile")" # "docker-build.1" + mkdir -p "$manRoot/$manBase" + gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + done + done + ''; + + preFixup = '' + # remove references to go compiler + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out/bin -type f 2>/dev/null) + ''; + + meta = { + homepage = https://runc.io/; + description = "A CLI tool for spawning and running containers according to the OCI specification"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bbe7485177..15c36a61ee1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14655,6 +14655,8 @@ in rubyripper = callPackage ../applications/audio/rubyripper {}; + runc = callPackage ../applications/virtualization/runc {}; + rxvt = callPackage ../applications/misc/rxvt { }; # urxvt From e927620885d404725ca3331a10431417a7255f94 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 21 May 2016 18:19:11 +0200 Subject: [PATCH 051/234] containerd: init at 0.2.3 --- .../virtualization/containerd/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/virtualization/containerd/default.nix diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix new file mode 100644 index 00000000000..6de68ee32f3 --- /dev/null +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub +, go, libapparmor, apparmor-parser, libseccomp }: + +with lib; + +stdenv.mkDerivation rec { + name = "containerd-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = "v${version}"; + sha256 = "0hlvbd5n4v337ywkc8mnbhp9m8lg8612krv45262n87c2ijyx09s"; + }; + + buildInputs = [ go ]; + + preBuild = '' + ln -s $(pwd) vendor/src/github.com/docker/containerd + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + preFixup = '' + # remove references to go compiler + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out/bin -type f 2>/dev/null) + ''; + + meta = { + homepage = https://containerd.tools/; + description = "A daemon to control runC"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15c36a61ee1..0ad71b16a1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12666,6 +12666,8 @@ in conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; conkeror = self.wrapFirefox conkeror-unwrapped { }; + containerd = callPackage ../applications/virtualization/containerd { }; + cpp_ethereum = callPackage ../applications/misc/webthree-umbrella { withOpenCL = true; From 8b96b391db09c8662fb3bb6e46e7422c3103b2a4 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Mon, 12 Sep 2016 01:12:08 +0300 Subject: [PATCH 052/234] gnome2.at_spi: disable hardening to fix build --- pkgs/desktops/gnome-2/platform/at-spi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index e7f3f565902..6be2a440879 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { sha256 = "0fbh0afzw1gm4r2w68b8l0vhnia1qyzdl407vyxfw4v4fkm1v16c"; }; + hardeningDisable = [ "format" ]; + buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi intltool libbonobo ORBit2 GConf dbus_glib ]; } From 605ddb1047b143e755a982cfd87eaeea405d5c51 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Mon, 12 Sep 2016 01:32:10 +0300 Subject: [PATCH 053/234] gnome2.gnome_session: mark as broken --- pkgs/desktops/gnome-2/desktop/gnome-session/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix index ccabff27549..7678cb3a4b4 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower }: +, intltool, libglade, startup_notification, GConf, upower, libSM }: stdenv.mkDerivation { name = "gnome-session-2.32.1"; @@ -11,7 +11,10 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower + GConf upower libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; + + # gconf-sanity-check-2 not found + meta.broken = true; } From 43a8ce0f5eebf351d720612d22c207dc6eb3404a Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Mon, 12 Sep 2016 01:49:53 +0300 Subject: [PATCH 054/234] gtkmathview: mark as broken --- pkgs/development/libraries/gtkmathview/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 8a6914cfcd3..bb2993348fd 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; + broken = true; }; } From e3033d87b3a0cd40d0ccb4d33199f464a57b3374 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Mon, 12 Sep 2016 02:48:20 +0300 Subject: [PATCH 055/234] gnome2.gnome_control_center: add libSM to fix build --- .../gnome-2/desktop/gnome-control-center/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 11f874a0e89..ff4abf26ac8 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -2,7 +2,8 @@ , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 , glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon -, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}: +, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 +, libSM }: stdenv.mkDerivation { name = "gnome-control-center-2.32.1"; @@ -14,6 +15,8 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ]; + libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon + libSM + ]; configureFlags = "--disable-scrollkeeper"; } From 241fa7fa26cd3e6051529b9b3d22f80649d04e6e Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Mon, 12 Sep 2016 02:41:11 +0300 Subject: [PATCH 056/234] gnome2.gnome_settings_daemon: add libSM to fix build --- .../gnome-2/desktop/gnome-settings-daemon/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 93dfa544ea9..37f99539686 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }: +, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +, libSM }: stdenv.mkDerivation { name = "gnome-settings-daemon-2.32.1"; @@ -11,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit - libpulseaudio + libpulseaudio libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; From 25a7ded89c7a996ac5b81735562f7c66c50cfd2e Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Sun, 11 Sep 2016 19:47:08 -0700 Subject: [PATCH 057/234] audio services: use mkEnableOption (#18524) --- nixos/modules/services/audio/mopidy.nix | 8 +------- nixos/modules/services/audio/ympd.nix | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 029b14ab472..c0a0f037429 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -21,13 +21,7 @@ in { services.mopidy = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable Mopidy, a music player daemon. - ''; - }; + enable = mkEnableOption "Mopidy, a music player daemon"; dataDir = mkOption { default = "/var/lib/mopidy"; diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix index fb8b868ed40..d34c1c9d83c 100644 --- a/nixos/modules/services/audio/ympd.nix +++ b/nixos/modules/services/audio/ympd.nix @@ -12,11 +12,7 @@ in { services.ympd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable ympd, the MPD Web GUI."; - }; + enable = mkEnableOption "ympd, the MPD Web GUI"; webPort = mkOption { type = types.string; From 8d8f57d4aa8bf0aa3b7301a751b5240646981e42 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Mon, 12 Sep 2016 01:01:14 -0400 Subject: [PATCH 058/234] mention-bot: notify me when darwin stdenv stuff changes --- .mention-bot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mention-bot b/.mention-bot index 64f0ed854c4..8aeeedace10 100644 --- a/.mention-bot +++ b/.mention-bot @@ -4,7 +4,8 @@ "jhasse" ], "alwaysNotifyForPaths": [ - { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] } + { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, + { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] } ], "fileBlacklist": ["pkgs/top-level/all-packages.nix"] } From 99e06fe771c76b88c3bd0b179297da906867b7d1 Mon Sep 17 00:00:00 2001 From: Jesse Haber-Kucharsky Date: Mon, 12 Sep 2016 04:44:50 -0400 Subject: [PATCH 059/234] opam, aspcud: init packages for external solver (#16938) The opam package manager relies on external solvers to determine package management decisions it makes related to upgrades, new installations, etc. While, strictly speaking, an external solver is optional, aspcud is highly recommended in documentation. Furthermore, even having a relatively small number of packages installed quickly causes the limits of the interal solver to be reached (before it times out). Aspcud itself depends on two programs from the same suite: gringo, and clasp. On Darwin, Boost 1.55 (and thus Gringo) do not build, so we only support Aspcud on non-Darwin platforms. --- lib/maintainers.nix | 1 + pkgs/development/tools/ocaml/opam/default.nix | 14 +++++- pkgs/tools/misc/aspcud/default.nix | 44 +++++++++++++++++++ pkgs/tools/misc/clasp/default.nix | 32 ++++++++++++++ pkgs/tools/misc/gringo/default.nix | 39 ++++++++++++++++ .../misc/gringo/gringo-4.5.4-cmath.patch | 11 +++++ pkgs/top-level/all-packages.nix | 8 ++++ 7 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/misc/aspcud/default.nix create mode 100644 pkgs/tools/misc/clasp/default.nix create mode 100644 pkgs/tools/misc/gringo/default.nix create mode 100644 pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0e5740a6c32..b9bf6661671 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -168,6 +168,7 @@ grahamc = "Graham Christensen "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; + hakuch = "Jesse Haber-Kucharsky "; havvy = "Ryan Scheel "; hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 0d765ec93bb..afa480296f6 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: +{ stdenv, fetchgit, fetchurl, makeWrapper, + ocaml, unzip, ncurses, curl, + aspcudSupport ? !stdenv.isDarwin, aspcud +}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; @@ -45,7 +48,7 @@ in stdenv.mkDerivation rec { name = "opam-${version}"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml ]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper]; src = srcs.opam; @@ -69,6 +72,13 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; + postInstall = + if aspcudSupport then '' + wrapProgram $out/bin/opam \ + --suffix PATH : ${aspcud}/bin + '' + else ""; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix new file mode 100644 index 00000000000..577c0a33b3e --- /dev/null +++ b/pkgs/tools/misc/aspcud/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, + boost, clasp, cmake, gringo, re2c +}: + +let + version = "1.9.0"; +in + +stdenv.mkDerivation rec { + name = "aspcud-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; + sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; + }; + + buildInputs = [ boost clasp cmake gringo re2c ]; + + buildPhase = '' + cmake -DCMAKE_BUILD_TYPE=Release \ + -DGRINGO_LOC=${gringo}/bin/gringo \ + -DCLASP_LOC=${clasp}/bin/clasp \ + -DENCODING_LOC=$out/share/aspcud/specification.lp \ + . + + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/{aspcud,cudf2lp,lemon} $out/bin + + mkdir -p $out/share/aspcud + cp ../share/aspcud/specification.lp $out/share/aspcud + ''; + + meta = with stdenv.lib; { + description = "Solver for package problems in CUDF format using ASP"; + homepage = http://potasssco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix new file mode 100644 index 00000000000..135eda554b3 --- /dev/null +++ b/pkgs/tools/misc/clasp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +let + version = "3.1.4"; +in + +stdenv.mkDerivation { + name = "clasp-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; + sha256 = "1zkjqc4gp4n9p2kf3k3z8x82g42any4p3shhhivny89z1jlxi9zn"; + }; + + preConfigure = "patchShebangs ./configure.sh"; + configureScript = "./configure.sh"; + + preBuild = "cd build/release"; + + installPhase = '' + mkdir -p $out/bin + cp bin/clasp $out/bin/clasp + ''; + + meta = with stdenv.lib; { + description = "Answer set solver for (extended) normal and disjunctive logic programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.all; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix new file mode 100644 index 00000000000..ae71c01314c --- /dev/null +++ b/pkgs/tools/misc/gringo/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, + bison, re2c, scons +}: + +let + version = "4.5.4"; +in + +stdenv.mkDerivation rec { + name = "gringo-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; + sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; + }; + + buildInputs = [ bison re2c scons ]; + + patches = [ + ./gringo-4.5.4-cmath.patch + ]; + + buildPhase = '' + scons --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/gringo $out/bin/gringo + ''; + + meta = with stdenv.lib; { + description = "Converts input programs with first-order variables to equivalent ground programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch new file mode 100644 index 00000000000..7b5510e2344 --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 ++++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 +@@ -22,6 +22,8 @@ + #include "gringo/logger.hh" + #include "gringo/graph.hh" + ++#include ++ + namespace Gringo { + + // {{{ definition of Defines diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9262c8c144a..a70e553b2d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -536,6 +536,10 @@ in }; aria = self.aria2; + aspcud = callPackage ../tools/misc/aspcud { + boost = boost155; + }; + at = callPackage ../tools/system/at { }; atftp = callPackage ../tools/networking/atftp { }; @@ -710,6 +714,8 @@ in ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clasp = callPackage ../tools/misc/clasp { }; + cli53 = callPackage ../tools/admin/cli53 { }; cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; @@ -843,6 +849,8 @@ in gmic = callPackage ../tools/graphics/gmic { }; + gringo = callPackage ../tools/misc/gringo { }; + gti = callPackage ../tools/misc/gti { }; heatseeker = callPackage ../tools/misc/heatseeker { }; From 3e5fe418f8342d2e85cd88529eda9868fd4e649a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 6 Sep 2016 20:01:48 +0200 Subject: [PATCH 060/234] android-studio: enable Android emulator support These changes are needed to be able to run the system emulator (QEMU) from Android Studio. In addition to the added dependencies, $LD_LIBRARY_PATH had to be changed from --set to --prefix, so that libGL is found (on NixOS). --- .../editors/android-studio/default.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4d972a54e37..4e16ceedbbb 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -3,18 +3,25 @@ , coreutils , fetchurl , findutils +, file , git +, glxinfo , gnugrep , gnutar , gzip , jdk +, libpulseaudio +, libX11 , libXrandr , makeWrapper +, pciutils , pkgsi686Linux +, setxkbmap , stdenv , unzip , which , writeTextFile +, xkeyboard_config , zlib }: @@ -40,6 +47,12 @@ let jdk which + # For Android emulator + file + glxinfo + pciutils + setxkbmap + # Used during setup wizard gnutar gzip @@ -47,17 +60,22 @@ let # Runtime stuff git - ]}" --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ + ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Gradle wants libstdc++.so.6 stdenv.cc.cc.lib # mksdcard wants 32 bit libstdc++.so.6 pkgsi686Linux.stdenv.cc.cc.lib + # aapt wants libz.so.1 zlib pkgsi686Linux.zlib # Support multiple monitors libXrandr - ]}" + + # For Android emulator + libpulseaudio + libX11 + ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; From d6404ad48eb068709d919ab82b9720ca39571f5d Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Sat, 10 Sep 2016 21:18:48 -0400 Subject: [PATCH 061/234] cabin: init at 1.005 --- lib/maintainers.nix | 1 + pkgs/data/fonts/cabin/default.nix | 39 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/data/fonts/cabin/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b9bf6661671..bdb89cf9b88 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -86,6 +86,7 @@ cko = "Christine Koppelt "; cleverca22 = "Michael Bishop "; cmcdragonkai = "Roger Qiu "; + cmfwyp = "cmfwyp "; coconnor = "Corey O'Connor "; codsl = "codsl "; codyopel = "Cody Opel "; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix new file mode 100644 index 00000000000..8e432db8418 --- /dev/null +++ b/pkgs/data/fonts/cabin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "cabin-1.005"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A humanist sans with 4 weights and true italics"; + longDescription = '' + The Cabin font family is a humanist sans with 4 weights and true italics, + inspired by Edward Johnston’s and Eric Gill’s typefaces, with a touch of + modernism. Cabin incorporates modern proportions, optical adjustments, and + some elements of the geometric sans. It remains true to its roots, but has + its own personality. + + The weight distribution is almost monotone, although top and bottom curves + are slightly thin. Counters of the b, g, p and q are rounded and optically + adjusted. The curved stem endings have a 10 degree angle. E and F have + shorter center arms. M is splashed. + ''; + homepage = http://www.impallari.com/cabin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dde5a1d683a..d3b7c95e5a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12017,6 +12017,8 @@ in docbook5_xsl = self.docbook_xsl_ns; + cabin = callPackage ../data/fonts/cabin { }; + dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; From 49e5e972b95925b41e91dd6479e03d37eeeb3c64 Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Sat, 10 Sep 2016 21:20:26 -0400 Subject: [PATCH 062/234] dosis: init at 1.007 --- pkgs/data/fonts/dosis/default.nix | 38 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/fonts/dosis/default.nix diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix new file mode 100644 index 00000000000..28b9ee2f1e7 --- /dev/null +++ b/pkgs/data/fonts/dosis/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "dosis-1.007"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A very simple, rounded, sans serif family"; + longDescription = '' + Dosis is a very simple, rounded, sans serif family. + + The lighter weights are minimalist. The bolder weights have more + personality. The medium weight is nice and balanced. The overall result is + a family that's clean and modern, and can express a wide range of + voices & feelings. + + It comes in 7 incremental weights: ExtraLight, Light, Book, Medium, + Semibold, Bold & ExtraBold + ''; + homepage = http://www.impallari.com/dosis; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3b7c95e5a0..dd10f5900ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12019,6 +12019,8 @@ in cabin = callPackage ../data/fonts/cabin { }; + dosis = callPackage ../data/fonts/dosis { }; + dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; From 470855ed82091ed22edb51c4544ccf2ea9c1df93 Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Sat, 10 Sep 2016 21:24:58 -0400 Subject: [PATCH 063/234] encode-sans: init at 1.002 --- pkgs/data/fonts/encode-sans/default.nix | 35 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/data/fonts/encode-sans/default.nix diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix new file mode 100644 index 00000000000..e0f79b2722c --- /dev/null +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "encode-sans-1.002"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Encode-Sans"; + rev = "11162b46892d20f55bd42a00b48cbf06b5871f75"; + sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A versatile sans serif font family"; + longDescription = '' + The Encode Sans family is a versatile workhorse. Featuring a huge range of + weights and widths, it's ready for all kind of typographic challenges. It + also includes Tabular and Old Style figures, as well as full set of Small + Caps and other Open Type features. + + Designed by Pablo Impallari and Andres Torresi. + ''; + homepage = http://www.impallari.com/projects/overview/encode; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd10f5900ed..c111199e870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12034,6 +12034,8 @@ in inherit (pythonPackages) scfbuild; }; + encode-sans = callPackage ../data/fonts/encode-sans { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; From 74de2c6b035e2ccd8692eecfd6e20b5716d792a9 Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Sat, 10 Sep 2016 21:27:30 -0400 Subject: [PATCH 064/234] libre-baskerville: init at 1.000 --- pkgs/data/fonts/libre-baskerville/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/fonts/libre-baskerville/default.nix diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix new file mode 100644 index 00000000000..64779b5d388 --- /dev/null +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-baskerville-1.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A webfont family optimized for body text"; + longDescription = '' + Libre Baskerville is a webfont family optimized for body text. It's Based + on 1941 ATF Baskerville Specimens but it has a taller x-height, wider + counters and less contrast that allow it to work on small sizes in any + screen. + ''; + homepage = http://www.impallari.com/projects/overview/libre-baskerville; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c111199e870..a4da3d184ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12101,6 +12101,8 @@ in libertine = callPackage ../data/fonts/libertine { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmodern = callPackage ../data/fonts/lmodern { }; From db73ecc0f7e31010040563d2c5f14352afb647ce Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Sat, 10 Sep 2016 21:28:14 -0400 Subject: [PATCH 065/234] libre-bodoni: init at 2.000 --- pkgs/data/fonts/libre-bodoni/default.nix | 38 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/fonts/libre-bodoni/default.nix diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix new file mode 100644 index 00000000000..691d5556e8f --- /dev/null +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-bodoni-2.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Bodoni fonts adapted for today's web requirements"; + longDescription = '' + The Libre Bodoni fonts are based on the 19th century Morris Fuller + Benton's ATF design, but specifically adapted for today's web + requirements. + + They are a perfect choice for everything related to elegance, style, + luxury and fashion. + + Libre Bodoni currently features four styles: Regular, Italic, Bold and + Bold Italic. + ''; + homepage = https://github.com/impallari/Libre-Bodoni; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4da3d184ed..d55115eebda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12103,6 +12103,8 @@ in libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; + libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmodern = callPackage ../data/fonts/lmodern { }; From 323e74f457ee8d3a10a23abd38c83b2724a6f435 Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Sat, 10 Sep 2016 21:33:58 -0400 Subject: [PATCH 066/234] libre-caslon: init at 1.002 --- pkgs/data/fonts/libre-caslon/default.nix | 42 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/data/fonts/libre-caslon/default.nix diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix new file mode 100644 index 00000000000..5037cb81f39 --- /dev/null +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-caslon-${version}"; + version = "1.002"; + + srcs = [ + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Text"; + rev = "c31e21f7e8cf91f18d90f778ce20e66c68219c74"; + name = "libre-caslon-text-${version}-src"; + sha256 = "0zczv9qm8cgc7w1p64mnf0p0fi7xv89zhf1zzf1qcna15kbgc705"; + }) + + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Display"; + rev = "3491f6a9cfde2bc15e736463b0bc7d93054d5da1"; + name = "libre-caslon-display-${version}-src"; + sha256 = "12jrny3y8w8z61lyw470drnhliji5b24lgxap4w3brp6z3xjph95"; + }) + ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; + homepage = http://www.impallari.com/librecaslon; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d55115eebda..c2eb5f2ea32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12105,6 +12105,8 @@ in libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; + libre-caslon = callPackage ../data/fonts/libre-caslon { }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmodern = callPackage ../data/fonts/lmodern { }; From 4659e2d54b24cb2ebc16dfe3972af31479aa5080 Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Sat, 10 Sep 2016 21:36:43 -0400 Subject: [PATCH 067/234] libre-franklin: init at 1.014 --- pkgs/data/fonts/libre-franklin/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/libre-franklin/default.nix diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix new file mode 100644 index 00000000000..473102d77ef --- /dev/null +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-franklin-1.014"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; + homepage = https://github.com/impallari/Libre-Franklin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2eb5f2ea32..686530b1323 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12107,6 +12107,8 @@ in libre-caslon = callPackage ../data/fonts/libre-caslon { }; + libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmodern = callPackage ../data/fonts/lmodern { }; From 4da51ec63766742a51d81f1451894d9dcb7e4cfa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2016 10:13:01 +0200 Subject: [PATCH 068/234] structured-haskell-mode: link Haskell libraries statically into this executable It's my understanding that Emacs runs the "structured-haskell-mode" binary virtually every time you press a key in an Haskell buffer, and since dynamically linked Haskell binaries take *much* longer to start up, switching this particular package to statically linked libraries ought to result in a performance boost. --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1b02e464c3b..42734e08cd3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -764,8 +764,12 @@ self: super: { ''; }); - # Byte-compile elisp code for Emacs. + # Fine-tune the build. structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: { + # Statically linked Haskell libraries make the tool start-up much faster, + # which is important for use in Emacs. + enableSharedExecutables = false; + # Byte-compile elisp code for Emacs. executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; postInstall = '' local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) From 79ab2f3b32efc397b6aa735904137d8257978f12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2016 11:14:06 +0200 Subject: [PATCH 069/234] haskell-timezone-series: block version 1.6 update The new version's build is completely broken: https://github.com/ygale/timezone-series/issues/2. --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index b09680574b0..a18ee496012 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -55,10 +55,11 @@ self: super: { }) {}; # https://github.com/ygale/timezone-series/issues/2 - timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch { + timezone-series_0_1_5_1 = appendPatch super.timezone-series_0_1_5_1 (pkgs.fetchpatch { url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; }); + timezone-series = self.timezone-series_0_1_5_1; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { From 3adbc07af7529d7aaf30f22783b76eeda3ba351a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 12 Sep 2016 11:45:53 +0200 Subject: [PATCH 070/234] matrix-synapse: 0.17.1 -> 0.17.2 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 57abffa601f..b4f34b452a7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,13 +12,13 @@ let in buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "04wl6lznffxhvfq52cmbg2amkl03454wyaqc17i0zlc6b0p14dli"; + sha256 = "0171pp7phizg5j78i1srkx2hj4fqi0qn66sn6x4gshv9grncjsgw"; }; patches = [ ./matrix-synapse.patch ]; From 38f074435a3a4a92ca0950e33cea1554f364fe70 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 12 Sep 2016 06:12:16 -0400 Subject: [PATCH 071/234] melpa: Fix nix-buffer and inherit-local, add stable --- .../editors/emacs-modes/melpa-generated.nix | 8 ++-- .../emacs-modes/melpa-stable-generated.nix | 42 +++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index e1382d6d50b..dea17a86b90 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -33345,8 +33345,8 @@ sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50751b5f9843fde00505edd281e404ec1d875713/recipes/inherit-local"; - sha256 = "0j785xb72nk04x6jb9x5pdwp3dkalqmy208mvj4ss4fm559qfp3i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; name = "inherit-local"; }; packageRequires = [ emacs ]; @@ -42882,8 +42882,8 @@ sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4de2a8cbf1180ec7ca1648f497538b8dbf7a3945/recipes/nix-buffer"; - sha256 = "1svx1wg05fajxzjz95dfg072i6nfydr0ir4q1zhdxg1igkffqsml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; name = "nix-buffer"; }; packageRequires = [ emacs f ]; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index e310064cb49..993b9b4e50e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -16203,6 +16203,27 @@ license = lib.licenses.free; }; }) {}; + inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inherit-local"; + version = "1.1"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "inherit-local"; + rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; + sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; + name = "inherit-local"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inherit-local"; + license = lib.licenses.free; + }; + }) {}; init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; @@ -20413,6 +20434,27 @@ license = lib.licenses.free; }; }) {}; + nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nix-buffer"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-buffer"; + rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b"; + sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; + name = "nix-buffer"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/nix-buffer"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; From 242cea8a6353f22d5c06127eaf858cf07c14fa7d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 12 Sep 2016 12:45:14 +0200 Subject: [PATCH 072/234] libreoffice: generate-libreoffice-srcs.sh: take into account that LO now sometimes lets the checksum go after the tarball --- .../libreoffice/generate-libreoffice-srcs.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh index 0c92a1c5553..2367fa1c7f4 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh @@ -18,20 +18,27 @@ write_entry(){ eval "echo -n \"\$additions_${name%%[-_.]*}\"" eval "test -n \"\$additions_${name%%[-_.]*}\" && echo" echo '}' + saved_line= } +saved_line= cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" | while read line; do case "$line" in EVAL\ *) echo "${line#* }" >&2; eval "${line#* }"; + saved_line= ;; \#*) echo Skipping comment: "$line" >&2; ;; *_MD5SUM\ :=*) - read tbline; + if test -n "$saved_line"; then + tbline="$saved_line" + else + read tbline; + fi; line=${line##* }; line=${line##*:=}; if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then @@ -59,7 +66,11 @@ while read line; do name=${line:33}; name="${name%)}" brief=false; - write_entry; + if test -n "$name"; then + write_entry; + else + saved_line="$line"; + fi ;; *) echo Skipping: "$line" >&2; From 357d544d232f7143c914b02be4f4a4f4b5abd5a3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 12 Sep 2016 12:45:38 +0200 Subject: [PATCH 073/234] libreoffice-fresh: 5.2.0.4 -> 5.2.1.2 --- pkgs/applications/office/libreoffice/default.nix | 10 +++++----- .../office/libreoffice/libreoffice-srcs.nix | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index caf500d2b97..9cd1389ab0a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -23,8 +23,8 @@ let langsSpaces = lib.concatStringsSep " " langs; major = "5"; minor = "2"; - patch = "0"; - tweak = "4"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -50,14 +50,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0a3dnqm9k1skp7jvg354fdn84y0ylvnjzpd4v2r2mbz8vc4p3ld5"; + sha256 = "1ahdz1ynbab001441lqqlfphysr867rjcndq93z66mr5v3r1spvm"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1gyakwbbsd3aykf0gsanyg6p4g4qixj1rh6qxspln70afl3kxm90"; + sha256 = "0mln1mqy3c7k4c449w5knjnc4dv0ckl0i7q47p2pldxjjf5n2887"; }; }; @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1v3bbk2afq61gs3l4qvc1r6y0ylr21jzbm3wcnyq9c3bbyw43pj7"; + sha256 = "14g2xwpid4vsgmc69rs7hz1wx96dfkq0cbm32vjgljsm7a19qfc1"; }; # Openoffice will open libcups dynamically, so we link it directly diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 219b7e20632..5240edcf5d1 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -290,8 +290,8 @@ brief = true; } { - name = "language-subtag-registry-2016-02-10.tar.bz2"; - md5 = "d1e7c55a0383f7d720d3ead0b6117284"; + name = "language-subtag-registry-2016-07-19.tar.bz2"; + md5 = "8a037dc60b16bf8c5fe871b33390a4a2"; brief = true; } { @@ -436,13 +436,13 @@ brief = false; } { - name = "libpng-1.6.19.tar.gz"; - md5 = "3121bdc77c365a87e054b9f859f421fe"; + name = "libpng-1.6.24.tar.gz"; + md5 = "65213080dd30a9b16193d9b83adc1ee9"; brief = true; } { - name = "poppler-0.26.4.tar.gz"; - md5 = "35c0660065d023365e9854c13e289d12"; + name = "poppler-0.46.0.tar.bz2"; + md5 = "38c758d84437378ec4f5aae9f875301d"; brief = true; } { From 11bc6ea4aee4cd88b885fcacc3acdb2296b749af Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 12 Sep 2016 13:01:34 +0200 Subject: [PATCH 074/234] firejail: 0.9.42-rc1 -> 0.9.42 --- pkgs/os-specific/linux/firejail/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index ce2f860efc8..30fdbadd87b 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,10 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.42-rc1"; + version="0.9.42"; name="${baseName}-${version}"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42~rc1.tar.bz2"; - sha256="11br6xp86bxs1ic2x683hbvg1hk8v2wp8cw6blj0zz3cdl0pcjqf"; + hash="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42.tar.xz"; + sha256="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg"; }; buildInputs = [ which From d1bf595cc57be0cafecfd12f2ce4e35cbc1211bd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 12 Sep 2016 13:08:51 +0200 Subject: [PATCH 075/234] wine: 1.8.3 -> 1.8.4; wineUnstable: 1.9.16 -> 1.9.18 --- pkgs/misc/emulators/wine/sources.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 92ed55be2de..ed766e54bac 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "1.8.3"; + version = "1.8.4"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "0v3sq5zzj3z5pw1aicn7i03pgf41cr9fr0vg1sazwfxrmbvwvknp"; + sha256 = "0yahh1n3s3y0bp1a1sr3zpna56749jdgr85hwmpq393pjx1i0pai"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.16"; + version = "1.9.18"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "010gjib4nhrn9j9q12v5irda8df8xp17a6v6qqskkadd79kxc871"; + sha256 = "1n38697v707j489ljd6b2k1yvrarflc0yn847jas1ida1nm4nq96"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.44"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0rcy0i36jxv2akczd4sfrdmlsqxmj5v0wzvqb3xl8p2mldk9i8yl"; + sha256 = "0gpxzv85x181dz3arp8xmjz2y0gchna54wjv2a1jg3mqaf3bp4dj"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 44dc13aad6442406540f899f9fd08d87ab4ee5d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 12 Sep 2016 14:19:18 +0200 Subject: [PATCH 076/234] mendeley: 1.16.2 -> 1.16.3 --- pkgs/applications/office/mendeley/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7ccf66c055e..9409ab3e669 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -12,14 +12,14 @@ let then "i386" else "amd64"; - shortVersion = "1.16.2-stable"; + shortVersion = "1.16.3-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "08f61972d5a5e491fcd3d4cf5dfe59ad7e07b3883b7ad50d440868c3057af6fb" - else "9bd139b236143f78b23ff4271c01a20c059622abe9dd125e771e0b5db16b7b7b"; + then "14cxysn1l6s6z8awmqj1glm4146jif0852wiyhjg1dhhh25cvpbv" + else "1hdvawj8g4hpj36xy5ys27h1fa76xcdx8apsxa6hpg5xmxvcamqz"; deps = [ gcc.cc From b8ed622bbbe9811cd3c21c45c5277fca523c45eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Aug 2016 21:26:53 +0200 Subject: [PATCH 077/234] lua-sockets: fix on darwin --- pkgs/top-level/lua-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c065ac8290a..83499fa3218 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -192,6 +192,11 @@ let patchPhase = '' sed -e "s,^LUAPREFIX_linux.*,LUAPREFIX_linux=$out," \ -i src/makefile + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export PLAT=macosx + export LUAPREFIX_macosx=$out + substituteInPlace src/Makefile --replace gcc cc \ + --replace 10.3 10.5 ''; meta = { From 637412e37345ec204af6f388ab0b77664f38fa2a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Aug 2016 21:35:38 +0200 Subject: [PATCH 078/234] mpv: fix on darwin --- pkgs/applications/video/mpv/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ac4718d9eb2..88b2f9d0945 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets, libuchardet, rubberband +, lua, lua5_sockets, libuchardet, libiconv ? null, darwin , x11Support ? true, mesa ? null, @@ -13,18 +13,19 @@ wayland ? null, libxkbcommon ? null +, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , sdl2Support ? true, SDL2 ? null -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? !stdenv.isDarwin, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? true, libdvdread ? null -, dvdnavSupport ? true, libdvdnav ? null +, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null +, dvdnavSupport ? dvdreadSupport, libdvdnav ? null , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , libpngSupport ? true, libpng ? null @@ -39,11 +40,12 @@ with stdenv.lib; -let +let available = x: x != null; in assert x11Support -> all available [mesa libX11 libXext libXxf86vm]; assert waylandSupport -> all available [wayland libxkbcommon]; +assert rubberbandSupport -> available rubberband; assert xineramaSupport -> x11Support && available libXinerama; assert xvSupport -> x11Support && available libXv; assert sdl2Support -> available SDL2; @@ -109,7 +111,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg freetype libass libpthreadstubs - lua lua5_sockets libuchardet rubberband + lua lua5_sockets libuchardet ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora @@ -118,6 +120,10 @@ in stdenv.mkDerivation rec { ++ optional bluraySupport libbluray ++ optional jackaudioSupport libjack2 ++ optional pulseSupport libpulseaudio + ++ optional stdenv.isDarwin libiconv + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa CoreAudio ]) + ++ optional rubberbandSupport rubberband ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau ++ optional speexSupport speex @@ -158,7 +164,7 @@ in stdenv.mkDerivation rec { homepage = http://mpv.io; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fuuzetsu ]; - platforms = platforms.linux; + platforms = platforms.darwin ++ platforms.linux; longDescription = '' mpv is a free and open-source general-purpose video player, From 294281596833b8d83ba90c03b792d31b868f46d7 Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Sat, 10 Sep 2016 11:40:06 +0200 Subject: [PATCH 079/234] virtualbox: 5.0.26 -> 5.1.4 --- .../virtualization/virtualbox/default.nix | 32 ++++++++----- .../virtualbox/guest-additions/default.nix | 2 +- .../virtualization/virtualbox/libressl.patch | 47 +++++++++++++++++++ 3 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/libressl.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8bcf122132e..161e3ab35bd 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, libXrandr +{ stdenv, buildEnv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext +, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 +, libXrandr, libXinerama , which, alsaLib, curl, libvpx, gawk, nettools, dbus , xorriso, makeself, perl, pkgconfig, nukeReferences , javaBindings ? false, jdk ? null @@ -20,7 +20,7 @@ let # revision/hash as well. See # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS # for hashes. - version = "5.0.26"; + version = "5.1.4"; forEachModule = action: '' for mod in \ @@ -41,12 +41,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "108824"; + extpackRevision = "110228"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - sha256 = "2f2302c7ba3d00a1258fe8e7767a6eb08dccdc3c31f6e3eeb74063c2c268b104"; + sha256 = "9462ff1b567c37ad9a33c0c7ca1925776615ec89b5a72563f29a8cc8514cf316"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) available at: @@ -60,23 +60,28 @@ let ''; }; + vbox-qt5-env = buildEnv { + name = "vbox-qt5-env-${version}"; + paths = [ qt5.qtbase.dev qt5.qtbase.out qt5.qtx11extras.dev qt5.qtx11extras.out qt5.qttools.dev ]; + }; + in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e"; + sha256 = "b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf"; }; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu nukeReferences ] + pkgconfig which libXmu nukeReferences libpng ] ++ optional javaBindings jdk ++ optional pythonBindings python ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr libpng ] - ++ optionals (!headless) [ qt4 SDL ]; + ++ optionals (headless) [ libXrandr ] + ++ optionals (!headless) [ vbox-qt5-env libXinerama SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; @@ -103,11 +108,12 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch; + patches = optional enableHardening ./hardened.patch + ++ [ ./libressl.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ - src/apps/adpctl/VBoxNetAdpCtl.cpp + src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp ''; # first line: ugly hack, and it isn't yet clear why it's a problem @@ -135,7 +141,7 @@ in stdenv.mkDerivation { ./configure \ ${optionalString headless "--build-headless"} \ - ${optionalString (!headless) "--with-qt4-dir=${qt4}"} \ + ${optionalString (!headless) "--with-qt-dir=${vbox-qt5-env}"} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ ${optionalString (!pulseSupport) "--disable-pulse"} \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 56e02519792..0a6293462b8 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "7458ee5a7121a7d243fd6a7528ba427945d9120c5efc7cd75b3951fb01f09c59"; + sha256 = "e385b698338003595f6cdeee7b631ec6713058ba1227d1f2a1da342bdf741982"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/libressl.patch b/pkgs/applications/virtualization/virtualbox/libressl.patch new file mode 100644 index 00000000000..db9b7e7a59d --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/libressl.patch @@ -0,0 +1,47 @@ +diff --git a/src/VBox/Runtime/common/crypto/digest-builtin.cpp b/src/VBox/Runtime/common/crypto/digest-builtin.cpp +index 66b4304..1aaceff 100644 +--- a/src/VBox/Runtime/common/crypto/digest-builtin.cpp ++++ b/src/VBox/Runtime/common/crypto/digest-builtin.cpp +@@ -561,7 +561,7 @@ static PCRTCRDIGESTDESC const g_apDigestOps[] = + * OpenSSL EVP. + */ + +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + /** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */ + static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void) + { +@@ -597,7 +597,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b + if (fReInit) + { + pEvpType = EVP_MD_CTX_md(pThis); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -616,7 +616,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b + static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState) + { + EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState; +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -661,13 +661,13 @@ static RTCRDIGESTDESC const g_rtCrDigestOpenSslDesc = + NULL, + RTDIGESTTYPE_UNKNOWN, + EVP_MAX_MD_SIZE, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + 0, + # else + sizeof(EVP_MD_CTX), + # endif + 0, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + rtCrDigestOsslEvp_New, + rtCrDigestOsslEvp_Free, + # else From bccd75094fd5108b3d834ad3a86e056eed3b0337 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Mon, 12 Sep 2016 00:24:51 +0300 Subject: [PATCH 080/234] treewide: explicitly specify gtk and related package versions --- pkgs/applications/audio/ams-lv2/default.nix | 4 +- pkgs/applications/audio/ardour/ardour3.nix | 4 +- pkgs/applications/audio/ardour/default.nix | 4 +- pkgs/applications/audio/audacity/default.nix | 4 +- pkgs/applications/audio/beast/default.nix | 4 +- .../audio/bitwig-studio/default.nix | 4 +- pkgs/applications/audio/calf/default.nix | 4 +- pkgs/applications/audio/eq10q/default.nix | 4 +- pkgs/applications/audio/faust/faust2alsa.nix | 4 +- pkgs/applications/audio/faust/faust2jack.nix | 4 +- pkgs/applications/audio/gigedit/default.nix | 4 +- pkgs/applications/audio/gjay/default.nix | 4 +- pkgs/applications/audio/gmpc/default.nix | 4 +- pkgs/applications/audio/guitarix/default.nix | 4 +- pkgs/applications/audio/ingen/default.nix | 4 +- pkgs/applications/audio/jack-rack/default.nix | 4 +- pkgs/applications/audio/jalv/default.nix | 4 +- pkgs/applications/audio/lash/default.nix | 4 +- pkgs/applications/audio/lingot/default.nix | 4 +- .../applications/audio/mhwaveedit/default.nix | 4 +- pkgs/applications/audio/morituri/default.nix | 2 +- pkgs/applications/audio/mp3info/default.nix | 4 +- pkgs/applications/audio/paprefs/default.nix | 4 +- pkgs/applications/audio/patchage/default.nix | 6 +- pkgs/applications/audio/petrifoo/default.nix | 4 +- pkgs/applications/audio/praat/default.nix | 4 +- pkgs/applications/audio/qtractor/default.nix | 4 +- pkgs/applications/audio/quodlibet/default.nix | 4 +- pkgs/applications/audio/seq24/default.nix | 4 +- pkgs/applications/audio/spotify/default.nix | 8 +- .../audio/xsynth-dssi/default.nix | 4 +- pkgs/applications/editors/atom/env.nix | 4 +- .../applications/editors/brackets/default.nix | 4 +- .../editors/codeblocks/default.nix | 4 +- .../editors/eclipse/build-eclipse.nix | 4 +- pkgs/applications/editors/eclipse/default.nix | 6 +- pkgs/applications/editors/geany/with-vte.nix | 4 +- pkgs/applications/editors/gobby/default.nix | 4 +- pkgs/applications/editors/leafpad/default.nix | 4 +- .../editors/lighttable/default.nix | 4 +- .../editors/monodevelop/default.nix | 8 +- pkgs/applications/editors/scite/default.nix | 4 +- pkgs/applications/editors/sublime/default.nix | 4 +- .../applications/editors/sublime3/default.nix | 4 +- .../editors/supertux-editor/default.nix | 8 +- .../editors/textadept/default.nix | 4 +- .../applications/editors/vim/configurable.nix | 4 +- .../graphics/ahoviewer/default.nix | 4 +- .../graphics/cinepaint/default.nix | 4 +- pkgs/applications/graphics/dia/default.nix | 4 +- .../applications/graphics/gcolor2/default.nix | 4 +- pkgs/applications/graphics/geeqie/default.nix | 4 +- pkgs/applications/graphics/gimp/2.8.nix | 6 +- pkgs/applications/graphics/giv/default.nix | 4 +- pkgs/applications/graphics/gqview/default.nix | 8 +- .../graphics/inkscape/default.nix | 8 +- pkgs/applications/graphics/k3d/default.nix | 4 +- .../applications/graphics/mypaint/default.nix | 4 +- pkgs/applications/graphics/pqiv/default.nix | 4 +- pkgs/applications/graphics/qiv/default.nix | 4 +- .../graphics/rawtherapee/default.nix | 8 +- pkgs/applications/graphics/sane/frontends.nix | 4 +- pkgs/applications/graphics/sane/xsane.nix | 4 +- pkgs/applications/graphics/ufraw/default.nix | 4 +- pkgs/applications/graphics/xara/default.nix | 4 +- .../applications/graphics/xournal/default.nix | 4 +- pkgs/applications/graphics/xzgv/default.nix | 4 +- .../misc/adobe-reader/default.nix | 4 +- pkgs/applications/misc/artha/default.nix | 4 +- pkgs/applications/misc/avrdudess/default.nix | 4 +- pkgs/applications/misc/batti/default.nix | 6 +- pkgs/applications/misc/clipit/default.nix | 4 +- pkgs/applications/misc/d4x/default.nix | 4 +- pkgs/applications/misc/eaglemode/default.nix | 4 +- pkgs/applications/misc/epdfview/default.nix | 4 +- pkgs/applications/misc/evilvte/default.nix | 4 +- pkgs/applications/misc/fme/default.nix | 4 +- pkgs/applications/misc/gkrellm/default.nix | 4 +- pkgs/applications/misc/gksu/default.nix | 4 +- pkgs/applications/misc/gosmore/default.nix | 4 +- pkgs/applications/misc/gpa/default.nix | 4 +- .../misc/gpscorrelate/default.nix | 4 +- .../misc/green-pdfviewer/default.nix | 4 +- pkgs/applications/misc/grip/default.nix | 4 +- .../misc/hamster-time-tracker/default.nix | 2 +- pkgs/applications/misc/hyperterm/default.nix | 4 +- pkgs/applications/misc/jigdo/default.nix | 4 +- pkgs/applications/misc/kiwix/default.nix | 4 +- pkgs/applications/misc/lighthouse/default.nix | 4 +- .../misc/lxappearance/default.nix | 4 +- pkgs/applications/misc/multisync/default.nix | 4 +- pkgs/applications/misc/navit/default.nix | 4 +- .../misc/openbox-menu/default.nix | 4 +- pkgs/applications/misc/pcmanfm/default.nix | 4 +- pkgs/applications/misc/pdfmod/default.nix | 8 +- pkgs/applications/misc/pmenu/default.nix | 4 +- pkgs/applications/misc/tangogps/default.nix | 4 +- pkgs/applications/misc/tint2/default.nix | 4 +- pkgs/applications/misc/viking/default.nix | 4 +- pkgs/applications/misc/workrave/default.nix | 4 +- pkgs/applications/misc/xautoclick/default.nix | 4 +- pkgs/applications/misc/xneur/default.nix | 8 +- .../networking/browsers/chromium/common.nix | 4 +- .../browsers/firefox-bin/default.nix | 4 +- .../networking/browsers/firefox/default.nix | 7 +- .../networking/browsers/firefox/wrapper.nix | 4 +- .../browsers/google-chrome/default.nix | 4 +- .../mozilla-plugins/bluejeans/default.nix | 6 +- .../flashplayer-11/default.nix | 4 +- .../browsers/mozilla-plugins/gmtk/default.nix | 4 +- .../google-talk-plugin/default.nix | 6 +- .../networking/browsers/opera/default.nix | 4 +- .../networking/browsers/surf/default.nix | 4 +- .../networking/browsers/vimb/default.nix | 4 +- .../browsers/vimprobable2/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../networking/davmail/default.nix | 4 +- .../instant-messengers/discord/default.nix | 4 +- .../instant-messengers/gajim/default.nix | 10 +- .../instant-messengers/oneteam/default.nix | 6 +- .../pidgin-plugins/pidgin-latex/default.nix | 4 +- .../instant-messengers/pidgin/default.nix | 6 +- .../salut-a-toi/default.nix | 2 +- .../instant-messengers/slack/default.nix | 10 +- .../networking/irc/hexchat/default.nix | 6 +- .../mailreaders/claws-mail/default.nix | 8 +- .../mailreaders/sylpheed/default.nix | 4 +- .../mailreaders/thunderbird-bin/default.nix | 8 +- .../mailreaders/thunderbird/default.nix | 4 +- .../networking/newsreaders/pan/default.nix | 8 +- .../networking/p2p/ldcpp/default.nix | 4 +- .../networking/p2p/transgui/default.nix | 4 +- .../remote/citrix-receiver/default.nix | 8 +- .../networking/remote/putty/default.nix | 4 +- .../networking/remote/remmina/default.nix | 4 +- .../networking/sniffers/etherape/default.nix | 4 +- pkgs/applications/office/gnucash/2.6.nix | 6 +- pkgs/applications/office/gnucash/default.nix | 4 +- .../office/libreoffice/default.nix | 4 +- .../applications/office/libreoffice/still.nix | 4 +- pkgs/applications/office/osmo/default.nix | 8 +- pkgs/applications/office/planner/default.nix | 18 +- pkgs/applications/office/zim/default.nix | 4 +- .../science/electronics/geda/default.nix | 4 +- .../science/electronics/gerbv/default.nix | 4 +- .../science/electronics/gtkwave/default.nix | 4 +- .../science/electronics/pcb/default.nix | 4 +- .../science/electronics/xoscope/default.nix | 4 +- .../science/geometry/drgeo/default.nix | 4 +- .../science/logic/verifast/default.nix | 4 +- .../science/math/pssp/default.nix | 4 +- .../science/math/scilab/default.nix | 4 +- .../science/misc/boinc/default.nix | 4 +- .../science/misc/openmodelica/default.nix | 6 +- .../version-management/rabbitvcs/default.nix | 2 +- .../version-management/smartgithg/default.nix | 4 +- pkgs/applications/video/coriander/default.nix | 4 +- pkgs/applications/video/gnash/default.nix | 4 +- .../video/gnome-mplayer/default.nix | 4 +- pkgs/applications/video/kazam/default.nix | 4 +- pkgs/applications/video/key-mon/default.nix | 4 +- pkgs/applications/video/kino/default.nix | 4 +- pkgs/applications/video/miro/default.nix | 4 +- pkgs/applications/video/mkcast/default.nix | 4 +- pkgs/applications/video/xvidcap/default.nix | 4 +- .../virtualization/bochs/default.nix | 8 +- .../window-managers/compiz/default.nix | 4 +- .../window-managers/fbpanel/default.nix | 4 +- .../window-managers/trayer/default.nix | 4 +- pkgs/data/misc/ddccontrol-db/default.nix | 4 +- .../gnome-2/bindings/gnome-python/default.nix | 4 +- .../gnome-2/bindings/python-rsvg/default.nix | 4 +- .../core/gnome-control-center/default.nix | 4 +- .../gnome-3/3.20/core/gnome-shell/default.nix | 2 +- .../gnome-3/3.20/core/gsound/default.nix | 4 +- .../gnome-3/3.20/core/mutter/default.nix | 4 +- .../gnome-3/3.20/core/totem/default.nix | 2 +- pkgs/desktops/gnome-3/3.20/default.nix | 2 +- .../gnome-3/3.20/misc/geary/default.nix | 4 +- .../gnome-3/3.20/misc/pomodoro/default.nix | 4 +- pkgs/desktops/xfce/default.nix | 3 +- .../development/compilers/aliceml/default.nix | 6 +- pkgs/development/compilers/boo/default.nix | 4 +- pkgs/development/compilers/fpc/lazarus.nix | 4 +- .../compilers/gnu-smalltalk/default.nix | 4 +- .../compilers/oraclejdk/jdk-linux-base.nix | 4 +- .../guile-modules/guile-gnome/default.nix | 4 +- .../haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/default.nix | 2 +- .../haskell-modules/hackage-packages.nix | 2 +- .../interpreters/racket/default.nix | 4 +- .../libraries/aqbanking/gwenhywfar.nix | 4 +- .../libraries/audio/lv2/default.nix | 4 +- .../libraries/audio/lvtk/default.nix | 6 +- .../libraries/audio/raul/default.nix | 4 +- .../libraries/audio/suil/default.nix | 4 +- .../libraries/clutter-gtk/0.10.8.nix | 4 +- pkgs/development/libraries/cwiid/default.nix | 4 +- .../libraries/farsight2/default.nix | 4 +- .../libraries/farstream/default.nix | 4 +- pkgs/development/libraries/ganv/default.nix | 4 +- pkgs/development/libraries/gegl/default.nix | 4 +- .../development/libraries/geoclue/default.nix | 4 +- .../libraries/gio-sharp/default.nix | 4 +- .../libraries/gnome-sharp/default.nix | 6 +- pkgs/development/libraries/goffice/0.8.nix | 4 +- .../libraries/goocanvas/default.nix | 4 +- .../gstreamer/legacy/gst-python/default.nix | 4 +- .../libraries/gtdialog/default.nix | 4 +- .../libraries/gtk-sharp-beans/default.nix | 4 +- pkgs/development/libraries/gtk-sharp/2.0.nix | 6 +- .../libraries/gtkdatabox/default.nix | 6 +- .../libraries/gtkimageview/default.nix | 4 +- .../libraries/gtkmathview/default.nix | 6 +- pkgs/development/libraries/gtkmm/2.x.nix | 4 +- .../libraries/gtkmozembed-sharp/default.nix | 4 +- .../libraries/gtkspell/default.nix | 4 +- pkgs/development/libraries/gvfs/default.nix | 2 +- pkgs/development/libraries/hyena/default.nix | 4 +- .../libraries/java/classpath/default.nix | 4 +- .../libraries/java/swt/default.nix | 4 +- .../libraries/keybinder/default.nix | 2 +- .../libraries/keybinder3/default.nix | 4 +- .../libraries/libappindicator/default.nix | 4 +- pkgs/development/libraries/libfm/default.nix | 4 +- .../development/libraries/libgksu/default.nix | 6 +- .../development/libraries/libgpod/default.nix | 8 +- .../libraries/libindicate/default.nix | 8 +- .../libraries/libiodbc/default.nix | 4 +- .../development/libraries/libsexy/default.nix | 4 +- .../libraries/libunique/default.nix | 4 +- .../libraries/libvirt-glib/default.nix | 4 +- .../development/libraries/libwnck/default.nix | 4 +- pkgs/development/libraries/ntrack/default.nix | 2 +- .../libraries/openscenegraph/default.nix | 4 +- .../libraries/qt-4.x/4.8/default.nix | 8 +- .../libraries/qt-5/5.5/default.nix | 2 +- .../libraries/qt-5/5.5/qtbase/default.nix | 6 +- .../libraries/qt-5/5.5/qtwebkit/default.nix | 6 +- .../libraries/qt-5/5.6/qtwebkit/default.nix | 6 +- .../libraries/qt-5/5.7/qtwebkit/default.nix | 6 +- pkgs/development/libraries/smpeg/default.nix | 4 +- .../libraries/spice-gtk/default.nix | 4 +- .../libraries/wxGTK-2.8/default.nix | 9 +- .../libraries/wxGTK-2.9/default.nix | 9 +- .../libraries/wxGTK-3.0/default.nix | 9 +- .../mobile/androidenv/androidsdk.nix | 12 +- .../development/mobile/androidenv/default.nix | 2 +- .../ocaml-modules/lablgtk/2.14.0.nix | 4 +- .../ocaml-modules/lablgtk/default.nix | 4 +- .../ocaml-modules/ocaml-cairo/default.nix | 4 +- .../ocaml-modules/ocaml-cairo2/default.nix | 6 +- .../python-modules/libsexy/default.nix | 4 +- .../python-modules/pygtk/default.nix | 8 +- .../pygtksourceview/default.nix | 4 +- .../tools/java/visualvm/default.nix | 4 +- .../development/tools/misc/distcc/default.nix | 6 +- .../tools/misc/gtkdialog/default.nix | 4 +- .../tools/misc/saleae-logic/default.nix | 4 +- pkgs/development/tools/node-webkit/nw11.nix | 4 +- pkgs/development/tools/node-webkit/nw12.nix | 4 +- pkgs/development/tools/node-webkit/nw9.nix | 4 +- .../tools/profiling/sysprof/default.nix | 4 +- .../tools/selenium/chromedriver/default.nix | 4 +- pkgs/development/tools/thrust/default.nix | 4 +- pkgs/development/tools/unity3d/default.nix | 6 +- pkgs/games/ckan/default.nix | 4 +- pkgs/games/crack-attack/default.nix | 4 +- pkgs/games/eboard/default.nix | 4 +- pkgs/games/eduke32/default.nix | 4 +- pkgs/games/freeciv/default.nix | 4 +- pkgs/games/fsg/default.nix | 4 +- pkgs/games/pioneers/default.nix | 4 +- pkgs/games/planetaryannihilation/default.nix | 6 +- pkgs/games/privateer/default.nix | 4 +- pkgs/games/rigsofrods/default.nix | 4 +- pkgs/games/spring/springlobby.nix | 4 +- pkgs/games/zandronum/bin.nix | 4 +- pkgs/misc/drivers/hplip/3.15.9.nix | 2 +- pkgs/misc/drivers/hplip/default.nix | 2 +- pkgs/misc/emulators/fs-uae/default.nix | 4 +- pkgs/misc/emulators/gens-gs/default.nix | 4 +- pkgs/misc/emulators/higan/default.nix | 4 +- pkgs/misc/emulators/mess/default.nix | 4 +- pkgs/misc/emulators/mupen64plus/default.nix | 4 +- pkgs/misc/emulators/snes9x-gtk/default.nix | 4 +- pkgs/misc/emulators/uae/default.nix | 4 +- pkgs/misc/emulators/vice/default.nix | 4 +- pkgs/misc/emulators/wine/base.nix | 2 +- .../screensavers/xscreensaver/default.nix | 4 +- pkgs/misc/themes/arc/default.nix | 4 +- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 +- .../themes/gtk3/clearlooks-phenix/default.nix | 2 +- pkgs/os-specific/linux/alsa-tools/default.nix | 6 +- pkgs/os-specific/linux/bluez/bluez5.nix | 2 +- pkgs/os-specific/linux/bluez/bluez5_28.nix | 2 +- pkgs/os-specific/linux/latencytop/default.nix | 4 +- pkgs/os-specific/linux/nvidia-x11/default.nix | 4 +- .../linux/nvidia-x11/legacy173.nix | 4 +- .../linux/nvidia-x11/legacy304.nix | 4 +- .../linux/nvidia-x11/legacy340.nix | 4 +- pkgs/os-specific/linux/pktgen/default.nix | 4 +- pkgs/os-specific/linux/pommed/default.nix | 4 +- pkgs/servers/computing/slurm/default.nix | 6 +- pkgs/servers/gpsd/default.nix | 2 +- pkgs/servers/neard/default.nix | 2 +- pkgs/tools/X11/nitrogen/default.nix | 4 +- pkgs/tools/X11/obconf/default.nix | 4 +- pkgs/tools/X11/xnee/default.nix | 4 +- pkgs/tools/X11/xpra/default.nix | 6 +- pkgs/tools/admin/gtk-vnc/default.nix | 8 +- pkgs/tools/archivers/xarchiver/default.nix | 4 +- pkgs/tools/audio/playerctl/default.nix | 4 +- pkgs/tools/graphics/nip2/default.nix | 4 +- pkgs/tools/graphics/pdf2svg/default.nix | 4 +- pkgs/tools/graphics/vips/default.nix | 2 +- .../fcitx-engines/fcitx-mozc/default.nix | 4 +- .../ibus-engines/ibus-mozc/default.nix | 4 +- pkgs/tools/inputmethods/nabi/default.nix | 4 +- .../tools/misc/alarm-clock-applet/default.nix | 8 +- pkgs/tools/misc/ddccontrol/default.nix | 4 +- pkgs/tools/misc/gnokii/default.nix | 4 +- pkgs/tools/misc/gparted/default.nix | 4 +- pkgs/tools/misc/gsmartcontrol/default.nix | 4 +- .../networking/connman-notify/default.nix | 2 +- pkgs/tools/networking/gftp/default.nix | 4 +- .../networking/p2p/gtk-gnutella/default.nix | 4 +- pkgs/tools/networking/wicd/default.nix | 12 +- pkgs/tools/security/jd-gui/default.nix | 4 +- pkgs/tools/security/nmap/default.nix | 6 +- pkgs/tools/security/tor/torbrowser.nix | 4 +- pkgs/tools/system/bootchart/default.nix | 4 +- pkgs/tools/system/gdmap/default.nix | 4 +- pkgs/tools/typesetting/xmlroff/default.nix | 4 +- pkgs/tools/video/mjpegtools/default.nix | 4 +- pkgs/top-level/all-packages.nix | 263 +++++++++--------- pkgs/top-level/dotnet-packages.nix | 2 +- pkgs/top-level/lua-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 9 +- 339 files changed, 893 insertions(+), 872 deletions(-) diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 0001f0a9292..9d62696a3f8 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5"; }; - buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index d9614d10d32..ff2d4bbce4e 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 +, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo + glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 9f047a600cb..7951076daa0 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 +, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo + glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index a93a445db31..b31cecffbd1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, +{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag gtk + libsndfile soxr libid3tag gtk2 ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 7113a169e80..900d6759e4a 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool -, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: +, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: stdenv.mkDerivation rec { name = "beast-0.7.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib guile libart_lgpl pkgconfig intltool gtk glib + [ zlib guile libart_lgpl pkgconfig intltool gtk2 glib libogg libvorbis libgnomecanvas gettext ]; diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix index efb36abe240..47c80af9fe0 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf -, glib, gtk, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp +, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp , libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb , libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm , xdg_utils, zenity, zlib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontStrip = true; libPath = lib.makeLibraryPath [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk harfbuzz + alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 4ba086d8848..e133df564d7 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk, libjack2, ladspaH , libglade, lv2, pkgconfig }: +, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo expat fftwSinglePrec fluidsynth glib gtk libjack2 ladspaH + cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 0ff83a9023e..3ef69606c77 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: +{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; version = "2.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h"; }; - buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix index 2fe03d73a23..17cec46f6c6 100644 --- a/pkgs/applications/audio/faust/faust2alsa.nix +++ b/pkgs/applications/audio/faust/faust2alsa.nix @@ -6,7 +6,7 @@ , freetype , gdk_pixbuf , glib -, gtk +, gtk2 , pango }: @@ -22,7 +22,7 @@ faust.wrapWithBuildEnv { freetype gdk_pixbuf glib - gtk + gtk2 pango ]; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 9dfb7f875c5..3867114562d 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,5 +1,5 @@ { faust -, gtk +, gtk2 , jack2Full , opencv }: @@ -15,7 +15,7 @@ faust.wrapWithBuildEnv { ]; propagatedBuildInputs = [ - gtk + gtk2 jack2Full opencv ]; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 269b48aebb8..e53b498fb6e 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 -, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt +, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt , pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = "make -f Makefile.cvs"; buildInputs = [ - autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool + autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool libgig libsndfile libtool libxslt pkgconfig ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 7486ec3e081..2d63245fef6 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 0c7b5c2c9ca..ab6dd0eee72 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib -, gtk, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique +, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup + libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme wrapGAppsHook ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index af213f1a835..4fd68742ba2 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python , avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtk, gtkmm, libjack2 +, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom , webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtk gtkmm libjack2 ladspaH librdf + gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index ab8f7af1bd5..9a336576d3a 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, libjack2, lilv-svn +{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom , suil }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk gtkmm libjack2 lilv-svn lv2 makeWrapper pkgconfig + boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig python raul serd sord-svn sratom suil ]; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index e4a48230e23..1d1925779f0 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk, alsaLib, libxml2, librdf }: +{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, librdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig libjack2 ladspaH gtk alsaLib libxml2 librdf ]; + buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 5e99e60c818..bcec085887a 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, libjack2, lilv, lv2, pkgconfig, python +{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk libjack2 lilv lv2 pkgconfig python serd sord sratom suil + gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index cfe29949e4f..da61eee3b64 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, libjack2, libuuid, libxml2 +{ stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 , makeWrapper, pkgconfig, readline }: assert libuuid != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk libjack2 libxml2 makeWrapper + buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper pkgconfig readline ]; propagatedBuildInputs = [ libuuid ]; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 22ab37dc98a..47b65ff2b5a 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }: stdenv.mkDerivation { name = "lingot-0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig intltool gtk alsaLib libglade ]; + buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ]; configureFlags = "--disable-jack"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 26400ed61da..2c6df650d5d 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH +{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame , vorbis-tools }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3"; }; - buildInputs = [ SDL alsaLib gtk libjack2 ladspaH libsamplerate libsndfile + buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile pkgconfig libpulseaudio makeWrapper ]; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index b9a38ab9d03..0ab0d24c272 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; [ - pygobject gst_python musicbrainzngs + pygobject2 gst_python musicbrainzngs pycdio pyxdg setuptools CDDB ]; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d28cd7c9e06..5f1d2bfa93d 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, gtk }: +{ fetchurl, stdenv, ncurses, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "mp3info-0.8.5a"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - buildInputs = [ ncurses pkgconfig gtk ]; + buildInputs = [ ncurses pkgconfig gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 0f8c7a95010..7cce08e733d 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm +{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm , dbus_glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ]; + buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 1deb11d9925..91a270a698e 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,5 +1,5 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2 -, gtkmm, libjack2, pkgconfig, python2 +{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +, gtkmm2, libjack2, pkgconfig, python2 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2 + alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index c9d9ad57487..d86e5aae2cd 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas +{ stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkgconfig, openssl }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs + [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 pkgconfig openssl ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 883d49682ce..52f2a0ff924 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: stdenv.mkDerivation rec { name = "praat-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - buildInputs = [ alsaLib gtk pkgconfig ]; + buildInputs = [ alsaLib gtk2 pkgconfig ]; meta = { description = "Doing phonetics by computer"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 418efa23b20..9e0abac5ce4 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, libjack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile , libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd , sord, sratom, stdenv, suil }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib autoconf automake dssi gtk libjack2 ladspaH + [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom suil diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a046fe80e13..00856721f95 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null let version = "2.6.3"; - inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject dbus-python; + inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; in buildPythonApplication { # call the package quodlibet and just quodlibet name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; @@ -48,7 +48,7 @@ in buildPythonApplication { ]; propagatedBuildInputs = [ - mutagen pygtk pygobject dbus-python gst_python intltool + mutagen pygtk pygobject2 dbus-python gst_python intltool ]; postInstall = stdenv.lib.optionalString withGstPlugins '' diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 73fa58a46c4..eafa0980b4b 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtkmm, libjack2, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: stdenv.mkDerivation rec { name = "seq24-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; - buildInputs = [ alsaLib gtkmm libjack2 ]; + buildInputs = [ alsaLib gtkmm2 libjack2 ]; nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index e0d89d809a7..a0188e48a8f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }: +, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: assert stdenv.system == "x86_64-linux"; @@ -22,7 +22,7 @@ let GConf gdk_pixbuf glib - gtk + gtk2 libgcrypt libpng nss @@ -83,7 +83,7 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome.zenity}/bin" + --prefix PATH : "${gnome2.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 96da8ad8c55..a55b47a6c16 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, libjack2, +{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk libjack2 ladspaH + buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo pkgconfig ]; installPhase = '' diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index dbfc2ebb6b3..1285e46fb48 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index a839f5b24e5..4237ce73f21 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf +{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: let bracketsEnv = buildEnv { name = "env-brackets"; paths = [ - gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 + gtk2 glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd.lib ]; }; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 76df6d4d2b9..9cab87e9ed2 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2 , contribPlugins ? false, hunspell, gamin, boost }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; }; - buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ] + buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 609c5e3c651..74707c65b6c 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3d59777e5f0..c688065e6ea 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk, libXtst, jdk +, glib, libXtst, jdk , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage -} @ args: +}: assert stdenv ? glibc; rec { - buildEclipse = import ./build-eclipse.nix args; + buildEclipse = callPackage ./build-eclipse.nix { }; eclipse-sdk-35 = buildEclipse { name = "eclipse-sdk-3.5.2"; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 679125b5ec4..7689ebad0f0 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,8 +1,8 @@ -{ runCommand, makeWrapper, geany, gnome }: +{ runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " mkdir -p $out ln -s ${geany}/share $out - makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome.vte}/lib + makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib " diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index c023da0bc95..32998700c23 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,7 +1,7 @@ { avahiSupport ? false # build support for Avahi in libinfinity , gnomeSupport ? false # build support for Gnome(gnome-vfs) , stdenv, fetchurl, pkgconfig -, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool +, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool , gnome_vfs ? null}: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; - buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] + buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] ++ stdenv.lib.optional gnomeSupport gnome_vfs; configureFlags = '' diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index a5b0f2e400a..055816a798d 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }: stdenv.mkDerivation rec { version = "0.8.18.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - buildInputs = [ intltool pkgconfig gtk ]; + buildInputs = [ intltool pkgconfig gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 9644cb2d5c7..68f5e14891f 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem -, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index cdf1daabea7..44c61d16ec8 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, fetchNuGet , autoconf, automake, pkgconfig, shared_mime_info, intltool -, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip +, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool - mono gtk-sharp gnome-sharp unzip + mono gtk-sharp-2_0 gnome-sharp unzip pkgconfig dotnetPackages.NUnit dotnetPackages.NUnitRunners @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { for prog in monodevelop mdtool; do patch -p 0 $out/bin/$prog < export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX + > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome.libgnomeui gnome.gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk ]}:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH > EOF done diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index b2ac66c1e08..989d3e42a6f 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk }: +{ stdenv, fetchurl, pkgconfig, gtk2 }: let version = "3.3.7"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig gtk2 ]; sourceRoot = "scintilla/gtk"; buildPhase = '' diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index 1f4be1ac508..9cf5bd97d0a 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk, makeDesktopItem }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 4eb428f37d8..96e47e18483 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2, +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect, gksuSupport ? false, gksu}: @@ -7,7 +7,7 @@ assert gksuSupport -> gksu != null; let build = "3114"; - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; in let diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index 8dcc718e7bb..a9f236a57ae 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mono, gtk-sharp, pkgconfig, makeWrapper, gnome, gtk }: +{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation rec { version = "git-2014-08-20"; name = "supertux-editor-${version}"; @@ -10,19 +10,19 @@ stdenv.mkDerivation rec { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - buildInputs = [mono gtk-sharp pkgconfig makeWrapper gnome.libglade gtk ]; + buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor cp *.{dll,dll.config,exe} $out/lib/supertux-editor makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \ --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \ --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') ''; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index f412a9bada2..54f4ce1ca3a 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip }: +{ stdenv, fetchhg, fetchurl, fetchzip, gtk2, glib, pkgconfig, unzip, ncurses, zip }: let # Textadept requires a whole bunch of external dependencies. # The build system expects to be able to download them with wget. @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { name = "textadept-${version}"; buildInputs = [ - gtk glib pkgconfig unzip ncurses zip + gtk2 glib pkgconfig unzip ncurses zip ]; src = fetchhg { diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index f0d76eae3b4..b7c87092e89 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby +, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -79,7 +79,7 @@ composableDerivation { = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; nativeBuildInputs - = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau + = [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; # most interpreters aren't tested yet.. (see python for example how to do it) diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 79d6ff06578..2a78f509429 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, - gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, + gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper }: stdenv.mkDerivation { name = "ahoviewer-1.4.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 + buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl unrar libzip librsvg gst_all_1.gstreamer gst_all_1.gst-plugins-good diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 4866ba92add..1f28e3d4c07 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, +{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms, flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w"; }; - buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg + buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 6200048c41d..a8f38d61f9d 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext +{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl , withGNOME ? false, libgnomeui }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5 + [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index c7113801b61..b9cf229e8c8 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } : +{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } : let version = "0.4"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; -buildInputs = [ gtk perl perlXMLParser pkgconfig ]; +buildInputs = [ gtk2 perl perlXMLParser pkgconfig ]; meta = { description = "Simple GTK+2 color selector"; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 952d23bbc48..9149e19819f 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2 +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 , lcms, intltool, gettext, fbida }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gps" ]; buildInputs = [ - pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext + pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext ]; postInstall = '' diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 48278f5aac5..662e214ceaf 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf +{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo + [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper python pygtk libart_lgpl libexif gettext xorg.libXpm @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? + passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ? #configureFlags = [ "--disable-print" ]; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 1587ceb4037..6c892f1bfd4 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib, +{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala_0_23 libtiff + buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff json_glib ]; meta = { diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 80391ae061e..801e9c5f502 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, pkgconfig, gtk, libpng}: +{stdenv, fetchurl, pkgconfig, gtk2, libpng}: -assert pkgconfig != null && gtk != null && libpng != null; +assert pkgconfig != null && gtk2 != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might # not be linked against png. -# !!! assert libpng == gtk.libpng; +# !!! assert libpng == gtk2.libpng; stdenv.mkDerivation { name = "gqview-2.1.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - buildInputs = [pkgconfig gtk libpng]; + buildInputs = [pkgconfig gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 25cf3a990d1..36995f0bcc8 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft -, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft +, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, unzip, automake114x, autoconf @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc - libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext + pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc + libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif automake114x autoconf ] ++ stdenv.lib.optional boxMakerPlugin unzip; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index f5987684c00..a446ab5dd18 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff -, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }: +, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { version = "0.8.0.5"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl unzip ftgl glew asciidoc - gtkmm glibmm gtkglext pangox_compat libXmu + gtkmm2 glibmm gtkglext pangox_compat libXmu ]; #doCheck = false; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index be8df8ef16d..8abdb3c7bb5 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, glib, gtk, hicolor_icon_theme, json_c +{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c , lcms2, libpng , makeWrapper, pkgconfig, pygtk, python, pythonPackages , scons, swig }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk + gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk python scons swig ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 3fd9d47374a..25c6fc36c6c 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, which, pkgconfig, gtk } : +{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } : stdenv.mkDerivation (rec { name = "pqiv-0.12"; @@ -8,7 +8,7 @@ stdenv.mkDerivation (rec { sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e"; }; - buildInputs = [ getopt which pkgconfig gtk ]; + buildInputs = [ getopt which pkgconfig gtk2 ]; preConfigure='' substituteInPlace configure --replace /bin/bash "$shell" diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 35c0ca2aff9..9d147a635f3 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file, lcms2, libexif } : +{ stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { version = "2.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation (rec { sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; - buildInputs = [ pkgconfig gtk imlib2 file lcms2 libexif ]; + buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ]; preBuild='' substituteInPlace Makefile --replace /usr/local "$out" diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index aeb427348ca..450124706c6 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx , mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr"; }; - buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ]; + buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + lcms2 libiptcdata mercurial libcanberra_gtk2 fftw expat pcre libsigcxx ]; patchPhase = '' patch -p1 < ${./sigc++_fix.patch} diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index b5abe34581a..bd19ef3c43b 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}: stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c ''; - buildInputs = [sane-backends libX11 gtk pkgconfig] ++ + buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++ (if libusb != null then [libusb] else []); meta = { diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index b3a432c96df..de07a4f1a89 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 23a37ab43ae..fc8e7a62c2b 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib +{ fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk gtkimageview gettext bzip2 zlib + [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib libjpeg libtiff cfitsio exiv2 lcms2 lensfun ]; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index cc456465ba6..4542de2d42f 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig -, wxGTK, gtk, perl, zip}: +, wxGTK, gtk2, perl, zip}: stdenv.mkDerivation { name = "xaralx-0.7r1785"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; - buildInputs = [ wxGTK gtk libxml2 freetype pango ]; + buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; configureFlags = "--disable-svnversion"; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 53d0473638a..b81efb08d8a 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ghostscript, atk, gtk, glib, fontconfig, freetype +, ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ghostscript atk gtk glib fontconfig freetype + ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui pango libX11 xproto zlib poppler ]; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 053e1137e39..99931442945 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, pkgconfig, texinfo }: +{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }: stdenv.mkDerivation rec { name = "xzgv-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; }; - buildInputs = [ gtk pkgconfig texinfo ]; + buildInputs = [ gtk2 pkgconfig texinfo ]; patches = [ ./fix-linker-paths.patch ]; postPatch = '' substituteInPlace config.mk \ diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index d31e9234e09..88bf87b0a84 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib +{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib , gdk_pixbuf }: assert stdenv.system == "i686-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; + [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index a8914a9014d..3294d18e70b 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }: +{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - buildInputs = [ dbus_glib gtk pkgconfig wordnet ]; + buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 0df0a564731..6cc6cc5d9b9 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }: +{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cat >> "$out/bin/avrdudess" << __EOF__ #!${stdenv.shell} - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}" + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH" diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 14416c24d23..22f03419e5b 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , pkgconfig, gettext, pythonPackages -, gtk, gdk_pixbuf, upower +, gtk2, gdk_pixbuf, upower , makeWrapper }: let - inherit (pythonPackages) dbus-python pygtk python; + inherit (pythonPackages) dbus-python pygtk2 python; in stdenv.mkDerivation rec { name = "batti-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig gettext python gtk pygtk dbus-python gdk_pixbuf upower makeWrapper ]; + [ pkgconfig gettext python gtk2 pygtk2 dbus-python gdk_pixbuf upower makeWrapper ]; configurePhase = "true"; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 57f6c229a08..e62236e7ae2 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; - buildInputs = [ intltool pkgconfig gtk xdotool ]; + buildInputs = [ intltool pkgconfig gtk2 xdotool ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index cdcada196b9..b6d6e53b001 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }: stdenv.mkDerivation { name = "d4x-2.5.7.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; }; - buildInputs = [ gtk glib pkgconfig openssl boost ]; + buildInputs = [ gtk2 glib pkgconfig openssl boost ]; meta = { description = "Graphical download manager"; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 061a10c6a9f..95cae316a71 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, -librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }: +librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }: stdenv.mkDerivation rec { name = "eaglemode-0.86.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig - librsvg glib gtk libXxf86vm libXext poppler xineLib ]; + librsvg glib gtk2 libXxf86vm libXext poppler xineLib ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 782ef4ae366..09bef975c85 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { name = "epdfview-0.1.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; }; - buildInputs = [ pkgconfig gtk poppler ]; + buildInputs = [ pkgconfig gtk2 poppler ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index f7a8fe4eafc..1165ced11f9 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper, pkgconfig, - gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, + gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, configH }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11 + gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11 xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig ]; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 685c0ecb4ed..30169588501 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext -, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }: +, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec{ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm glibmm libglademm libsigcxx ]; + buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index f4fec41b9e6..d6a59a89be6 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE +{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE , IOKit ? null }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; }; - buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE] + buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index c3f78efd412..0b6ebe06b88 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu, +{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, intltool, libstartup_notification, gtk_doc, wrapGAppsHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring + gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index e894ace0d45..5d13c18edc3 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } : +{ stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : let version = "31801"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ignoreExternals = true; }; - buildInputs = [ libxml2 gtk curl ]; + buildInputs = [ libxml2 gtk2 curl ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 10b8065c623..600a5493121 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { name = "gpa-0.9.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38"; }; - buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ]; + buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ]; meta = with stdenv.lib; { description = "Graphical user interface for the GnuPG"; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index c6b48af5c06..5026fea0e35 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk +{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2 , libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig exiv2 libxml2 gtk + pkgconfig exiv2 libxml2 gtk2 libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 03d333e59e6..623cb12f932 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk }: +{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }: stdenv.mkDerivation rec { name = "green-pdfviewer-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk ]; + buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ]; patches = [ ./gdk-libs.patch diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 07cecc2d84e..5db5b25947e 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl"; }; - buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia + buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index aa6a4bd689a..3191c00e9ec 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme ]; - propagatedBuildInputs = with pythonPackages; [ pygobject pygtk pyxdg gnome_python dbus-python sqlite3 ]; + propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python sqlite3 ]; configurePhase = '' python waf configure --prefix="$out" diff --git a/pkgs/applications/misc/hyperterm/default.nix b/pkgs/applications/misc/hyperterm/default.nix index b3e0ef71c3c..59cd9ac2696 100644 --- a/pkgs/applications/misc/hyperterm/default.nix +++ b/pkgs/applications/misc/hyperterm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl, dpkg, gtk, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index fd9077a619c..8e5c5d6206c 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db, gtk, bzip2 }: +{ stdenv, fetchurl, db, gtk2, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8"; }; - buildInputs = [ db gtk bzip2 ]; + buildInputs = [ db gtk2 bzip2 ]; configureFlags = "--without-libdb"; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index bd0118c75f4..a3c140b6e6c 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib -, gtk, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk +, gtk2, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk }: let @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index 6bd834846b6..f6bfe61e5aa 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, libX11, libxcb, cairo, gtk, pango, python27, python3 +, libX11, libxcb, cairo, gtk2, pango, python27, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libX11 libxcb cairo gtk pango python27 python3 + pkgconfig libX11 libxcb cairo gtk2 pango python27 python3 ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix index b6e59613b3c..8683d5b3cea 100644 --- a/pkgs/applications/misc/lxappearance/default.nix +++ b/pkgs/applications/misc/lxappearance/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }: +{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }: stdenv.mkDerivation rec { name = "lxappearance-0.6.1"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9"; }; - buildInputs = [ intltool libX11 pkgconfig gtk ]; + buildInputs = [ intltool libX11 pkgconfig gtk2 ]; meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; maintainers = [ stdenv.lib.maintainers.hinton ]; diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix index fc55b275dd0..5c00bddd9d2 100644 --- a/pkgs/applications/misc/multisync/default.nix +++ b/pkgs/applications/misc/multisync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig +{ stdenv, fetchurl, gtk2, glib, ORBit2, libbonobo, libtool, pkgconfig , libgnomeui, GConf, automake, autoconf }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf + [ gtk2 glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf automake autoconf ]; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 53b1106a223..51b29a5c04c 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, +{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ gtk SDL fontconfig freetype imlib2 SDL_image mesa + buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 9e52c629a24..1985b644884 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { name = "openbox-menu-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - buildInputs = [ pkgconfig glib gtk menu-cache ]; + buildInputs = [ pkgconfig glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index bf1bed08ed4..e6d96b099fa 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: +{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: stdenv.mkDerivation rec { name = "pcmanfm-1.2.4"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q"; }; - buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; + buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?cat=28/"; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 0978da3512b..919935a41ee 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib -, mono, gtk-sharp, gnome-sharp, hyena +, mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; buildInputs = [ - pkgconfig gnome_doc_utils intltool mono gtk-sharp gnome-sharp + pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { postInstall = '' makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \ --add-flags "$out/lib/pdfmod/PdfMod.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp gtk-sharp.gtk poppler ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} ''; dontStrip = true; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 4798ae5a024..9b376684284 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pythonPackages, gnome }: +{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pythonPackages.wrapPython ]; - buildInputs = [ pythonPackages.pygtk gnome.gnome_menus ]; + buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ]; pythonPath = [ pythonPackages.pygtk ]; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 1a42d9a90e6..584b8f6a296 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gettext, gtk, gconf +{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf , curl, libexif, sqlite, libxml2 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516"; }; - buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ]; + buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ]; # bogus includes fail with newer library version postPatch = '' diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 40810adbbdc..f72f4fdc567 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre -, glib , imlib2, gtk, libXinerama , libXrender, libXcomposite, libXdamage +, glib , imlib2, gtk2, libXinerama , libXrender, libXcomposite, libXdamage , libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp , libstartup_notification , hicolor_icon_theme, wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; - buildInputs = [ cairo pango pcre glib imlib2 gtk libXinerama libXrender + buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs libXdmcp libstartup_notification hicolor_icon_theme ]; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 50749681f2c..1e7c7f654b5 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl +{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz"; }; - buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils + buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index e9e34518932..8c554da0362 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , autoconf, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah -, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm +, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah - glib glibmm gtk gtkmm atk pango pangomm cairo cairomm + glib glibmm gtkmm2 atk pango pangomm cairo cairomm dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx ]; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 1a71a2756d1..32daf108c1c 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xorg, pkgconfig -, gtkSupport ? true, gtk +, gtkSupport ? true, gtk2 , qtSupport ? true, qt4 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; }; buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ] - ++ stdenv.lib.optionals gtkSupport [ gtk ] + ++ stdenv.lib.optionals gtkSupport [ gtk2 ] ++ stdenv.lib.optionals qtSupport [ qt4 ]; patchPhase = '' substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 8e3165b75d2..ca0d7775ece 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant, +, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant, gdk_pixbuf}: let s = import ./src-for-default.nix; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk pango enchant gdk_pixbuf + gtk2 pango enchant gdk_pixbuf ]; preConfigure = '' @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8131ad29060..c0e26af4274 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk, dbus_glib +, glib, gtk2, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups @@ -116,7 +116,7 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk dbus_glib + glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d782f4a7b53..23d4da0b5cc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -25,7 +25,7 @@ , libXinerama , libXrender , libXt -, libcanberra +, libcanberra_gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -98,7 +98,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra + libcanberra_gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3e93c560ebb..cd6cbf667f1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL +{ lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite @@ -30,7 +30,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa @@ -121,7 +121,8 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; passthru = { - inherit gtk nspr version; + inherit nspr version; + gtk = gtk2; isFirefox3Like = true; browserName = "firefox"; ffmpegSupport = lib.versionAtLeast version "46.0"; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c9adde4f15b..4da73326177 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , gnash, flashplayer, hal-flash -, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra +, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ @@ -54,7 +54,7 @@ let ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; - gtk_modules = [ libcanberra ]; + gtk_modules = [ libcanberra_gtk2 ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 10d50792fac..531c5a7cf3d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk, gdk_pixbuf, gcc +, dbus_libs, gtk2, gdk_pixbuf, gcc # Will crash without. , systemd @@ -44,7 +44,7 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gtk gdk_pixbuf gcc + dbus_libs gtk2 gdk_pixbuf gcc systemd libexif liberation_ttf curl utillinux xdg_utils wget diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index a2e98fb436e..6f8e327a6c3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, gtk, glib, gdk_pixbuf, dpkg, libXext, libXfixes +{ stdenv, fetchurl, xorg, gtk2, glib, gdk_pixbuf, dpkg, libXext, libXfixes , libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio }: @@ -7,10 +7,10 @@ with stdenv.lib; let rpathInstaller = makeLibraryPath - [gtk glib stdenv.cc.cc]; + [gtk2 glib stdenv.cc.cc]; rpathPlugin = makeLibraryPath - ([ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); + ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); in diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 5ed1636aa65..3b130caf03f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -14,7 +14,7 @@ , libXcursor , libXt , libvdpau -, gtk +, gtk2 , glib , pango , cairo @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { rpath = lib.makeLibraryPath [ zlib alsaLib curl nspr fontconfig freetype expat libX11 - libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf + libXext libXrender libXcursor libXt gtk2 glib pango atk cairo gdk_pixbuf libvdpau nss ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix index d149cd40d8c..82a1c271225 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2, GConf, alsaLib }: stdenv.mkDerivation rec { name = "gmtk-1.0.9b"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07y5hd94qhvlk9a9vhrpznqaml013j3rq52r3qxmrj74gg4yf4zc"; }; - buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; + buildInputs = [ intltool pkgconfig gtk2 GConf alsaLib ]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 0f549be9ac4..cf51cc26a45 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo -, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl +, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus_glib, alsaLib, libpulseaudio, systemd, pango }: @@ -16,7 +16,7 @@ let xorg.libXrender cairo libpng - gtk + gtk2 glib fontconfig freetype @@ -26,7 +26,7 @@ let rpathProgram = makeLibraryPath [ gdk_pixbuf glib - gtk + gtk2 xorg.libX11 xorg.libXcomposite xorg.libXfixes diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index a00905cf937..f1d40150eb3 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -2,7 +2,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, cups, xz , gstreamer, gst_plugins_base, libxml2 -, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk +, gtkSupport ? true, glib, gtk2, pango, gdk_pixbuf, cairo, atk , kdeSupport ? false, qt4, kdelibs }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libXft freetype fontconfig libXrender libuuid expat gstreamer libxml2 gst_plugins_base ] - ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ] + ++ stdenv.lib.optionals gtkSupport [ glib gtk2 pango gdk_pixbuf cairo atk ] ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ]; libPath = stdenv.lib.makeLibraryPath buildInputs diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index fcaaec63b9e..ae6ce3dd2c3 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: +{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: stdenv.mkDerivation rec { name = "surf-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m"; }; - buildInputs = [ gtk makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; + buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; # Allow users set their own list of patches inherit patches; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index ddaaa68f60d..55dfb05cb3e 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking +{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking , gsettings_desktop_schemas, makeWrapper }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f"; }; - buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup pkgconfig webkit gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e2d5061b92e..c98910cb08c 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl, +{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl, pkgconfig, webkit, gsettings_desktop_schemas }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr"; }; - buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d9f694a7eab..29da56b4d73 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst_plugins_base, libxml2 -, glib, gtk, pango, gdk_pixbuf, cairo, atk, gnome3 +, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr , patchelf }: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk alsaLib dbus_libs cups gtk gdk_pixbuf libexif ffmpeg systemd + atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf patchelf diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index eb5d12ed82c..bb4a4a71009 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: +{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: stdenv.mkDerivation rec { name = "davmail-4.7.2"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp ./* $out/bin/ -R - wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} ''; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3096d7dea2b..8506b5f138b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf -, glib, gnome, gtk, libnotify, libX11, libXcomposite, libXcursor, libXdamage +, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite + gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss pango systemd libXScrnSaver ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8d9cf434e5d..2952b0a365a 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk +{ stdenv, fetchurl, python, intltool, pkgconfig, libX11 , ldns, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null , enableE2E ? true , enableRST ? true -, enableSpelling ? true, gtkspell ? null +, enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false , extraPythonPackages ? pkgs: [] }: @@ -14,7 +14,7 @@ assert enableJingle -> farstream != null && gst_plugins_bad != null && libnice != null; assert enableE2E -> pythonPackages.pycrypto != null; assert enableRST -> pythonPackages.docutils != null; -assert enableSpelling -> gtkspell != null; +assert enableSpelling -> gtkspell2 != null; assert enableNotifications -> pythonPackages.notify != null; with stdenv.lib; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { src/features_window.py sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py '' + optionalString enableSpelling '' - sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ + sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|' \ src/gtkspell.py ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - pythonPackages.pygobject pythonPackages.pyGtkGlade + pythonPackages.pygobject2 pythonPackages.pyGtkGlade pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg pythonPackages.nbxmpp diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 00650bb685d..3d70990f462 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig -, libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver +, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver , scrnsaverproto }: @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake zip unzip ]; buildInputs = - [ perl xulrunner libpulseaudio glib gtk pixman nspr + [ perl xulrunner libpulseaudio glib gtk2 pixman nspr nss libXScrnSaver scrnsaverproto - ] ++ [ perlPackages.SubName gtk glib ]; + ] ++ [ perlPackages.SubName gtk2 glib ]; postPatch = '' sed -e '1i#include ' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 245894147dc..4a53513061a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk }: +{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: let version = "1.5.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [pkgconfig]; - buildInputs = [gtk glib pidgin]; + buildInputs = [gtk2 glib pidgin]; makeFlags = "PREFIX=$(out)"; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9123f6b39ed..6ace09bb753 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk, gtkspell, aspell +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell , gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farsight2 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn @@ -26,7 +26,7 @@ let unwrapped = stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - gtkspell aspell + gtkspell2 aspell gstreamer gst_plugins_base gst_plugins_good startupnotification libxml2 nss nspr farsight2 libXScrnSaver ncurses python @@ -38,7 +38,7 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (libgcrypt != null) libgcrypt); propagatedBuildInputs = [ - pkgconfig gtk perl perlXMLParser gettext + pkgconfig gtk2 perl perlXMLParser gettext ]; patches = [./pidgin-makefile.patch ./add-search-path.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 78814fcb4b2..c035fc62665 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { buildInputs = with pythonPackages; [ - python twisted urwid beautifulsoup wxPython pygobject + python twisted urwid beautifulsoup wxPython pygobject2 wokkel dbus-python pyfeed wrapPython setuptools ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 64911271f5e..8a7d2bbd126 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome2 , libnotify, nspr, nss, systemd, xorg }: let @@ -16,10 +16,10 @@ let fontconfig freetype glib - gnome.GConf - gnome.gdk_pixbuf - gnome.gtk - gnome.pango + gnome2.GConf + gnome2.gdk_pixbuf + gnome2.gtk + gnome2.pango libnotify nspr nss diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index da47ec6580b..bc1d0344490 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, lua, perl, python -, libtool, pciutils, dbus_glib, libcanberra, libproxy +{ stdenv, fetchurl, pkgconfig, gtk2, lua, perl, python +, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool , desktop_file_utils, hicolor_icon_theme }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk lua perl python pciutils dbus_glib libcanberra libproxy + gtk2 lua perl python pciutils dbus_glib libcanberra_gtk2 libproxy libsexy libnotify openssl desktop_file_utils hicolor_icon_theme ]; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 62a58c42cd4..346dba3acd5 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, wrapGAppsHook -, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, hicolor_icon_theme -, libarchive, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager +, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme +, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 , glib_networking, gsettings_desktop_schemas @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ curl dbus dbus_glib gtk gnutls gsettings_desktop_schemas hicolor_icon_theme + [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme libetpan perl pkgconfig python wrapGAppsHook glib_networking ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra + ++ optional enablePluginNotificationSounds libcanberra_gtk2 ++ optional enablePluginNotificationDialogs libnotify ++ optional enablePluginFancy libsoup ++ optional enablePluginRssyl libxml2 diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 65c1001ae78..b1cdd509f98 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk +{ stdenv, fetchurl, pkgconfig, gtk2 , openssl ? null , gpgme ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk ] + [ pkgconfig gtk2 ] ++ optional sslSupport openssl ++ optional gpgSupport gpgme; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f2b2f6dfa5c..c1bcd9ac541 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -15,7 +15,7 @@ , glibc , gst_plugins_base , gstreamer -, gtk +, gtk2 , kerberos , libX11 , libXScrnSaver @@ -26,7 +26,7 @@ , libXinerama , libXrender , libXt -, libcanberra +, libcanberra_gtk2 , libgnome , libgnomeui , mesa @@ -87,7 +87,7 @@ stdenv.mkDerivation { glibc gst_plugins_base gstreamer - gtk + gtk2 kerberos libX11 libXScrnSaver @@ -98,7 +98,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra + libcanberra_gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index b03698f10fa..ded4e66e366 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL +{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx - [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 + [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 9ca5ace2caf..e8885edaa2a 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,9 +1,9 @@ { spellChecking ? true -, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null +, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null , perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify }: -assert spellChecking -> gtkspell != null; +assert spellChecking -> gtkspell2 != null; let version = "0.139"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60"; }; - buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ] - ++ stdenv.lib.optional spellChecking gtkspell; + buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ] + ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 53b7b7748b2..b540ffd0967 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, pkgconfig, gtk, bzip2, libglade, openssl +{ stdenv, fetchurl, scons, pkgconfig, gtk2, bzip2, libglade, openssl , libX11, boost, zlib, libnotify }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"; }; - buildInputs = [ scons pkgconfig gtk bzip2 libglade openssl libX11 boost libnotify ]; + buildInputs = [ scons pkgconfig gtk2 bzip2 libglade openssl libX11 boost libnotify ]; installPhase = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 421fd9afb16..3a6a71843a2 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, -libX11, glib, gtk, gdk_pixbuf, pango, atk, cairo, openssl }: +libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { name = "transgui-5.0.1-svn-r${revision}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig unzip fpc lazarus stdenv.cc - libX11 glib gtk gdk_pixbuf pango atk cairo openssl + libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl ]; NIX_LDFLAGS = " diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 4f64e947f09..f8ec7ec01d9 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -8,7 +8,7 @@ , tzdata , cacert , glib -, gtk +, gtk2 , atk , gdk_pixbuf , cairo @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { makeWrapper busybox file - gtk + gtk2 gdk_pixbuf ]; libPath = stdenv.lib.makeLibraryPath [ glib - gtk + gtk2 atk gdk_pixbuf cairo @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 05019f83353..503632c009b 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: +{ stdenv, fetchurl, ncurses, gtk2, pkgconfig, autoconf, automake, perl, halibut, libtool }: stdenv.mkDerivation rec { version = "0.67"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd unix ''; - buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + buildInputs = [ gtk2 ncurses pkgconfig autoconf automake perl halibut libtool ]; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6257c5f95eb..9bc38996107 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, makeWrapper -, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 +, glib, gtk2, gettext, libxkbfile, libgnome_keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: let @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; buildInputs = [ cmake pkgconfig makeWrapper - glib gtk gettext libxkbfile libgnome_keyring libX11 + glib gtk2 gettext libxkbfile libgnome_keyring libX11 freerdp libssh libgcrypt gnutls ]; cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index f5104665562..5bc5bafe7db 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk, libpcap, libglade, libgnome, libgnomeui +{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, libgnome, libgnomeui , gnomedocutils, scrollkeeper, libxslt }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-scrollkeeper" ]; buildInputs = [ - pkgconfig libtool gtk libpcap libglade libgnome libgnomeui gnomedocutils + pkgconfig libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils scrollkeeper libxslt ]; diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 5c87218e306..ef824f57a35 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile -, intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice +, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers , pango, gdk_pixbuf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant bzip2 isocodes # glib, gtk... - glib gtk goffice webkit + glib gtk2 goffice webkit # gnome... dconf gconf libgnomecanvas gsettings_desktop_schemas # financial @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ''; # The following settings fix failures in the test suite. It's not required otherwise. - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk pango gdk_pixbuf ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk2 pango gdk_pixbuf ]; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = true; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 7ef77dc2562..1eedf1f313b 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx +{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade , libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml + pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 9cd1389ab0a..88a9a6baf14 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -242,7 +242,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 681870ac4ca..2b3d4ad2ec6 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -246,7 +246,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 6da3bf6df83..3209ae0a9c9 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libxml2, gettext, libical, libnotify -, libarchive, gtkspell, webkitgtk2, libgringotts }: +{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, gettext, libical, libnotify +, libarchive, gtkspell2, webkitgtk2, libgringotts }: stdenv.mkDerivation rec { name = "osmo-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05"; }; - buildInputs = [ pkgconfig gtk libxml2 gettext libical libnotify libarchive - gtkspell webkitgtk2 libgringotts ]; + buildInputs = [ pkgconfig gtk2 libxml2 gettext libical libnotify libarchive + gtkspell2 webkitgtk2 libgringotts ]; meta = with stdenv.lib; { description = "A handy personal organizer"; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 9222ed5757c..e7fd9450029 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , pkgconfig , intltool -, gnome +, gnome2 , libxslt , python }: @@ -20,15 +20,17 @@ in stdenv.mkDerivation { sha256 = "15h6ps58giy5r1g66sg1l4xzhjssl362mfny2x09khdqsvk2j38k"; }; - buildInputs = [ + buildInputs = with gnome2; [ pkgconfig intltool - gnome.GConf - gnome.gtk - gnome.libgnomecanvas - gnome.libgnomeui - gnome.libglade - gnome.scrollkeeper + + GConf + gtk + libgnomecanvas + libgnomeui + libglade + scrollkeeper + libxslt python ]; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 9014e388468..6f2cb29e436 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject, python }: +{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject2, python }: # # TODO: Declare configuration options for the following optional dependencies: @@ -17,7 +17,7 @@ buildPythonApplication rec { sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject ]; + propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 25934c71e8e..b8406c3255c 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk, perl }: +{ stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation rec { name = "geda-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-update-xdg-database"; - buildInputs = [ pkgconfig guile gtk flex gawk perl ]; + buildInputs = [ pkgconfig guile gtk2 flex gawk perl ]; meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 92d0ceba1cf..7cdcbb7fd19 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk, autoreconfHook }: +{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation rec { name = "gerbv-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk autoreconfHook ]; + buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk2 autoreconfHook ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 32d39d8a609..657d20553b7 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: +{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { name = "gtkwave-3.3.70"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz"; }; - buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; + buildInputs = [ gtk2 gperf pkgconfig bzip2 tcl tk judy xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 257d6993ff5..1f510943400 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; }; - buildInputs = [ pkgconfig gtk bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ pkgconfig gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index df7d053d93b..f26b13c5e32 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig}: +{stdenv, fetchurl, gtk2, pkgconfig}: stdenv.mkDerivation rec { name = "xoscope-2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - buildInputs = [ gtk pkgconfig ]; + buildInputs = [ gtk2 pkgconfig ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 patches = [ ./gtkdepre.diff ]; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 3e5408ac7f5..8db1beedebb 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libglade, gtk, guile, libxml2, perl +{ stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl , intltool, libtool, pkgconfig }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; patches = [ ./struct.patch ]; - buildInputs = [libglade gtk guile libxml2 + buildInputs = [libglade gtk2 guile libxml2 perl intltool libtool pkgconfig]; prebuild = '' diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index d7c593b736e..ada586fc4e6 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype +{ stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc gtk gdk_pixbuf atk pango glib cairo + [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview ] + ":${stdenv.cc.cc.lib}/lib64"; diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index 6ced805b311..e74e17fa44f 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk, gsl +{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk2, gsl , pkgconfig, gtksourceview, pango, gettext, libglade }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0vri2pzvmm38qaihfvwlry30f40lcnps4blg59ixic4q20ldxf5d"; }; - buildInputs = [ libxml2 readline zlib perl cairo gtk gsl pkgconfig + buildInputs = [ libxml2 readline zlib perl cairo gtk2 gsl pkgconfig gtksourceview pango gettext libglade ]; doCheck = false; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 8482bd6fe94..89670e66641 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -3,7 +3,7 @@ , Xaw3d, withXaw3d ? false #, withPVMlib ? false , tcl, tk, withTk ? false -, gtk, withGtk ? false # working ? +, gtk2, withGtk ? false # working ? #, withF2c ? false , ocaml, withOCaml ? false #, withJava ? false @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; buildInputs = [gfortran ncurses] - ++ lib.optionals withGtk [gtk] + ++ lib.optionals withGtk [gtk2] ++ lib.optionals withOCaml [ocaml] ++ lib.optional withX xlibsWrapper ; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index d45f4a2b210..53ea9ce7212 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, -sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: +sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: stdenv.mkDerivation rec { version = "7.4.42"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi - freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 + freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index fd39f61c863..8d673a15fa8 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }: +doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }: let @@ -17,8 +17,8 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison - doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu - git gtk makeWrapper]; + doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu + git gtk2 makeWrapper]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 212151b6c4a..01929655081 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; }; - pythonPath = with python2Packages; [ configobj dbus-python pygobject pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 51d70156e9c..485e8cc6c21 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, makeWrapper , jre -, gtk, glib +, gtk2, glib , libXtst , git, mercurial, subversion , which @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { which ]; runtime_lib_paths = lib.makeLibraryPath [ - gtk glib + gtk2 glib libXtst ]; in '' diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index e3c28853403..6eb9e94e969 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, libgnomeui, libXv, libraw1394, libdc1394 +{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cp ${automake}/share/automake-*/mkinstalldirs . ''; - buildInputs = [ pkgconfig glib gtk libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; + buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { homepage = http://damien.douxchamps.net/ieee1394/coriander/; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 0200b0c70f4..cf17b66ef48 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl +, glib, gtk2, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk gtkglext pangox_compat + dbus curl pkgconfig glib gtk2 gtkglext pangox_compat xulrunner makeWrapper ] diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 7c1d13fd79d..1096a64887b 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}: +{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}: stdenv.mkDerivation rec { name = "gnome-mplayer-1.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; - buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf]; + buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf]; meta = { homepage = http://kdekorte.googlepages.com/gnomemplayer; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 9113ff75bfd..8653305f908 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra }: +, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }: python3Packages.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./datadir.patch ./bug_1190693.patch ]; prePatch = '' rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra}/bin/canberra-gtk-play" + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play" ''; # no tests diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index 12fc7151cd0..a579b21a1de 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, gnome, librsvg, pygtk, pythonPackages }: +{ stdenv, fetchurl, buildPythonApplication, gnome2, librsvg, pygtk, pythonPackages }: buildPythonApplication rec { name = "key-mon-${version}"; @@ -11,7 +11,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = - [ gnome.python_rsvg librsvg pygtk pythonPackages.xlib ]; + [ gnome2.python_rsvg librsvg pygtk pythonPackages.xlib ]; doCheck = false; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index ea515827087..3d2bf1f1a4f 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -50,7 +50,7 @@ #AMR-WB float support no #AMR-WB IF2 support no -{ stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv +{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv , pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -63,7 +63,7 @@ stdenv.mkDerivation { sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; }; - buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv + buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages configureFlags = "--enable-local-ffmpeg=no"; diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 2a45c1a9eb2..9e08f2fffb1 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -69,13 +69,13 @@ in buildPythonApplication rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; - buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [ + buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup taglib gsettings_desktop_schemas sqlite ]; propagatedBuildInputs = with pythonPackages; [ - pygobject pygtk pycurl sqlite3 mutagen pycairo dbus-python + pygobject2 pygtk pycurl sqlite3 mutagen pycairo dbus-python pywebkitgtk] ++ [ libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg ] ++ optional enableBonjour avahi; diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index a0605bb7128..2c5d3d365c1 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz -, xdpyinfo, makeWrapper, gtk, xorg, gnome3 }: +, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }: stdenv.mkDerivation rec { name = "mkcast-2015-03-13"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p"; }; - buildInputs = with pythonPackages; [ makeWrapper pygtk gtk xlib ]; + buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 527d31004b0..c8414bbb83a 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk +{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ ./xlib.patch ]; buildInputs = [ - perl perlXMLParser pkgconfig gtk scrollkeeper + perl perlXMLParser pkgconfig gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 8c420b11f55..dfd92685579 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, config , pkgconfig, libtool -, gtk, mesa, readline, libX11, libXpm +, gtk2, mesa, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true , ncurses ? null @@ -12,7 +12,7 @@ assert sdlSupport -> (SDL2 != null); assert termSupport -> (ncurses != null); -assert wxSupport -> (gtk != null && wxGTK != null); +assert wxSupport -> (gtk2 != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { busMouse = config.bochs.busMouse or false; buildInputs = with stdenv.lib; - [ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional busMouse "--enable-busmouse" ; - NIX_CFLAGS_COMPILE="-I${gtk.dev}/include/gtk-2.0/ -I${libtool}/include/"; + NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/"; NIX_LDFLAGS="-L${libtool.lib}/lib"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 46b8c8affc7..b641a571b24 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, libXrender, renderproto, gtk, libwnck, pango, cairo +, libXrender, renderproto, gtk2, libwnck, pango, cairo , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm , metacity , libstartup_notification, libpthreadstubs, libxcb, intltool @@ -24,7 +24,7 @@ let sha256="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph"; }; buildInputs = [cmake pkgconfig - libXrender renderproto gtk libwnck pango cairo + libXrender renderproto gtk2 libwnck pango cairo GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification metacity libpthreadstubs libxcb intltool diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 7e23dd60503..b521240b48f 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libX11, libXmu, libXpm, gtk, libpng, libjpeg, libtiff, librsvg +, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = - [ pkgconfig libX11 libXmu libXpm gtk libpng libjpeg libtiff librsvg ]; + [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index b7f1d9adad1..296de4e1e25 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk, libXmu }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }: stdenv.mkDerivation rec { name = "trayer-1.1.6"; - buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ]; + buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ]; src = fetchFromGitHub { owner = "sargon"; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 3757b10754b..3db05bd4d51 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -5,7 +5,7 @@ , libxml2 , pciutils , pkgconfig -, gtk +, gtk2 }: let version = "20061014"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { libxml2 pciutils pkgconfig - gtk + gtk2 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index b019951db5f..94ce68f9cb2 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - inherit (pythonPackages) python pygobject pygtk dbus-python; + inherit (pythonPackages) python pygobject2 pygtk dbus-python; in stdenv.mkDerivation rec { version = "2.28"; name = "gnome-python-${version}.1"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/ ''; - buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; + buildInputs = [ python pkgconfig pygobject2 pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; doCheck = false; diff --git a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix index 1e2faf3af84..e06ffca8b90 100644 --- a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix +++ b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome, librsvg, pkgconfig, pygtk, python, gtk }: +{ stdenv, fetchurl, gnome2, librsvg, pkgconfig, pygtk, python, gtk }: stdenv.mkDerivation rec { ver_maj = "2.32"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = "python waf install"; - buildInputs = [ gtk gnome.gnome_python librsvg pkgconfig pygtk python ]; + buildInputs = [ gtk gnome2.gnome_python librsvg pkgconfig pygtk python ]; meta = with stdenv.lib; { homepage = "http://www.pygtk.org"; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix index e77e9e19970..78fc82ebaed 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, libkrb5, networkmanagerapplet, networkmanager @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas + [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix index d0d7bceef61..cf781d24b6f 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig libsoup polkit libcanberra gdk_pixbuf librsvg + libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server libical libtool nss gtk gstreamer makeWrapper gdm diff --git a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix index 5f255743313..95785d9ed4d 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }: let majVer = "1.0"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; }; - buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ]; + buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix index a128990b402..8b992d30e80 100644 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 +, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra + gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 gnome3.geocode_glib libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix index 194b4aca438..884b328dbe7 100644 --- a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ ./x86.patch ]; - propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject ]; + propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index a1a7390274e..817c0d9b1d6 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra; + inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix index a2c644caf3c..71bb11d4853 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime +, libnotify, libcanberra_gtk3, libsecret, gmime , libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala_0_32 webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite + vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix index ff176754e38..1c7f712b12c 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, + dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, glib, gobjectIntrospection, telepathy_glib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra vala_0_32 gst_all_1.gstreamer + makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index fff958de9a0..ac374f1293a 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -5,9 +5,10 @@ let callPackage = newScope (deps // xfce_self); deps = { # xfce-global dependency overrides should be here - inherit (pkgs.gnome) libglade libwnck vte gtksourceview; + inherit (pkgs.gnome2) libglade libwnck vte gtksourceview; inherit (pkgs.gnome3) dconf; inherit (pkgs.perlPackages) URI; + gtk = pkgs.gtk2; }; xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index a5900f2ce25..0c8b0f5ce60 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { buildInputs = [ stdenv gcc glibc libtool gnumake autoconf automake - file which zsh m4 gnome.gtk zlib gmp - gnome.libgnomecanvas pango sqlite + file which zsh m4 gnome2.gtk zlib gmp + gnome2.libgnomecanvas pango sqlite libxml2 pkgconfig perl smlnj ]; diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 68d3e4d12ed..5fa88ab87e9 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared_mime_info, gtksourceview, gtk +, shared_mime_info, gtksourceview, gtk2 , targetVersion ? "4.5" }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig mono makeWrapper nant shared_mime_info gtksourceview - gtk + gtk2 ]; patches = [ ./config.patch ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 1f2be91b13a..704d9d5be64 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , fpc -, gtk, glib, pango, atk, gdk_pixbuf +, gtk2, glib, pango, atk, gdk_pixbuf , libXi, inputproto, libX11, xproto, libXext, xextproto , makeWrapper }: @@ -15,7 +15,7 @@ let name = "lazarus-${version}"; }; buildInputs = [ - fpc gtk glib libXi inputproto + fpc gtk2 glib libXi inputproto libX11 xproto libXext xextproto pango atk stdenv.cc makeWrapper gdk_pixbuf ]; diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 5d9ca621648..b75b57d0f47 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, -gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: +gnutls, gnome2, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: assert emacsSupport -> (emacs != null); @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download buildInputs = [ - pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk + pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite ] ++ stdenv.lib.optional emacsSupport emacs; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 775971821aa..8fe775de146 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -26,7 +26,7 @@ , mesa_noglu , freetype , fontconfig -, gnome +, gnome2 , cairo , alsaLib , atk @@ -177,7 +177,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 3e9736fff52..ec7723f5b7e 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, guile, guile_lib, gwrap -, pkgconfig, gconf, glib, gnome_vfs, gtk +, pkgconfig, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui , pango, guileCairo, autoconf, automake, texinfo }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { gconf glib gnome_vfs - gtk + gtk2 libglade libgnome libgnomecanvas diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 42734e08cd3..fae838e3d2f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -229,7 +229,7 @@ self: super: { }); gtk = pkgs.lib.overrideDerivation (addPkgconfigDepend ( addBuildTool super.gtk self.gtk2hs-buildtools - ) pkgs.gtk) (drv: { + ) pkgs.gtk2) (drv: { hardeningDisable = [ "fortify" ]; }); gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index baec1bfb818..7744015de37 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -49,7 +49,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; }; - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dd5ae329c20..56662e0abeb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -129344,7 +129344,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome2) pango;}; "papa" = callPackage ({ mkDerivation, base, directory, doctest, filepath, papa-base diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 6ab527b7ccf..8e462ffaacc 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper , cairo, coreutils, fontconfig, freefont_ttf -, glib, gmp, gtk, libffi, libjpeg, libpng +, glib, gmp, gtk2, libffi, libjpeg, libpng , libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? true @@ -17,7 +17,7 @@ let fontconfig glib gmp - gtk + gtk2 libjpeg libpng mpfr diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 70e7b1c33c0..9b6ba128512 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, gettext, qt4 +{ stdenv, fetchurl, gnutls, gtk2, libgcrypt, pkgconfig, gettext, qt4 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ gtk qt4 gnutls libgcrypt ]; + buildInputs = [ gtk2 qt4 gnutls libgcrypt ]; QTDIR = qt4; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index cda126218ba..fad8dc86bd1 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, libsndfile, pkgconfig, python }: +{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python }: stdenv.mkDerivation rec { name = "lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks"; }; - buildInputs = [ gtk libsndfile pkgconfig python ]; + buildInputs = [ gtk2 libsndfile pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index a56425b8425..c74c8caa23f 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm, lv2, pkgconfig, python }: +{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python }: stdenv.mkDerivation rec { name = "lvtk-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python ]; - buildInputs = [ boost gtkmm lv2 ]; + buildInputs = [ boost gtkmm2 lv2 ]; + + enableParallelBuilding = true; # Fix including the boost libraries during linking postPatch = '' diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 789846c15e7..97d7dd83155 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, gtk, pkgconfig, python }: +{ stdenv, fetchsvn, boost, gtk2, pkgconfig, python }: stdenv.mkDerivation rec { name = "raul-svn-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4"; }; - buildInputs = [ boost gtk pkgconfig python ]; + buildInputs = [ boost gtk2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index f5a98750ded..518f89092ab 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: +{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: stdenv.mkDerivation rec { name = "suil-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"; }; - buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; + buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index d3754ecd6c6..a3cdbbf2827 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk }: +{ fetchurl, stdenv, pkgconfig, clutter, gtk2 }: stdenv.mkDerivation rec { name = "clutter-gtk-0.10.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq"; }; - propagatedBuildInputs = [ clutter gtk ]; + propagatedBuildInputs = [ clutter gtk2 ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 980155c007a..fb5431ff8d5 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk }: +{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "cwiid-2010-02-21-git"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk ]; + buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk2 ]; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index 5c2ef0f6b4e..af83068e5ad 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base -, pygobject, gst_python, gupnp_igd }: +, pygobject2, gst_python, gupnp_igd }: stdenv.mkDerivation rec { name = "farsight2-0.0.31"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm"; }; - buildInputs = [ libnice python pygobject gst_python gupnp_igd ]; + buildInputs = [ libnice python pygobject2 gst_python gupnp_igd ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index a57c3da333e..27bff62bd65 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst-plugins-base -, pygobject, gst-python, gupnp_igd +, pygobject2, gst-python, gupnp_igd , gst-plugins-good, gst-plugins-bad, gst-libav }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0c5vlyiwb799wpby4g9vffiy0nf09gy2cr84ksfy3jwzsxf5n38j"; }; - buildInputs = [ libnice python pygobject gupnp_igd libnice ]; + buildInputs = [ libnice python pygobject2 gupnp_igd libnice ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index eef89e9cff6..6af09bd5179 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }: +{ stdenv, fetchsvn, graphviz, gtkmm2, pkgconfig, python }: stdenv.mkDerivation rec { name = "ganv-svn-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj"; }; - buildInputs = [ graphviz gtk gtkmm pkgconfig python ]; + buildInputs = [ graphviz gtkmm2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index b54b3a38e76..304d8110ad4 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk, bzip2, intltool +, librsvg, pango, gtk2, bzip2, intltool , OpenGL ? null }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ] + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 754c85ecf03..9aba42fdf4b 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome, libxslt }: +{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, libxslt }: stdenv.mkDerivation rec { name = "geoclue-0.12.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; - buildInputs = [ pkgconfig libxml2 gnome.GConf libxslt ]; + buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt ]; propagatedBuildInputs = [dbus glib dbus_glib]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index ad5220cac4e..804da49fda9 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { name = "gio-sharp-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoconf automake which ]; - buildInputs = [ mono gtk-sharp ]; + buildInputs = [ mono gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 59f97e46bef..f95d0720d83 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, mono, gtk-sharp, gnome}: +{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}: stdenv.mkDerivation { name = "gnome-sharp-2.24.1"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; }; - buildInputs = [ pkgconfig gtk mono gtk-sharp ] - ++ (with gnome; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); + buildInputs = [ pkgconfig gtk2 mono gtk-sharp-2_0 ] + ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); patches = [ ./Makefile.in.patch ]; diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix index 75a7dfb4898..2da683fcbeb 100644 --- a/pkgs/development/libraries/goffice/0.8.nix +++ b/pkgs/development/libraries/goffice/0.8.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 +{ fetchurl, stdenv, pkgconfig, glib, gtk2, libglade, bzip2 , pango, libgsf, libxml2, libart, intltool, gettext , cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk libglade libart cairo pango + glib libgsf libxml2 gtk2 libglade libart cairo pango ]; postInstall = diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 5a367e1d593..080b781ca31 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, cairo, glib, pkgconfig }: +{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig }: stdenv.mkDerivation rec { majVersion = "1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - buildInputs = [ gtk cairo glib pkgconfig ]; + buildInputs = [ gtk2 cairo glib pkgconfig ]; meta = { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index 249eb9a30da..b8a18d70af9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer -, gst_plugins_base, pygobject +, gst_plugins_base, pygobject2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-testFake.patch ]; buildInputs = - [ pkgconfig gst_plugins_base pygobject ] + [ pkgconfig gst_plugins_base pygobject2 ] ; propagatedBuildInputs = [ gstreamer python ]; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 8d8a018f1fe..1931624d08f 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cdk, unzip, gtk, glib, ncurses, pkgconfig}: +{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let sha256="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; }; buildInputs = [ - cdk unzip gtk glib ncurses pkgconfig + cdk unzip gtk2 glib ncurses pkgconfig ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 92578f42e34..b92bbf64514 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp, gio-sharp }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { name = "gtk-sharp-beans-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook which ]; - buildInputs = [ mono gtk-sharp gio-sharp ]; + buildInputs = [ mono gtk-sharp-2_0 gio-sharp ]; dontStrip = true; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index a8667770271..ca6c4d0dfa6 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, mono , glib , pango -, gtk +, gtk2 , GConf ? null , libglade ? null , libgtkhtml ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; buildInputs = [ - pkgconfig mono glib pango gtk GConf libglade libgnomecanvas + pkgconfig mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { inherit monoDLLFixer; passthru = { - inherit gtk; + gtk = gtk2; }; meta = { diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 6e5a1329c9b..82c4f25f66c 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk }: +{ stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "gtkdatabox-0.9.2.0"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gtk ]; + propagatedBuildInputs = [ gtk2 ]; meta = { description = "Gtk+ widget for displaying large amounts of numerical data"; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index d88160361ca..eb0ba2db103 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk }: +{ fetchurl, stdenv, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "gtkimageview-1.6.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig gtk2 ]; preConfigure = '' sed '/DEPRECATED_FLAGS/d' -i configure diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index bb2993348fd..e36d77142e9 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, t1lib, glib, libxml2, popt, gmetadom ? null }: +{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: let pname = "gtkmathview"; @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - buildInputs = [pkgconfig gtk t1lib glib gmetadom libxml2 popt]; - propagatedBuildInputs = [gtk t1lib]; + buildInputs = [pkgconfig t1lib glib gmetadom libxml2 popt]; + propagatedBuildInputs = [gtk2 t1lib]; patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 76175859e7d..b87b60c59da 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = "gtkmm-${minVer}.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [pkgconfig]; - propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; + propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; doCheck = true; diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix index 512d443f9fc..52fc4b26e6d 100644 --- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix +++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk, monoDLLFixer}: +{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk2, monoDLLFixer}: stdenv.mkDerivation { name = "gtkmozembed-sharp-0.7-pre41601"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig mono gtksharp gtk + pkgconfig mono gtksharp gtk2 ]; inherit monoDLLFixer; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index daf400fdc5a..22b96abf642 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, aspell, pkgconfig, enchant, intltool}: +{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - buildInputs = [aspell pkgconfig gtk enchant intltool]; + buildInputs = [aspell pkgconfig gtk2 enchant intltool]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 37403f50e2b..5ef8bbac5d1 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , glib, dbus, udev, libgudev, udisks2, libgcrypt , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, samba, libmtp -, gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }: +, gnomeSupport ? false, gnome, libgnome_keyring, makeWrapper }: let ver_maj = "1.22"; diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 00d3e45805c..2c1ca6aeb1e 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp, monoDLLFixer }: +{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { name = "hyena-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig mono gtk-sharp + pkgconfig mono gtk-sharp-2_0 ]; postPatch = '' diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 889137d6284..9fb2a2a2e3a 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf, ecj }: +{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk2, gconf, ecj }: stdenv.mkDerivation rec { name = "classpath-0.99"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./missing-casts.patch ]; - buildInputs = [ javac jvm antlr pkgconfig gtk gconf ecj ]; + buildInputs = [ javac jvm antlr pkgconfig gtk2 gconf ecj ]; configurePhase = '' # GCJ tries to compile all of Classpath during the `configure' run when diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index c3053e1f268..2cf08e34575 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk +{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 , libXt, libXtst, libXi, mesa, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip pkgconfig ]; - buildInputs = [ jdk gtk libXt libXtst libXi mesa webkit libsoup ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi mesa webkit libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 0ab24df57ba..2bd1f0a48ac 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk -, gtk_doc, gtk2, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk_doc, gtk2, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 581e6e70b71..5c8e1759a2d 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk -, gtk_doc, gtk3, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygtk +, gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 4cf0c52d88b..82f7930dd72 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -5,7 +5,7 @@ , glib, dbus_glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala_0_23 +, python, pygobject2, pygtk, gobjectIntrospection, vala_0_23 , monoSupport ? false, mono ? null, gtk-sharp ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib - python pygobject pygtk gobjectIntrospection vala_0_23 + python pygobject2 pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index f4f3c774789..32eb4e04f03 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala_0_23 +{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_23 , extraOnly ? false }: let inherit (stdenv.lib) optional; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; }; - buildInputs = [ glib gtk intltool pango pkgconfig vala_0_23 ] + buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_23 ] ++ optional (!extraOnly) menu-cache; configureFlags = optional extraOnly "--with-extra-only"; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index b86eba685bb..0de84b1141d 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk, gnome, gnome3, +{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo }: @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk gnome.GConf libstartup_notification - gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser + gtk2 gnome2.GConf libstartup_notification + gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index b4b951325a4..706e6a714c1 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, - libimobiledevice, python, pygobject, mutagen, - monoSupport ? true, mono, gtk-sharp + libimobiledevice, python, pygobject2, mutagen, + monoSupport ? true, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils - gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; + gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ]; nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp ]; + libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 514aea12c7e..9fb22eee6b2 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -4,8 +4,8 @@ , pkgconfig, autoconf , glib, dbus_glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils -, monoSupport ? false, mono ? null, gtk-sharp ? null +, python, pygobject2, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils +, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib libdbusmenu-glib - python pygobject pygtk gobjectIntrospection vala_0_23 gnome_doc_utils + python pygobject2 pygtk gobjectIntrospection vala_0_23 gnome_doc_utils ] ++ (if gtkVersion == "2" - then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 ]); postPatch = '' diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 0cf07d0769a..6f833ec81a9 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }: +{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; }; - buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ]; + buildInputs = stdenv.lib.optionals useGTK [ gtk2 pkgconfig ]; preBuild = '' diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index c0f12c54564..c8751c3e5dd 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, glib, gtk, libxml2, pango +, glib, gtk2, libxml2, pango }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk libxml2 pango ]; + buildInputs = [ glib gtk2 libxml2 pango ]; meta = with stdenv.lib; { description = "A collection of GTK+ widgets"; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 0cdcbd72bae..ebf81c67be0 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }: stdenv.mkDerivation rec { name = "libunique-1.1.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ]; - buildInputs = [ pkgconfig glib gtk dbus_glib ]; + buildInputs = [ pkgconfig glib gtk2 dbus_glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index ae83ce78d5f..36b5759a2cc 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng, numactl +, nettle, libgcrypt, python, pygobject2, gobjectIntrospection, libcap_ng, numactl , xen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject gobjectIntrospection libcap_ng numactl xen + python pygobject2 gobjectIntrospection libcap_ng numactl xen ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index a5f52beed54..6e0809664cf 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, intltool, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: let ver_maj = "2.31"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ]; + buildInputs = [ pkgconfig gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index b7460778474..564bf9f62e3 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }: +{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }: let version = "016"; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 1b69563355b..975bcc3d308 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,7 +2,7 @@ , libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu , freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal , libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL -, qt4, poppler, librsvg, gtk +, qt4, poppler, librsvg, gtk2 , withApps ? true }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf - pkgconfig kbproto SDL qt4 poppler librsvg gtk + pkgconfig kbproto SDL qt4 poppler librsvg gtk2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 65d45923e5a..a93ae2fc8ad 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -6,7 +6,7 @@ , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base , buildWebkit ? stdenv.isLinux , flashplayerFix ? false, gdk_pixbuf -, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs , developerBuild ? false , docs ? false , examples ? false @@ -65,13 +65,13 @@ stdenv.mkDerivation rec { src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter gconf = GConf.out; - gtk = gtk.out; + gtk = gtk2.out; libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; }) ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }) ++ [(fetchpatch { @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] ++ optionals (mysql != null) [ mysql.lib ] - ++ optionals gtkStyle [ gtk gdk_pixbuf ] + ++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; nativeBuildInputs = [ perl pkgconfig which ]; diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 2f252a6cf28..fdeb4f7e6c9 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -66,7 +66,7 @@ let harfbuzz = pkgs.harfbuzz-icu; cups = if stdenv.isLinux then pkgs.cups else null; # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index b80b8a1e761..d36a7ef8273 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -19,7 +19,7 @@ , buildExamples ? false , buildTests ? false , developerBuild ? false -, libgnomeui, GConf, gnome_vfs, gtk +, libgnomeui, GConf, gnome_vfs, gtk2 , decryptSslTraffic ? false }: @@ -28,7 +28,7 @@ let system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; # Search path for Gtk plugin - gtkLibPath = lib.makeLibraryPath [ gtk gnome_vfs libgnomeui GConf ]; + gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ]; dontInvalidateBacking = fetchurl { url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; @@ -211,7 +211,7 @@ stdenv.mkDerivation { ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql # FIXME: move to the main list on rebuild. - ++ [gnome_vfs.out libgnomeui.out gtk GConf]; + ++ [gnome_vfs.out libgnomeui.out gtk2 GConf]; nativeBuildInputs = [ lndir patchelf perl pkgconfig python ]; diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix index 32b07b6c907..3a2d026842a 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix index 46f47b41535..683bb031e95 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix index 46f47b41535..683bb031e95 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 77a74c4e844..6803dfd76de 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL gtk mesa ]; + buildInputs = [ SDL gtk2 mesa ]; nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 0ef024424b2..3034370e4ea 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, gtk2, spice_protocol, intltool, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python, pygtk, autoreconfHook, usbredir, libsoup , gtk3, enableGTK3 ? false }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir - ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); + ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk2 ]); nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ]; diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 7396b700955..c4530da5453 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, libX11, cairo , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ] ++ optional withMesa mesa; nativeBuildInputs = [ pkgconfig ]; @@ -56,7 +56,10 @@ stdenv.mkDerivation rec { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index d9f0dcc1b0f..82ba9daed80 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa ++ optional stdenv.isDarwin setfile; @@ -52,7 +52,10 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index bdb0032a85a..087e93b0e05 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa ++ optional stdenv.isDarwin setfile; @@ -52,7 +52,10 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index a0ecb641f08..b9db22f20c5 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils, libpulseaudio, dbus +, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: @@ -67,15 +67,15 @@ stdenv.mkDerivation rec { wrapProgram `pwd`/android \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]} wrapProgram `pwd`/uiautomatorviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} wrapProgram `pwd`/hierarchyviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} # The emulators need additional libraries, which are dynamically loaded => let's wrap them @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} cd ../.. '' @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} cd ../.. '' diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 5a5eb1ab51b..dfed411f0b3 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -40,7 +40,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils libpulseaudio dbus; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; inherit platformTools buildTools support supportRepository platforms sysimages addons; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index bc4b490e853..3b6ff64daea 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - buildInputs = [ ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4 ]; + buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index a4d4314cd02..0e5772632d5 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}: +{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; }; - buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4]; + buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f4076fbd95f..8ee51ed311f 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }: +{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./META.patch ]; buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig - findlib freetype lablgtk cairo gdk_pixbuf gtk pango ]; + findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 6b9f6f09ea3..204adeb9451 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk, +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk2, enableGtkSupport ? true # Whether to compile with support for Gtk # integration (library file cairo2_gtk). Depends - # on lablgtk and gtk. + # on lablgtk and gtk2. }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib pkgconfig cairo ] - ++ optionals enableGtkSupport [ gtk ]; + ++ optionals enableGtkSupport [ gtk2 ]; # lablgtk2 is marked as a propagated build input since loading the # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index cdf5a73768d..52a2c586f85 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, }: stdenv.mkDerivation rec { name = "python-libsexy-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - libsexy gtk glib pango libxml2 + libsexy gtk2 glib pango libxml2 ]; postInstall = '' diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 5354d9750f4..7d0896c1fb8 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo +{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (libglade != null) libglade; - propagatedBuildInputs = [ gtk pygobject pycairo ]; + propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; configurePhase = "configurePhase"; @@ -43,8 +43,8 @@ buildPythonPackage rec { postInstall = '' rm $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject.version}.pth \ + ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 + ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \ $out/lib/${python.libPrefix}/site-packages/${name}.pth ''; } diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 1c248251a32..133cbdb34fd 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }: let version = "2.10.1"; in @@ -12,7 +12,7 @@ mkPythonDerivation { patches = [ ./codegendir.patch ]; - buildInputs = [ python pkgconfig pygobject glib pygtk gnome2.gtksourceview ]; + buildInputs = [ python pkgconfig pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 2620a5b7741..29d2f13ca9a 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk }: +{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2 }: stdenv.mkDerivation rec { name = "visualvm-1.3.8"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # To get the native LAF, JVM needs to see GTK’s .so-s. wrapProgram $out/bin/visualvm \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk2 ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 7a2796b48ca..32e212a0921 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand +{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false @@ -16,7 +16,7 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps libiberty_static]; + buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake pkgconfig which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) @@ -28,7 +28,7 @@ let ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt --with${if avahi != null then "" else "out"}-avahi - --with${if gtk != null then "" else "out"}-gtk + --with${if gtk2 != null then "" else "out"}-gtk --without-gnome --enable-rfc2553 --disable-Werror # a must on gcc 4.6 diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index b9d03445286..2641a1ed04f 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, hicolor_icon_theme }: +{stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - buildInputs = [ gtk pkgconfig hicolor_icon_theme ]; + buildInputs = [ gtk2 pkgconfig hicolor_icon_theme ]; meta = { homepage = http://gtkdialog.googlecode.com/; diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index cd027c7b08d..50e35928bba 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -6,7 +6,7 @@ # # In NixOS, simply add this package to services.udev.packages. -{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk, libXext, libXft +{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils , makeDesktopItem, xkeyboardconfig @@ -15,7 +15,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - glib libSM libICE gtk libXext libXft fontconfig libXrender libXfixes libX11 + glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib ]; diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 1fcda13dab8..5028ac9580c 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -9,7 +9,7 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 18fdf7bca3b..30c40331a0f 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -9,7 +9,7 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index db5d6ee6b6f..ba5d6c8e334 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -8,7 +8,7 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc xorg.libXtst xorg.libXi diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index e3dc3d77abc..4be334e20ed 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, binutils -, pkgconfig, gtk, glib, pango, libglade }: +, pkgconfig, gtk2, glib, pango, libglade }: stdenv.mkDerivation rec { name = "sysprof-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s"; }; - buildInputs = [ binutils pkgconfig gtk glib pango libglade ]; + buildInputs = [ binutils pkgconfig gtk2 glib pango libglade ]; meta = { homepage = http://sysprof.com/; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 1f2153bf337..6a10f73cfe4 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib -, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf +, glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf , libXi, libXrender, libXext }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk2 libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a59d656b625..91a01edc23a 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk +{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss , xorg, libcap, unzip }: @@ -7,7 +7,7 @@ let thrustEnv = buildEnv { name = "env-thrust"; paths = [ - stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf + stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk_pixbuf cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 0a72e6bb91e..b2c96beeeb3 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -4,7 +4,7 @@ , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb -, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp, chromium +, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp-2_0, chromium }: let @@ -19,10 +19,10 @@ let binPath = lib.makeBinPath [ nodejs gnutar ]; developBinPath = lib.makeBinPath [ mono ]; developLibPath = lib.makeLibraryPath [ - glib libgnomeui gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk + glib libgnomeui gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]; developDotnetPath = lib.concatStringsSep ":" [ - gnome-sharp gtk-sharp + gnome-sharp gtk-sharp-2_0 ]; ver = "5.3.5"; diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 1d151b66920..47ab73ca269 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk, curl }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }: stdenv.mkDerivation rec { name = "ckan-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "test"; - libraries = stdenv.lib.makeLibraryPath [ gtk curl ]; + libraries = stdenv.lib.makeLibraryPath [ gtk2 curl ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index eb20c0b329e..2044782c1bd 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, freeglut, SDL, mesa, libXi, libXmu}: +{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, mesa, libXi, libXmu}: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; - buildInputs = [ pkgconfig gtk freeglut SDL mesa libXi libXmu ]; + buildInputs = [ pkgconfig gtk2 freeglut SDL mesa libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 7915822589c..bed3abccf9b 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk }: +{ stdenv, fetchurl, perl, pkgconfig, gtk2 }: stdenv.mkDerivation { name = "eboard-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./eboard.patch ]; - buildInputs = [ gtk ]; + buildInputs = [ gtk2 ]; nativeBuildInputs = [ perl pkgconfig ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 69d87411da6..519b7c2ac24 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac, gtk, libvorbis, libvpx, makeDesktopItem, mesa, nasm +{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, mesa, nasm , pkgconfig, SDL2, SDL2_mixer }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ flac gtk libvorbis libvpx mesa SDL2 SDL2_mixer ] + buildInputs = [ flac gtk2 libvorbis libvpx mesa SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index af785d0e4a9..b5619644bd8 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth -, gtkClient ? false, gtk +, gtkClient ? false, gtk2 , server ? true, readline }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ zlib bzip2 curl lzma gettext ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] - ++ optionals gtkClient [ gtk ] + ++ optionals gtkClient [ gtk2 ] ++ optional server readline; configureFlags = [] diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index f6f52aabb6b..4269d3a74db 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ gtk glib pkgconfig mesa wxGTK libX11 xproto ]; + buildInputs = [ gtk2 glib pkgconfig mesa wxGTK libX11 xproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 3f1735c31aa..254b65cc4d9 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, intltool } : +{stdenv, fetchurl, gtk2, pkgconfig, intltool } : stdenv.mkDerivation rec { name = "pioneers-0.12.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1yqypk5wmia8fqyrg9mn9xw6yfd0fpkxj1355csw1hgx8mh44y1d"; }; - buildInputs = [ gtk pkgconfig intltool ]; + buildInputs = [ gtk2 pkgconfig intltool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 5e5da9497e5..bd7e1188928 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk +{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,9 +34,9 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" for f in $out/lib/*; do patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 2eb3a916eb3..ca1721e8ed5 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, - gtk, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, + gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = - [ boost cmake ffmpeg freeglut glib gtk libjpeg libpng + [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal pixman pkgconfig python27Full SDL ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index c4477ab01d9..ac658ee1367 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, + pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost pkgconfig - libuuid openal ogre ois curl gtk mygui unzip angelscript + libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; meta = { diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 78b9e155642..6ba91feced8 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar -, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring +, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake wxGTK30 openal pkgconfig curl gettext libtorrentRasterbar pcre jsoncpp - boost libpng libX11 libnotify gtk doxygen makeWrapper glib minizip alure + boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure ]; patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix index 0d6c21bfa82..4fa7ec1b045 100644 --- a/pkgs/games/zandronum/bin.nix +++ b/pkgs/games/zandronum/bin.nix @@ -8,7 +8,7 @@ , freetype , gdk_pixbuf , glib -, gtk +, gtk2 , libjpeg_turbo , mesa_glu , mesa_noglu @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { freetype gdk_pixbuf glib - gtk + gtk2 libjpeg_turbo mesa_glu mesa_noglu diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 298cba88a9f..ae96a946e79 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { pythonPath = with pythonPackages; [ dbus pillow - pygobject + pygobject2 recursivePthLoader reportlab usbutils diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 74204cd4e54..6c671b56b7a 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { pythonPath = with pythonPackages; [ dbus pillow - pygobject + pygobject2 recursivePthLoader reportlab usbutils diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 0f85331bdd5..43ace9ca977 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }: +, gettext, gtk2, SDL, zlib, glib, openal, mesa, lua, freetype }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ sha256 = "05wngvpqj8kj4wzi5jzzhvs19iljb3m6ba1l2hk4rz68b400ndv6"; }; - buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ]; + buildInputs = [ pkgconfig gettext gtk2 SDL zlib glib openal mesa lua freetype ]; phases = "unpackPhase buildPhase installPhase"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 217468c5bd2..34507a25252 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtk SDL nasm zlib libpng mesa ]; + buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index b8acf36cfd0..8d3537b0ee6 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,7 @@ , udev , mesa, SDL , libao, openal, libpulseaudio -, gtk, gtksourceview +, gtk2, gtksourceview }: with stdenv.lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ]; + [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' 7z x $src diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 990f1e7106e..8f232a6023c 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, mesa , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtk GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk2 GConf mesa expat zlib ]; installPhase = '' diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 07174d76e4e..0e3c156c16a 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}: +{stdenv, fetchurl, which, pkgconfig, SDL, gtk2, mesa, SDL_ttf}: stdenv.mkDerivation { name = "mupen64plus-1.5"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq"; }; - buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ]; + buildInputs = [ which pkgconfig SDL gtk2 mesa SDL_ttf ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 99de1ae0d17..c6f4df1e5c0 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk2, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 pkgconfig libxml2 xlibsWrapper libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index ceafc714381..ca1881bdd5f 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, alsaLib, SDL}: +{stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - buildInputs = [ pkgconfig gtk alsaLib SDL ]; + buildInputs = [ pkgconfig gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index dd2c2380a8e..6251282aae3 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11 -, pkgconfig, gtk, SDL, autoreconfHook, makeDesktopItem +, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa - pkgconfig gtk SDL autoreconfHook ]; + pkgconfig gtk2 SDL autoreconfHook ]; configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui"; desktopItem = makeDesktopItem { diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index e35e319a57f..66ea152b274 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]) - ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.gnome.glib ] + ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 3540119e665..4217f1d0b1e 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam + [ pkgconfig bc perl libjpeg mesa gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 025ef0913be..b7ff36c0917 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { version = "2016-06-06"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - configureFlags = "--with-gnome=${gnome3.version}"; + configureFlags = "--with-gnome=${gnome3.version} "; meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 100b280ef57..ad13b5f17ab 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: + cmake, dbus_glib, glib, gtk2, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { version = "1.4.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09mz4szsz3yswbj0nbw6qzlc5bc4id0f9r6ifm60b5nc8x1l72d2"; }; - buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf + buildInputs = [ cmake dbus_glib glib gtk2 gdk_pixbuf pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.pixman ]; diff --git a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix index 905e26998a0..bea08bcdf14 100644 --- a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix +++ b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { version = "5.0.7"; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index f0352530480..51a60a27431 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, pkgconfig, gtk, gtk3, fltk13 }: +{ stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: +# Comes from upstream as as bundle of several tools, +# some use gtk2, some gtk3 (and some even fltk13). stdenv.mkDerivation rec { name = "alsa-tools-${version}"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0ldbaz3qr7z0639xg37ba7cmrb512rrjavap6r5jjl0ab665ad3x"; }; - buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ]; + buildInputs = [ alsaLib pkgconfig gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 22b6f5d6354..de318a9474a 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ dbus pygobject pygobject3 recursivePthLoader ]; + [ dbus pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix index 829b383e072..8cd5e064e1e 100644 --- a/pkgs/os-specific/linux/bluez/bluez5_28.nix +++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ dbus pygobject pygobject3 recursivePthLoader ]; + [ dbus pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 163ac189050..8c2badc3d68 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk }: +{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "latencytop-0.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - buildInputs = [ ncurses glib pkgconfig gtk ]; + buildInputs = [ ncurses glib pkgconfig gtk2 ]; meta = { homepage = http://latencytop.org; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f561c0addc8..e7297b0efe2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences +, gtk2, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -52,7 +52,7 @@ stdenv.mkDerivation { allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf cairo ] ); + [ gtk2 atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xorg.libXv ]; patches = if (!libsOnly) && (versionAtLeast kernel.dev.version "4.7") then [ ./365.35-kernel-4.7.patch ] else []; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 27c963f4bd9..d1f6d36a6a7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xorg, zlib, gtk, atk, pango, glib, gdk_pixbuf}: +{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}: let @@ -36,7 +36,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xorg.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 65cf42333e0..63da39e0c23 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf +, gtk2, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -41,7 +41,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); + [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index 0682954d558..e34aaf3c908 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf +, gtk2, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -52,7 +52,7 @@ stdenv.mkDerivation { allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); + [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index b591c3b002c..ec35fabd05a 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpdk, libpcap, utillinux , pkgconfig -, gtk, withGtk ? false +, gtk2, withGtk ? false }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ dpdk libpcap ] - ++ stdenv.lib.optionals withGtk [gtk]; + ++ stdenv.lib.optionals withGtk [gtk2]; RTE_SDK = "${dpdk}"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 6318654742e..1cdf9044b8f 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -7,7 +7,7 @@ , alsaLib , audiofile , pkgconfig -, gtk +, gtk2 , gettext , libXpm }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { audiofile dbus_glib pkgconfig - gtk + gtk2 gettext libXpm ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 6ae8e410bf2..311d707e9c5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl -, ncurses, mysql, gtk, lua, hwloc, numactl +, ncurses, mysql, gtk2, lua, hwloc, numactl }: stdenv.mkDerivation rec { @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - curl python munge perl pam openssl mysql.lib ncurses gtk lua hwloc numactl + curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl ]; configureFlags = [ "--with-munge=${munge}" "--with-ssl=${openssl.dev}" "--sysconfdir=/etc/slurm" - ] ++ stdenv.lib.optional (gtk == null) "--disable-gtktest"; + ] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest"; preConfigure = '' substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 596176d939d..b8d2498b71e 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - pythonPackages.pygobject + pythonPackages.pygobject2 pythonPackages.pygtk ]; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 665e2ee8ed5..e3e3de36575 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; - pythonPath = [ pythonPackages.pygobject pythonPackages.dbus-python pythonPackages.pygtk ]; + pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index dd8b496fe66..070152427f2 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, gtkmm }: +{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: let version = "1.5.2"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; }; - buildInputs = [ glib gtk2 gtkmm pkgconfig ]; + buildInputs = [ glib gtkmm2 pkgconfig ]; NIX_LDFLAGS = "-lX11"; diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 272143791f2..cb3749efb44 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libglade, openbox, +{ stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox, imlib2, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig gtk libglade openbox imlib2 libstartup_notification makeWrapper + pkgconfig gtk2 libglade openbox imlib2 libstartup_notification makeWrapper ]; postInstall = '' diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 43fa105e680..63abc31e007 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libX11, xproto, libXext, xextproto, libXtst -, gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }: +, gtk2, libXi, inputproto, pkgconfig, recordproto, texinfo }: stdenv.mkDerivation rec { version = "3.19"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libX11 xproto libXext xextproto libXtst gtk + [ libX11 xproto libXext xextproto libXtst gtk2 libXi inputproto pkgconfig recordproto texinfo ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1a84eaddda6..f3159533931 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pkgconfig -, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk +, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: @@ -22,7 +22,7 @@ in buildPythonApplication rec { xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage xorg.libXrandr xorg.libxkbfile - pango cairo gdk_pixbuf atk gtk glib + pango cairo gdk_pixbuf atk gtk2 glib ffmpeg libvpx x264 libwebp @@ -30,7 +30,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pillow pygtk pygobject rencode pycrypto cryptography pycups lz4 dbus-python + pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python ]; preBuild = '' diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 9ef9755d6bc..cf58f75aacc 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gobjectIntrospection -, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, python, gtk2, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala_0_23 +, kbproto, libX11, libXext, xextproto, pygobject2, libgcrypt, gtk3, vala_0_23 , pygobject3, libogg, enableGTK3 ? false, libgpgerror }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { python gnutls cairo libtool pkgconfig glib libffi libgcrypt intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV gobjectIntrospection libogg libgpgerror - ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk pygtk pygobject ]); + ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk2 pygtk pygobject2 ]); NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; makeFlags = stdenv.lib.optionalString (!enableGTK3) - "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; + "CODEGENDIR=${pygobject2}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; # Fix broken .la files preFixup = '' diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index e924a58d4d7..6ed6a7f2402 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk, pkgconfig, intltool }: +{ stdenv, fetchFromGitHub, gtk2, pkgconfig, intltool }: stdenv.mkDerivation rec { version = "0.5.4.7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; }; - buildInputs = [ gtk pkgconfig intltool ]; + buildInputs = [ gtk2 pkgconfig intltool ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index bd5a6b1d592..38df702cb16 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome, glib, +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome2, glib, pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - which autoconf automake libtool gnome.gtkdoc glib pkgconfig + which autoconf automake libtool gnome2.gtkdoc glib pkgconfig gobjectIntrospection ]; diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index fb88a8c37d4..d0ad0c27f20 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome2, fftw, gsl, goffice, libgsf }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libxml2 flex bison vips - gnome.gtk fftw gsl goffice libgsf + gnome2.gtk fftw gsl goffice libgsf ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 52ca99b9764..dad611868bc 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, cairo, gtk, poppler }: +, cairo, gtk2, poppler }: stdenv.mkDerivation rec { name = "pdf2svg-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k"; }; - buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk ]; + buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk2 ]; meta = with stdenv.lib; { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 6ff2ee5cd44..4fb16b49717 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, python27, libpng, matio ? null, cfitsio ? null, libwebp ? null }: diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 5366fe55877..cdd99cd7e9a 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchsvn, gyp, which, ninja, - python, pkgconfig, protobuf, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese, + python, pkgconfig, protobuf, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let japanese_usage_dictionary = fetchsvn { @@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec { }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf gtk zinnia qt4 libxcb fcitx gettext ]; + buildInputs = [ protobuf gtk2 zinnia qt4 libxcb fcitx gettext ]; postUnpack = '' rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index e06d2b004ee..644725c2910 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: +{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: let japanese_usage_dictionary = fetchsvn { @@ -20,7 +20,7 @@ in clangStdenv.mkDerivation rec { }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ]; + buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ]; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 894c7b61760..cb33abc3213 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libhangul }: +{ stdenv, fetchurl, pkgconfig, gtk2, libhangul }: stdenv.mkDerivation { name = "nabi-1.0.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; - buildInputs = [ gtk libhangul pkgconfig ]; + buildInputs = [ gtk2 libhangul pkgconfig ]; meta = with stdenv.lib; { description = "The Easy Hangul XIM"; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 9a3e0b905e1..88992c8e4e3 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -2,7 +2,7 @@ , glib , gtk2 , gst_all_1 -, gnome +, gnome2 , libnotify , libxml2 , libunique @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gst_plugins - gnome.GConf - gnome.gnome_icon_theme + gnome2.GConf + gnome2.gnome_icon_theme libnotify libxml2 libunique @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - propagatedUserEnvPkgs = [ gnome.GConf.out ]; + propagatedUserEnvPkgs = [ gnome2.GConf.out ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index fb11a3b8756..ddf9c38ec93 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 -, pciutils, pkgconfig, gtk, ddccontrol-db +, pciutils, pkgconfig, gtk2, ddccontrol-db }: let version = "0.4.2"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; buildInputs = [ - perl perlPackages.libxml_perl libxml2 pciutils gtk ddccontrol-db + perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db ]; patches = [ ./automake.patch ]; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index d1551eb4ccd..adad66c9bfa 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez -, readline, pcsclite, libical, gtk, glib, libXpm }: +, readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { name = "gnokii-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl intltool gettext libusb - glib gtk pkgconfig bluez readline + glib gtk2 pkgconfig bluez readline libXpm pcsclite libical ]; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index d73def7ab9b..cdf2a4aca86 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, gtk, glib, libuuid, pkgconfig, gtkmm, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 5f21559d471..f362e7c53a2 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, smartmontools, gtk, gtkmm, libglademm, pkgconfig, pcre }: +{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }: stdenv.mkDerivation rec { version="0.8.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; }; - buildInputs = [ smartmontools gtk gtkmm libglademm pkgconfig pcre ]; + buildInputs = [ smartmontools gtkmm2 libglademm pkgconfig pcre ]; #installTargets = "install datainstall"; diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman-notify/default.nix index 4f70888fca6..b565b35a929 100644 --- a/pkgs/tools/networking/connman-notify/default.nix +++ b/pkgs/tools/networking/connman-notify/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.dbus-python - pythonPackages.pygobject + pythonPackages.pygobject2 pythonPackages.pygtk pythonPackages.notify ]; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 2b5aae72de4..b122f532630 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, readline, ncurses, gettext, openssl, pkgconfig }: +{ stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }: stdenv.mkDerivation { name = "gftp-2.0.19"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; - buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ]; + buildInputs = [ gtk2 readline ncurses gettext openssl pkgconfig ]; meta = { description = "GTK+-based FTP client"; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index a29503aba1e..901d84b4692 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bison, pkgconfig -, glib, gtk, libxml2, gettext, zlib, binutils, gnutls }: +, glib, gtk2, libxml2, gettext, zlib, binutils, gnutls }: let name = "gtk-gnutella"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ bison binutils gettext pkgconfig ]; - buildInputs = [ glib gnutls gtk libxml2 zlib ]; + buildInputs = [ glib gnutls gtk2 libxml2 zlib ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 59bbd918d64..d693b8db953 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -4,7 +4,7 @@ , locale ? "C" }: let - inherit (pythonPackages) python pygobject dbus-python pyGtkGlade pycairo; + inherit (pythonPackages) python pygobject2 dbus-python pyGtkGlade pycairo; in stdenv.mkDerivation rec { name = "wicd-${version}"; version = "1.7.2.4"; @@ -38,15 +38,15 @@ in stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index f247f8c4e89..106fbf0a150 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, gtk, atk, gdk_pixbuf, pango, makeWrapper }: +{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, pango, makeWrapper }: let dynlibPath = stdenv.lib.makeLibraryPath - [ gtk atk gdk_pixbuf pango ]; + [ gtk2 atk gdk_pixbuf pango ]; in stdenv.mkDerivation rec { name = "jd-gui-${version}"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f9c7dba5660..e1a46cf2b82 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; let - inherit (pythonPackages) python pygtk pygobject pycairo pysqlite; + inherit (pythonPackages) python pygtk pygobject2 pycairo pysqlite; in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" '' + optionalString graphicalSupport '' - wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 + wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject2})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 ''; buildInputs = [ libpcap pkgconfig openssl makeWrapper python ] ++ optionals graphicalSupport [ - libX11 gtk pygtk pysqlite pygobject pycairo + libX11 gtk pygtk pysqlite pygobject2 pycairo ]; meta = { diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index da45866ed2f..57fcfe717be 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeDesktopItem -, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk +, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype + stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt ]; in diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 518fb4944f4..b5f1af6dfed 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, pkgconfig, glib, gtk, python27, pythonPackages }: +{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }: stdenv.mkDerivation rec { version = "0.14.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb"; }; - buildInputs = [ pkgconfig glib gtk python27 pythonPackages.wrapPython pythonPackages.pygtk ]; + buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ]; pythonPath = with pythonPackages; [ pygtk pycairo ]; installPhase = '' diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 7800bfa0831..1d33e5fb09f 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }: +{ stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }: stdenv.mkDerivation rec { name = "gdmap-0.8.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - buildInputs = [ gtk pkgconfig libxml2 intltool gettext ]; + buildInputs = [ gtk2 pkgconfig libxml2 intltool gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index daa79d8e352..05ce5057347 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl -, glib, pango, pangoxsl, gtk, libtool, autoconf, automake }: +, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: stdenv.mkDerivation rec { name = "xmlroff-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { glib pango pangoxsl - gtk + gtk2 popt ]; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index ebfff5dbabc..71b1b43f653 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx +{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx , withMinimal ? false }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [ libdv libjpeg libpng pkgconfig ] - ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ]; + ++ lib.optional (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 146e260f423..57370784834 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1939,11 +1939,11 @@ in sbsigntool = callPackage ../tools/security/sbsigntool { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { - inherit (gnome) libglademm; + inherit (gnome2) libglademm; }; gssdp = callPackage ../development/libraries/gssdp { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; gt5 = callPackage ../tools/system/gt5 { }; @@ -1966,7 +1966,7 @@ in gup = callPackage ../development/tools/build-managers/gup {}; gupnp = callPackage ../development/libraries/gupnp { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; gupnp_av = callPackage ../development/libraries/gupnp-av {}; @@ -2601,7 +2601,7 @@ in mdbtools = callPackage ../tools/misc/mdbtools { }; mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { - inherit (gnome) scrollkeeper; + inherit (gnome2) scrollkeeper; }; mdk = callPackage ../development/tools/mdk { }; @@ -2788,7 +2788,7 @@ in networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; @@ -3361,7 +3361,7 @@ in reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; relfs = callPackage ../tools/filesystems/relfs { - inherit (gnome) gnome_vfs GConf; + inherit (gnome2) gnome_vfs GConf; }; remarkjs = callPackage ../development/web/remarkjs { }; @@ -3694,7 +3694,7 @@ in stricat = callPackage ../tools/security/stricat { }; - staruml = callPackage ../tools/misc/staruml { inherit (gnome) GConf; libgcrypt = libgcrypt_1_5; }; + staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; @@ -3912,7 +3912,7 @@ in vifm = callPackage ../applications/misc/vifm { }; viking = callPackage ../applications/misc/viking { - inherit (gnome) scrollkeeper; + inherit (gnome2) scrollkeeper; inherit (gnome3) gexiv2; }; @@ -4217,9 +4217,9 @@ in xflux-gui = callPackage ../tools/misc/xflux/gui.nix { pexpect = pythonPackages.pexpect; pyGtkGlade = pythonPackages.pyGtkGlade; - pygobject = pythonPackages.pygobject; + pygobject = pythonPackages.pygobject2; pyxdg = pythonPackages.pyxdg; - gnome_python = gnome.gnome_python; + gnome_python = gnome2.gnome_python; }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; @@ -4385,7 +4385,7 @@ in }; boo = callPackage ../development/compilers/boo { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; colm = callPackage ../development/compilers/colm { }; @@ -4666,8 +4666,8 @@ in langC = false; profiledCompiler = false; inherit zip unzip zlib boehmgc gettext pkgconfig perl; - inherit gtk; - inherit (gnome) libart_lgpl; + gtk = gtk2; + inherit (gnome2) libart_lgpl; }); gnat = gnat45; # failed to make 4.6 or 4.8 build @@ -5253,10 +5253,10 @@ in lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { - inherit (gnome) libgnomecanvas libglade gtksourceview; + inherit (gnome2) libgnomecanvas libglade gtksourceview; }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { - inherit (gnome) libgnomecanvas libglade gtksourceview; + inherit (gnome2) libgnomecanvas libglade gtksourceview; }; lablgtk-extras = @@ -5622,7 +5622,7 @@ in }; thrust = callPackage ../development/tools/thrust { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; tinycc = callPackage ../development/compilers/tinycc { }; @@ -6102,8 +6102,8 @@ in guileCairo = callPackage ../development/guile-modules/guile-cairo { }; guileGnome = callPackage ../development/guile-modules/guile-gnome { - gconf = gnome.GConf; - inherit (gnome) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; + gconf = gnome2.GConf; + inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; guile_lib = callPackage ../development/guile-modules/guile-lib { }; @@ -6291,7 +6291,7 @@ in checkstyle = callPackage ../development/tools/analysis/checkstyle { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; chrpath = callPackage ../development/tools/misc/chrpath { }; @@ -6618,15 +6618,15 @@ in node_webkit = node_webkit_0_9; nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; node_webkit_0_9 = callPackage ../development/tools/node-webkit/nw9.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; noweb = callPackage ../development/tools/literate-programming/noweb { }; @@ -6683,7 +6683,7 @@ in }; radare = callPackage ../development/tools/analysis/radare { - inherit (gnome) vte; + inherit (gnome2) vte; lua = lua5; useX11 = config.radare.useX11 or false; pythonBindings = config.radare.pythonBindings or false; @@ -6691,7 +6691,7 @@ in luaBindings = config.radare.luaBindings or false; }; radare2 = callPackage ../development/tools/analysis/radare2 { - inherit (gnome) vte; + inherit (gnome2) vte; lua = lua5; useX11 = config.radare.useX11 or false; pythonBindings = config.radare.pythonBindings or false; @@ -7048,7 +7048,7 @@ in classpath = callPackage ../development/libraries/java/classpath { javac = gcj; jvm = gcj; - gconf = gnome.GConf; + gconf = gnome2.GConf; }; clearsilver = callPackage ../development/libraries/clearsilver { }; @@ -7230,7 +7230,7 @@ in faad2 = callPackage ../development/libraries/faad2 { }; factor-lang = callPackage ../development/compilers/factor-lang { - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; farbfeld = callPackage ../development/libraries/farbfeld { }; @@ -7359,7 +7359,7 @@ in gcab = callPackage ../development/libraries/gcab { }; gdome2 = callPackage ../development/libraries/gdome2 { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; gdbm = callPackage ../development/libraries/gdbm { }; @@ -7374,7 +7374,9 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { }; + gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { + gtk = self.gtk2; + }; geoclue = callPackage ../development/libraries/geoclue {}; @@ -7558,7 +7560,7 @@ in gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; gusb = callPackage ../development/libraries/gusb { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -7657,32 +7659,28 @@ in gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - gtk = pkgs.gtk2; - - gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; + gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { - gtksharp = gtk-sharp; + gtksharp = gtk-sharp-2_0; }; gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome) libglade libgtkhtml gtkhtml + inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf; }; gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome) libglade libgtkhtml gtkhtml + inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf; }; - gtk-sharp = gtk-sharp-2_0; - gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; - gtkspell = callPackage ../development/libraries/gtkspell { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -7690,7 +7688,9 @@ in gts = callPackage ../development/libraries/gts { }; - gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; + gvfs = callPackage ../development/libraries/gvfs { + gnome = self.gnome2; + }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -7939,11 +7939,14 @@ in libcaca = callPackage ../development/libraries/libcaca { }; - libcanberra = callPackage ../development/libraries/libcanberra { }; - libcanberra_gtk3 = libcanberra.override { gtk = gtk3; }; + libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { + gtk = pkgs.gtk3; + }; + libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; }; + libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) - then libcanberra.override { gtk = null; } - else libcanberra; + then pkgs.libcanberra_gtk2.override { gtk = null; } + else pkgs.libcanberra_gtk2; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -7960,7 +7963,7 @@ in libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libchamplain = callPackage ../development/libraries/libchamplain { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; libchardet = callPackage ../development/libraries/libchardet { }; @@ -8342,7 +8345,7 @@ in libiec61883 = callPackage ../development/libraries/libiec61883 { }; libinfinity = callPackage ../development/libraries/libinfinity { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; libinput = callPackage ../development/libraries/libinput { @@ -8636,7 +8639,7 @@ in libunibreak = callPackage ../development/libraries/libunibreak { }; libunique = callPackage ../development/libraries/libunique/default.nix { }; - libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome) gtkdoc; }; + libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome2) gtkdoc; }; liburcu = callPackage ../development/libraries/liburcu { }; @@ -9822,18 +9825,18 @@ in wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { - inherit (gnome) GConf; + inherit (gnome2) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { - inherit (gnome) GConf; + inherit (gnome2) GConf; inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { - inherit (gnome) GConf; + inherit (gnome2) GConf; inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; @@ -10048,7 +10051,7 @@ in smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; @@ -10170,11 +10173,9 @@ in pyexiv2 = pythonPackages.pyexiv2; - pygobject = pythonPackages.pygobject; - - pygobject3 = pythonPackages.pygobject3; - - pygtk = pythonPackages.pygtk; + inherit (self.pythonPackages) + pygtk + pygobject2 pygobject3; pygtksourceview = pythonPackages.pygtksourceview; @@ -10750,7 +10751,7 @@ in storm = callPackage ../servers/computing/storm { }; - slurm-llnl = callPackage ../servers/computing/slurm { gtk = null; }; + slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); @@ -11401,7 +11402,7 @@ in virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; - inherit (gnome) libIDL; + inherit (gnome2) libIDL; enableExtensionPack = config.virtualbox.enableExtensionPack or false; pulseSupport = config.pulseaudio or false; }; @@ -11588,7 +11589,7 @@ in numad = callPackage ../os-specific/linux/numad { }; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome) gtk gtkmm; + inherit (gnome2) gtk gtkmm; }; go-bindata = callPackage ../development/tools/go-bindata { }; @@ -11734,7 +11735,7 @@ in sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; sysprof = callPackage ../development/tools/profiling/sysprof { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; # Provided with sysfsutils. @@ -12242,7 +12243,9 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { + gtk = self.gtk2; + }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -12324,7 +12327,7 @@ in }; abiword = callPackage ../applications/office/abiword { - inherit (gnome) libglade libgnomecanvas; + inherit (gnome2) libglade libgnomecanvas; iconTheme = gnome3.defaultIconTheme; }; @@ -12384,12 +12387,12 @@ in ardour = ardour4; ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { - inherit (gnome) libgnomecanvas libgnomecanvasmm; + inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; }; ardour4 = callPackage ../applications/audio/ardour { - inherit (gnome) libgnomecanvas libgnomecanvasmm; + inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; }; @@ -12400,7 +12403,7 @@ in artha = callPackage ../applications/misc/artha { }; atomEnv = callPackage ../applications/editors/atom/env.nix { - gconf = gnome.GConf; + gconf = gnome2.GConf; }; atom = callPackage ../applications/editors/atom { }; @@ -12496,7 +12499,7 @@ in bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; beast = callPackage ../applications/audio/beast { - inherit (gnome) libgnomecanvas libart_lgpl; + inherit (gnome2) libgnomecanvas libart_lgpl; guile = guile_1_8; }; @@ -12551,7 +12554,7 @@ in bviplus = callPackage ../applications/editors/bviplus { }; calf = callPackage ../applications/audio/calf { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; calcurse = callPackage ../applications/misc/calcurse { }; @@ -12655,7 +12658,7 @@ in CompBus = callPackage ../applications/audio/CompBus { }; compiz = callPackage ../applications/window-managers/compiz { - inherit (gnome) GConf ORBit2 metacity; + inherit (gnome2) GConf ORBit2 metacity; }; constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; @@ -12663,7 +12666,7 @@ in copyq = callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { - inherit (gnome) libgnomeui GConf; + inherit (gnome2) libgnomeui GConf; }; cortex = callPackage ../applications/misc/cortex { }; @@ -12733,7 +12736,7 @@ in }); darktable = callPackage ../applications/graphics/darktable { - inherit (gnome) GConf libglade; + inherit (gnome2) GConf libglade; pugixml = pugixml.override { shared = true; }; }; @@ -12758,7 +12761,7 @@ in dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { - inherit (pkgs.gnome) libart_lgpl libgnomeui; + inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; diffuse = callPackage ../applications/version-management/diffuse { }; @@ -13091,7 +13094,7 @@ in eterm = callPackage ../applications/misc/eterm { }; etherape = callPackage ../applications/networking/sniffers/etherape { - inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper; + inherit (gnome2) gnomedocutils libgnome libglade libgnomeui scrollkeeper; }; evilvte = callPackage ../applications/misc/evilvte { @@ -13188,7 +13191,7 @@ in grepm = callPackage ../applications/search/grepm { }; grip = callPackage ../applications/misc/grip { - inherit (gnome) libgnome libgnomeui vte; + inherit (gnome2) libgnome libgnomeui vte; }; gsimplecal = callPackage ../applications/misc/gsimplecal { }; @@ -13234,7 +13237,7 @@ in filezilla = callPackage ../applications/networking/ftp/filezilla { }; inherit (callPackages ../applications/networking/browsers/firefox { - inherit (gnome) libIDL; + inherit (gnome2) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; enableGTK3 = false; @@ -13244,8 +13247,8 @@ in firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; }; @@ -13258,8 +13261,8 @@ in firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; }; @@ -13287,7 +13290,7 @@ in fluxbox = callPackage ../applications/window-managers/fluxbox { }; fme = callPackage ../applications/misc/fme { - inherit (gnome) libglademm; + inherit (gnome2) libglademm; }; fomp = callPackage ../applications/audio/fomp { }; @@ -13327,7 +13330,7 @@ in get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; webkit = null; lcms = lcms2; wrapPython = pythonPackages.wrapPython; @@ -13432,12 +13435,12 @@ in gmu = callPackage ../applications/audio/gmu { }; gnash = callPackage ../applications/video/gnash { - inherit (gnome) gtkglext; + inherit (gnome2) gtkglext; xulrunner = firefox-unwrapped; }; gnome_mplayer = callPackage ../applications/video/gnome-mplayer { - inherit (gnome) GConf; + inherit (gnome2) GConf; }; gnumeric = callPackage ../applications/office/gnumeric { }; @@ -13449,7 +13452,7 @@ in gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -13463,7 +13466,7 @@ in gtkpod = callPackage ../applications/audio/gtkpod { gnome = gnome3; - inherit (gnome) libglade; + inherit (gnome2) libglade; }; jbidwatcher = callPackage ../applications/misc/jbidwatcher { @@ -13473,7 +13476,7 @@ in qrencode = callPackage ../tools/graphics/qrencode { }; gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { - inherit (gnome) GConf; + inherit (gnome2) GConf; browser = firefox-unwrapped; }; @@ -13486,14 +13489,14 @@ in gmpc = callPackage ../applications/audio/gmpc {}; gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { - inherit (gnome) GConf; + inherit (gnome2) GConf; }; gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; google-chrome-beta = google-chrome.override { channel = "beta"; }; @@ -13522,8 +13525,8 @@ in }; guake = callPackage ../applications/misc/guake { - gconf = gnome.GConf; - vte = gnome.vte.override { pythonSupport = true; }; + gconf = gnome2.GConf; + vte = gnome2.vte.override { pythonSupport = true; }; }; guitone = callPackage ../applications/version-management/guitone { @@ -13544,7 +13547,7 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; hamster-time-tracker = callPackage ../applications/misc/hamster-time-tracker { - inherit (gnome) gnome_python; + inherit (gnome2) gnome_python; }; hello = callPackage ../applications/misc/hello { }; @@ -13579,7 +13582,7 @@ in hydrogen = callPackage ../applications/audio/hydrogen { }; - hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome) GConf; }; + hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome2) GConf; }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -13782,7 +13785,7 @@ in kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { }; kino = callPackage ../applications/video/kino { - inherit (gnome) libglade; + inherit (gnome2) libglade; ffmpeg = ffmpeg_2; }; @@ -13838,7 +13841,7 @@ in lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; lemonbar = callPackage ../applications/window-managers/lemonbar { }; @@ -13856,7 +13859,7 @@ in libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; zip = zip.override { enableNLS = false; }; bluez5 = bluez5_28; @@ -13874,7 +13877,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; zip = zip.override { enableNLS = false; }; #glm = glm_0954; @@ -13898,7 +13901,7 @@ in }; lingot = callPackage ../applications/audio/lingot { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; linuxband = callPackage ../applications/audio/linuxband { }; @@ -13949,7 +13952,7 @@ in }; lilyterm = callPackage ../applications/misc/lilyterm { - inherit (gnome) vte; + inherit (gnome2) vte; gtk = gtk2; }; @@ -14055,7 +14058,7 @@ in monotoneViz = callPackage ../applications/version-management/monotone-viz { inherit (ocamlPackages_4_01_0) lablgtk ocaml camlp4; - inherit (gnome) libgnomecanvas glib; + inherit (gnome2) libgnomecanvas glib; }; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; @@ -14149,7 +14152,7 @@ in multimon-ng = callPackage ../applications/misc/multimon-ng { }; multisync = callPackage ../applications/misc/multisync { - inherit (gnome) ORBit2 libbonobo libgnomeui GConf; + inherit (gnome2) ORBit2 libbonobo libgnomeui GConf; }; inherit (callPackages ../applications/networking/mumble { @@ -14305,7 +14308,7 @@ in nvpy = callPackage ../applications/editors/nvpy { }; obconf = callPackage ../tools/X11/obconf { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; obs-studio = qt5.callPackage ../applications/video/obs-studio { @@ -14368,7 +14371,7 @@ in panotools = callPackage ../applications/graphics/panotools { }; paprefs = callPackage ../applications/audio/paprefs { - inherit (gnome) libglademm gconfmm GConf; + inherit (gnome2) libglademm gconfmm GConf; }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; @@ -14391,7 +14394,7 @@ in perseus = callPackage ../applications/science/math/perseus {}; petrifoo = callPackage ../applications/audio/petrifoo { - inherit (gnome) libgnomecanvas; + inherit (gnome2) libgnomecanvas; }; pdftk = callPackage ../tools/typesetting/pdftk { }; @@ -14470,7 +14473,7 @@ in }; pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtk-sharp; + gtksharp = gtk-sharp-2_0; }; plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -14719,7 +14722,7 @@ in scite = callPackage ../applications/editors/scite { }; scribus = callPackage ../applications/office/scribus { - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; }; seafile-client = callPackage ../applications/networking/seafile-client { }; @@ -14884,7 +14887,7 @@ in }; spotify = callPackage ../applications/audio/spotify { - inherit (gnome) GConf; + inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; }; @@ -14979,7 +14982,7 @@ in tailor = callPackage ../applications/version-management/tailor {}; tangogps = callPackage ../applications/misc/tangogps { - gconf = gnome.GConf; + gconf = gnome2.GConf; }; teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; @@ -15020,7 +15023,7 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; terminator = callPackage ../applications/misc/terminator { - vte = gnome.vte.override { pythonSupport = true; }; + vte = gnome2.vte.override { pythonSupport = true; }; inherit (pythonPackages) notify; }; @@ -15035,14 +15038,14 @@ in thinkingRock = callPackage ../applications/misc/thinking-rock { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (gnome) libIDL; + inherit (gnome2) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; }; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; }; tig = gitAndTools.tig; @@ -15214,7 +15217,7 @@ in }; virtmanager = callPackage ../applications/virtualization/virt-manager { - inherit (gnome) gnome_python; + inherit (gnome2) gnome_python; vte = gnome3.vte; dconf = gnome3.dconf; gtkvnc = gtkvnc.override { enableGTK3 = true; }; @@ -15350,7 +15353,7 @@ in wordnet = callPackage ../applications/misc/wordnet { }; workrave = callPackage ../applications/misc/workrave { - inherit (gnome) GConf gconfmm; + inherit (gnome2) GConf gconfmm; inherit (python27Packages) cheetah; }; @@ -15413,7 +15416,7 @@ in wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; wxcam = callPackage ../applications/video/wxcam { - inherit (gnome) libglade; + inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; }; @@ -15513,7 +15516,7 @@ in xneur = xneur_0_13; gxneur = callPackage ../applications/misc/gxneur { - inherit (gnome) libglade GConf; + inherit (gnome2) libglade GConf; }; xiphos = callPackage ../applications/misc/xiphos { @@ -15524,7 +15527,7 @@ in }; xournal = callPackage ../applications/graphics/xournal { - inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; + inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; }; apvlv = callPackage ../applications/misc/apvlv { }; @@ -15577,7 +15580,7 @@ in xsd = callPackage ../development/libraries/xsd { }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; xss-lock = callPackage ../misc/screensavers/xss-lock { }; @@ -15609,7 +15612,7 @@ in xnee = callPackage ../tools/X11/xnee { }; xvidcap = callPackage ../applications/video/xvidcap { - inherit (gnome) scrollkeeper libglade; + inherit (gnome2) scrollkeeper libglade; }; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -16274,24 +16277,26 @@ in callPackage = newScope pkgs.enlightenment; }); - gnome2 = callPackage ../desktops/gnome-2 { + gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; } // { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk gtkmm + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 # Included for backwards compatibility libsoup libwnck gtk_doc gnome_doc_utils; - }; + + gtk = self.gtk2; + gtkmm = self.gtkmm2; + libcanberra = self.libcanberra_gtk2; + }); gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); gnome3 = gnome3_20; - gnome = recurseIntoAttrs gnome2; - hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; @@ -16562,7 +16567,7 @@ in ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { - inherit (gnome) libglade; + inherit (gnome2) libglade; guile = guile_1_8; }; @@ -17000,7 +17005,7 @@ in pcalc = callPackage ../applications/science/math/pcalc { }; pspp = callPackage ../applications/science/math/pssp { - inherit (gnome) libglade gtksourceview; + inherit (gnome2) libglade gtksourceview; }; singular = callPackage ../applications/science/math/singular {}; @@ -17037,7 +17042,7 @@ in celestia = callPackage ../applications/science/astronomy/celestia { lua = lua5_1; - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; cytoscape = callPackage ../applications/science/misc/cytoscape { }; @@ -17142,7 +17147,7 @@ in darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; - desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome) gtkglext libglade; }; + desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -17162,7 +17167,7 @@ in dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = newScope pkgs.gnome ../applications/networking/instant-messengers/ekiga { }; + ekiga = newScope pkgs.gnome2 ../applications/networking/instant-messengers/ekiga { }; emulationstation = callPackage ../misc/emulators/emulationstation { }; @@ -17273,7 +17278,7 @@ in martyr = callPackage ../development/libraries/martyr { }; mess = callPackage ../misc/emulators/mess { - inherit (pkgs.gnome) GConf; + inherit (pkgs.gnome2) GConf; }; moltengamepad = callPackage ../misc/drivers/moltengamepad { }; @@ -17347,7 +17352,7 @@ in mnemonicode = callPackage ../misc/mnemonicode { }; - mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { + mysqlWorkbench = newScope gnome2 ../applications/misc/mysql-workbench { lua = lua5_1; libctemplate = libctemplate_2_2; }; @@ -17686,7 +17691,7 @@ in snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; higan = callPackage ../misc/emulators/higan { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; misc = callPackage ../misc/misc.nix { }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index f287a35bdc4..3508f1a1547 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -580,7 +580,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y"; }; - buildInputs = [ pkgs.gtk-sharp ]; + buildInputs = [ pkgs.gtk-sharp-2_0 ]; meta = { description = "A generic framework for creating extensible applications"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 83499fa3218..7fb5cf38d93 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , fetchFromGitHub, libmpack }: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e4c6cdff49..c1a8a02f77c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -232,8 +232,7 @@ in modules // { pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; - pygobject = callPackage ../development/python-modules/pygobject { }; - + pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; @@ -241,7 +240,7 @@ in modules // { pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; pyGtkGlade = self.pygtk.override { - libglade = pkgs.gnome.libglade; + libglade = pkgs.gnome2.libglade; }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { @@ -14821,7 +14820,7 @@ in modules // { configure ''; - buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; + buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -22802,7 +22801,7 @@ in modules // { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject2 ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; From a769e0ffae239e62f368f5a21c3e00a849dd5531 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Mon, 12 Sep 2016 02:08:53 +0300 Subject: [PATCH 081/234] nixos manual: mention gtk-related alias changes --- nixos/doc/manual/release-notes/rl-1703.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index c0fa4388a2a..2eda8a56b20 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -29,7 +29,11 @@ following incompatible changes: - + + gnome alias has been removed along with + gtk, gtkmm and several others. + Now you need to use versioned attributes, like gnome3. + From 54900180343eee7b87b4186f1179a568460514da Mon Sep 17 00:00:00 2001 From: Robert Glossop Date: Mon, 12 Sep 2016 12:13:48 -0400 Subject: [PATCH 082/234] freerdpUnstable: 1.2.0 -> 2.0 --- pkgs/applications/networking/remote/freerdp/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index cc6ec9bd231..033f867f99c 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { - name = "freerdp-1.2.0-beta1"; + name = "freerdp-2.0-dev"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; - rev = "1.2.0-beta1+android7"; - sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; + rev = "1855e36179fb197e713d41c4ef93e19cf1f0be2f"; + sha256 = "1lydkh6by0sjy6dl57bzg7c11ccyp24s80pwxw9h5kmxkbw6mx5q"; }; patches = [ From d37c84106a1ea0e3071e7ab7c66e5233d5d7b4af Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Mon, 12 Sep 2016 19:26:30 +0200 Subject: [PATCH 083/234] ntl: init at 9.11.0 (#18507) --- pkgs/development/libraries/ntl/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/ntl/default.nix diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix new file mode 100644 index 00000000000..32467e4849b --- /dev/null +++ b/pkgs/development/libraries/ntl/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, perl, gmp, libtool +}: + +stdenv.mkDerivation rec { + name = "ntl-${version}"; + version = "9.11.0"; + src = fetchurl { + url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; + sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p"; + }; + + buildInputs = [ perl gmp libtool ]; + + sourceRoot = "${name}/src"; + + enableParallelBuilding = true; + + dontAddPrefix = true; + + configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ]; + + # doCheck = true; # takes some time + + meta = { + description = "A Library for doing Number Theory"; + longDescription = '' + NTL is a high-performance, portable C++ library providing data + structures and algorithms for manipulating signed, arbitrary + length integers, and for vectors, matrices, and polynomials over + the integers and over finite fields. + ''; + homepage = http://www.shoup.net/ntl/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 146e260f423..9e0e98a5b88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8950,6 +8950,8 @@ in non = callPackage ../applications/audio/non { }; + ntl = callPackage ../development/libraries/ntl { }; + nspr = callPackage ../development/libraries/nspr { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 7e273d9209c6c96acce0f3c4abff3b7ec18ca360 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 12 Sep 2016 22:44:58 +0200 Subject: [PATCH 084/234] ispc: attempt to make build more robust and hydra-compatible --- pkgs/development/compilers/ispc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 08958a42b44..6bc7f66ca29 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, -testedTargets ? ["sse4" "host"] +testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: # TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693"; }; - enableParallelBuilding = true; + # there are missing dependencies in the Makefile, causing sporadic build failures + enableParallelBuilding = false; doCheck = true; From fbf6a97b04bba5f36a3caf26f54034324397f15a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 27 Aug 2016 19:46:43 +0300 Subject: [PATCH 085/234] linuxPackages.displaylink: init at 1.1.62 --- .../os-specific/linux/displaylink/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/os-specific/linux/displaylink/default.nix diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix new file mode 100644 index 00000000000..87cf7c18caf --- /dev/null +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -0,0 +1,70 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, unzip, kernel, utillinux, libdrm, libusb1, makeWrapper }: + +let + arch = + if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x86" + else throw "Unsupported architecture"; + libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 ]; + +in stdenv.mkDerivation rec { + name = "displaylink-${version}"; + version = "1.1.62"; + + src = fetchFromGitHub { + owner = "DisplayLink"; + repo = "evdi"; + rev = "fe779940ff9fc7b512019619e24a5b22e4070f6a"; + sha256 = "02hw83f6lscms8hssjzf30hl9zly3b28qcxwmxvnqwfhx1q491z9"; + }; + + daemon = fetchurl { + name = "displaylink.zip"; + url = "http://www.displaylink.com/downloads/file?id=607"; + sha256 = "0jky3xk4dfzbzg386qya9l9952i4m8zhf55fdl06pi9r82k2iijx"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + buildInputs = [ kernel libdrm ]; + + buildCommand = '' + unpackPhase + cd $sourceRoot + unzip $daemon + chmod +x displaylink-driver-${version}.run + ./displaylink-driver-${version}.run --target daemon --noexec + + ( cd module + export makeFlags="$makeFlags KVER=${kernel.modDirVersion} KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + export hardeningDisable="pic format" + buildPhase + install -Dm755 evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko + ) + + ( cd library + buildPhase + install -Dm755 libevdi.so $out/lib/libevdi.so + ) + + fixupPhase + + ( cd daemon + install -Dt $out/lib/displaylink *.spkg + install -Dm755 ${arch}/DisplayLinkManager $out/bin/DisplayLinkManager + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath $out/lib:${libPath} \ + $out/bin/DisplayLinkManager + wrapProgram $out/bin/DisplayLinkManager \ + --run "cd $out/lib/displaylink" + ) + ''; + + meta = with stdenv.lib; { + description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; + platforms = [ "x86_64-linux" "i686-linux" ]; + license = licenses.unfree; + homepage = "http://www.displaylink.com/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0102a4d97ec..2a3b09b9742 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11241,6 +11241,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + displaylink = callPackage ../os-specific/linux/displaylink { }; + dpdk = callPackage ../os-specific/linux/dpdk { }; pktgen = callPackage ../os-specific/linux/pktgen { }; From bc493ccfcc9e1308b32eabe335b8ef31626a949e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 27 Aug 2016 19:55:56 +0300 Subject: [PATCH 086/234] displaylink service: init --- nixos/modules/hardware/video/displaylink.nix | 61 ++++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 62 insertions(+) create mode 100644 nixos/modules/hardware/video/displaylink.nix diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixos/modules/hardware/video/displaylink.nix new file mode 100644 index 00000000000..2a9382f3941 --- /dev/null +++ b/nixos/modules/hardware/video/displaylink.nix @@ -0,0 +1,61 @@ +{ config, lib, ... }: + +with lib; + +let + + enabled = elem "displaylink" config.services.xserver.videoDrivers; + + displaylink = config.boot.kernelPackages.displaylink; + +in + +{ + + config = mkIf enabled { + + boot.extraModulePackages = [ displaylink ]; + + boot.kernelModules = [ "evdi" ]; + + # Those are taken from displaylink-installer.sh and from Arch Linux AUR package. + + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess" + ''; + + powerManagement.powerDownCommands = '' + #flush any bytes in pipe + while read -n 1 -t 1 SUSPEND_RESULT < /tmp/PmMessagesPort_out; do : ; done; + + #suspend DisplayLinkManager + echo "S" > /tmp/PmMessagesPort_in + + #wait until suspend of DisplayLinkManager finish + read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out + ''; + + powerManagement.resumeCommands = '' + #resume DisplayLinkManager + echo "R" > /tmp/PmMessagesPort_in + ''; + + systemd.services.displaylink = { + description = "DisplayLink Manager Service"; + after = [ "display-manager.service" ]; + wantedBy = [ "graphical.target" ]; + + serviceConfig = { + ExecStart = "${displaylink}/bin/DisplayLinkManager"; + Restart = "always"; + RestartSec = 5; + }; + + preStart = '' + mkdir -p /var/log/displaylink + ''; + }; + + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dfc1d694e97..8f5dd3ee698 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -40,6 +40,7 @@ ./hardware/video/amdgpu.nix ./hardware/video/ati.nix ./hardware/video/bumblebee.nix + ./hardware/video/displaylink.nix ./hardware/video/nvidia.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix From 6a9fb8b9e0ab806ae83a19a001f742f78087dd5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2016 23:31:21 +0200 Subject: [PATCH 087/234] nix: Enable install check Looks like this got disabled accidentally in ec5b66eb4add9d494d8fb16f6899028750d317a2. --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1563af1374c..71938e37bfe 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,7 @@ let installFlags = "sysconfdir=$(out)/etc"; - doInstallCheck = false; + doInstallCheck = true; separateDebugInfo = stdenv.isLinux; From f5ab9c81a8b00ee1f96f85b0b22a549305cf10a2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 03:24:47 +0200 Subject: [PATCH 088/234] virtualbox: Add an update script Just a small updater which should fetch the latest sha256sums from the upstream site and check whether the current version is the latest one. The output is in a JSON file in the same directory, which then will be used by the Nix expressions to fetch the upstream files. Signed-off-by: aszlig --- .../virtualization/virtualbox/update.py | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 pkgs/applications/virtualization/virtualbox/update.py diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py new file mode 100755 index 00000000000..ff1b2e2fffb --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/update.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 +import os +import re +import json +import urllib.request + +from distutils.version import LooseVersion + +UPSTREAM_INFO_FILE = os.path.join( + os.path.dirname(os.path.abspath(__file__)), + "upstream-info.json" +) + + +def fetch_latest_version(): + url = "http://download.virtualbox.org/virtualbox/LATEST.TXT" + return urllib.request.urlopen(url).read().strip().decode() + + +def load_upstream_info(): + try: + with open(UPSTREAM_INFO_FILE, 'r') as fp: + return json.load(fp) + except FileNotFoundError: + return {'version': "0"} + + +def save_upstream_info(contents): + remark = "Generated using update.py from the same directory." + contents['__NOTE'] = remark + data = json.dumps(contents, indent=2, sort_keys=True) + with open(UPSTREAM_INFO_FILE, 'w') as fp: + fp.write(data + "\n") + + +def fetch_file_table(version): + url = "http://download.virtualbox.org/virtualbox/{}/SHA256SUMS" + url = url.format(version) + result = {} + for line in urllib.request.urlopen(url): + sha, name = line.rstrip().split() + result[name.lstrip(b'*').decode()] = sha.decode() + return result + + +def update_to_version(version): + extpack_start = 'Oracle_VM_VirtualBox_Extension_Pack-' + version_re = version.replace('.', '\\.') + attribute_map = { + 'extpack': r'^' + extpack_start + r'[^-]+-[^.]+.vbox-extpack$', + 'extpackRev': r'^' + extpack_start + r'[^-]+-([^.]+).vbox-extpack$', + 'main': r'^VirtualBox-' + version_re + r'.tar.bz2$', + 'guest': r'^VBoxGuestAdditions_' + version_re + r'.iso$', + } + table = fetch_file_table(version) + new_attrs = {'version': version} + for attr, searchexpr in attribute_map.items(): + result = [re.search(searchexpr, key) for key in table.keys()] + filtered = filter(lambda m: m is not None, result) + found = [m.groups()[0] if len(m.groups()) > 0 else table[m.group(0)] + for m in filtered if m is not None] + + if len(found) == 0: + msg = "No package found for attribute {}".format(attr) + raise AssertionError(msg) + elif len(found) != 1: + msg = "More than one package found for attribute {}: ".format(attr) + msg += ', '.join(found) + raise AssertionError(msg) + else: + new_attrs[attr] = found[0] + return new_attrs + + +info = load_upstream_info() +latest = fetch_latest_version() +if LooseVersion(info['version']) < LooseVersion(latest): + print("Updating to version {}...".format(latest), end="", flush=True) + new_attrs = update_to_version(latest) + save_upstream_info(new_attrs) + print(" done.") +else: + print("Version {} is already the latest one.".format(info['version'])) From 6d69293f26ff57a2621b299409af814ba7226413 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 03:48:14 +0200 Subject: [PATCH 089/234] virtualbox: Generate and use upstream-info.json We now no longer need to update VirtualBox manually, which has a few advantages. Along with making it just easier to update this also makes the update procedure way less error-prone, for example if people forget to bump the extension pack revision or to update the guest additions. Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 15 ++++----------- .../virtualbox/guest-additions/default.nix | 2 +- .../virtualization/virtualbox/upstream-info.json | 8 ++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 161e3ab35bd..3a75479b2cf 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -16,11 +16,7 @@ with stdenv.lib; let buildType = "release"; - # When changing this, update ./guest-additions and the extpack - # revision/hash as well. See - # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS - # for hashes. - version = "5.1.4"; + inherit (importJSON ./upstream-info.json) version extpackRev extpack main; forEachModule = action: '' for mod in \ @@ -41,12 +37,9 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "110228"; extensionPack = requireFile rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; - # IMPORTANT: Hash must be base16 encoded because it's used as an input to - # VBoxExtPackHelperApp! - sha256 = "9462ff1b567c37ad9a33c0c7ca1925776615ec89b5a72563f29a8cc8514cf316"; + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack"; + sha256 = extpack; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) available at: @@ -70,7 +63,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf"; + sha256 = main; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 0a6293462b8..c32a34fbc12 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "e385b698338003595f6cdeee7b631ec6713058ba1227d1f2a1da342bdf741982"; + sha256 = (lib.importJSON ../upstream-info.json).guest; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json new file mode 100644 index 00000000000..de0adf2e9db --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json @@ -0,0 +1,8 @@ +{ + "__NOTE": "Generated using update.py from the same directory.", + "extpack": "9462ff1b567c37ad9a33c0c7ca1925776615ec89b5a72563f29a8cc8514cf316", + "extpackRev": "110228", + "guest": "e385b698338003595f6cdeee7b631ec6713058ba1227d1f2a1da342bdf741982", + "main": "b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf", + "version": "5.1.4" +} From 8bd89c922d527a60d5511a1d8c9d080321478da6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 03:42:16 +0200 Subject: [PATCH 090/234] virtualbox: Split kernel modules into own package Putting the kernel modules into the same output path as the main VirtualBox derivation causes all of VirtualBox to be rebuilt on every single kernel update. The build process of VirtualBox already outputs the kernel module source along with the generated files for the configuration of the main VirtualBox package. We put this into a different output called "modsrc" which we re-use from linuxPackages.virtualbox, which is now only containing the resulting kernel modules without the main user space implementation. This not only has the advantage of decluttering the Nix expression for the user space portions but also gets rid of the need to nuke references and the need to patch out "depmod -a". Signed-off-by: aszlig --- .../virtualisation/virtualbox-host.nix | 9 ++++- .../virtualization/virtualbox/default.nix | 40 ++++--------------- pkgs/os-specific/linux/virtualbox/default.nix | 23 +++++++++++ pkgs/top-level/all-packages.nix | 36 ++++++++++------- 4 files changed, 59 insertions(+), 49 deletions(-) create mode 100644 pkgs/os-specific/linux/virtualbox/default.nix diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index ce4abecd676..7214543871d 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -4,10 +4,15 @@ with lib; let cfg = config.virtualisation.virtualbox.host; - virtualbox = config.boot.kernelPackages.virtualbox.override { + + virtualbox = pkgs.virtualbox.override { inherit (cfg) enableHardening headless; }; + kernelModules = config.boot.kernelPackages.virtualbox.override { + inherit virtualbox; + }; + in { @@ -60,7 +65,7 @@ in config = mkIf cfg.enable (mkMerge [{ boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ virtualbox ]; + boot.extraModulePackages = [ kernelModules ]; environment.systemPackages = [ virtualbox ]; security.setuidOwners = let diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3a75479b2cf..f0f56cd1735 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,8 +1,8 @@ { stdenv, buildEnv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 +, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2 , libXrandr, libXinerama , which, alsaLib, curl, libvpx, gawk, nettools, dbus -, xorriso, makeself, perl, pkgconfig, nukeReferences +, xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null @@ -18,24 +18,6 @@ let inherit (importJSON ./upstream-info.json) version extpackRev extpack main; - forEachModule = action: '' - for mod in \ - out/linux.*/${buildType}/bin/src/vboxdrv \ - out/linux.*/${buildType}/bin/src/vboxpci \ - out/linux.*/${buildType}/bin/src/vboxnetadp \ - out/linux.*/${buildType}/bin/src/vboxnetflt - do - if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] - then - cp -v out/linux.*/${buildType}/bin/src/vboxdrv/Module.symvers \ - "$mod/Module.symvers" - fi - INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ - make -j $NIX_BUILD_CORES -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ - "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} - done - ''; - # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack"; @@ -59,17 +41,19 @@ let }; in stdenv.mkDerivation { - name = "virtualbox-${version}-${kernel.version}"; + name = "virtualbox-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; sha256 = main; }; + outputs = [ "out" "modsrc" ]; + buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu nukeReferences libpng ] + pkgconfig which libXmu libpng ] ++ optional javaBindings jdk ++ optional pythonBindings python ++ optional pulseSupport libpulseaudio @@ -80,14 +64,11 @@ in stdenv.mkDerivation { prePatch = '' set -x - MODULES_BUILD_DIR=`echo ${kernel.dev}/lib/modules/*/build` - sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ - -e 's@MKISOFS --version@MKISOFS -version@' \ + sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 - find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + sed -i -e ' s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g @@ -152,7 +133,6 @@ in stdenv.mkDerivation { buildPhase = '' source env.sh kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}" - ${forEachModule "modules"} ''; installPhase = '' @@ -164,9 +144,6 @@ in stdenv.mkDerivation { find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ -name src -o -exec cp -avt "$libexec" {} + - # Install kernel modules - ${forEachModule "modules_install"} - # Create wrapper script mkdir -p $out/bin for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do @@ -198,8 +175,7 @@ in stdenv.mkDerivation { done ''} - # Get rid of a reference to linux.dev. - nuke-refs $out/lib/modules/*/misc/*.ko + cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; passthru = { inherit version; /* for guest additions */ }; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix new file mode 100644 index 00000000000..593c4400b7f --- /dev/null +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -0,0 +1,23 @@ +{ stdenv, virtualbox, kernel, strace }: + +stdenv.mkDerivation { + name = "virtualbox-modules-${virtualbox.version}-${kernel.version}"; + src = virtualbox.modsrc; + hardeningDisable = [ + "fortify" "pic" "stackprotector" + ]; + + makeFlags = [ + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + preBuild = "makeFlagsArray+=(\"M=$(pwd)\")"; + buildFlags = [ "modules" ]; + installTargets = [ "modules_install" ]; + + enableParallelBuilding = true; + + meta = virtualbox.meta // { + description = virtualbox.meta.description + " (kernel modules)"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 146e260f423..ff8f3dfca6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11399,23 +11399,13 @@ in vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; - virtualbox = callPackage ../applications/virtualization/virtualbox { - stdenv = stdenv_32bit; - inherit (gnome) libIDL; - enableExtensionPack = config.virtualbox.enableExtensionPack or false; - pulseSupport = config.pulseaudio or false; + virtualbox = callPackage ../os-specific/linux/virtualbox { + virtualbox = pkgs.virtualboxHardened; }; - virtualboxHardened = lowPrio (virtualbox.override { - enableHardening = true; - }); - - virtualboxHeadless = lowPrio (virtualbox.override { - enableHardening = true; - headless = true; - }); - - virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { + virtualbox = pkgs.virtualboxHardened; + }; wireguard = callPackage ../os-specific/linux/wireguard { }; @@ -15224,6 +15214,22 @@ in virtinst = callPackage ../applications/virtualization/virtinst {}; + virtualbox = callPackage ../applications/virtualization/virtualbox { + stdenv = stdenv_32bit; + inherit (gnome) libIDL; + enableExtensionPack = config.virtualbox.enableExtensionPack or false; + pulseSupport = config.pulseaudio or false; + }; + + virtualboxHardened = lowPrio (virtualbox.override { + enableHardening = true; + }); + + virtualboxHeadless = lowPrio (virtualbox.override { + enableHardening = true; + headless = true; + }); + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { fltk = fltk13; }; From d2af4c67228a28b3df3016ca216f48f6d139a62e Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 06:01:27 +0200 Subject: [PATCH 091/234] virtualbox: Explicitly state Qt 5 dependencies In 294281596833b8d83ba90c03b792d31b868f46d7, the dependencies for Qt 5 were passed using buildEnv with all the development binaries, headers and libs. Unfortunately, the build output references that environment which also increases the size of the runtime closure. The upstream makefile assumes a common Qt 5 library path, but that's not the case within Nix, because we have separate paths for the Qt 5 modules. We now patch the makefile to recognize PATH_QT5_X11_EXTRAS_{LIB,INC} so that we can pass in the relevant paths from Qt5X11Extras. In summary, the closure size goes down to 525559600 bytes (501 MB) instead of 863035544 bytes (823 MB) with vbox-qt5-env. Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 21 +++++++------ .../virtualbox/qtx11extras.patch | 31 +++++++++++++++++++ 2 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/qtx11extras.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f0f56cd1735..baf18c3f66f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext +{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2 , libXrandr, libXinerama , which, alsaLib, curl, libvpx, gawk, nettools, dbus @@ -35,11 +35,6 @@ let ''; }; - vbox-qt5-env = buildEnv { - name = "vbox-qt5-env-${version}"; - paths = [ qt5.qtbase.dev qt5.qtbase.out qt5.qtx11extras.dev qt5.qtx11extras.out qt5.qttools.dev ]; - }; - in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -58,7 +53,7 @@ in stdenv.mkDerivation { ++ optional pythonBindings python ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr ] - ++ optionals (!headless) [ vbox-qt5-env libXinerama SDL ]; + ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; @@ -66,7 +61,9 @@ in stdenv.mkDerivation { set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ - -i configure + ${optionalString (!headless) '' + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \ + ''} -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 sed -i -e ' @@ -83,7 +80,7 @@ in stdenv.mkDerivation { ''; patches = optional enableHardening ./hardened.patch - ++ [ ./libressl.patch ]; + ++ [ ./libressl.patch ./qtx11extras.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ @@ -111,11 +108,15 @@ in stdenv.mkDerivation { ${optionalString javaBindings '' VBOX_JAVA_HOME := ${jdk} ''} + ${optionalString (!headless) '' + PATH_QT5_X11_EXTRAS_LIB := ${getLib qt5.qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qt5.qtx11extras}/include + TOOL_QT5_LRC := ${getDev qt5.qttools}/bin/lrelease + ''} LOCAL_CONFIG ./configure \ ${optionalString headless "--build-headless"} \ - ${optionalString (!headless) "--with-qt-dir=${vbox-qt5-env}"} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ ${optionalString (!pulseSupport) "--disable-pulse"} \ diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch new file mode 100644 index 00000000000..f5decc211c7 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch @@ -0,0 +1,31 @@ +diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk +index 71b96a3..73391f0 100644 +--- a/kBuild/units/qt5.kmk ++++ b/kBuild/units/qt5.kmk +@@ -994,9 +994,10 @@ else + $(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) + endif + else +- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) ++ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \ ++ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL)) + endif +- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) ) ++ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras ) + endif + $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) ) + +diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk +index 38db6b0..7dd446b 100644 +--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk ++++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk +@@ -912,9 +912,6 @@ VirtualBox_QT_MODULES = Core Gui + ifdef VBOX_WITH_QTGUI_V5 + # Qt5 requires additional modules: + VirtualBox_QT_MODULES += Widgets PrintSupport +- VirtualBox_QT_MODULES.linux += X11Extras +- VirtualBox_QT_MODULES.solaris += X11Extras +- VirtualBox_QT_MODULES.freebsd += X11Extras + VirtualBox_QT_MODULES.darwin += MacExtras + VirtualBox_QT_MODULES.win += WinExtras + endif # VBOX_WITH_QTGUI_V5 From 4a44eca07d5da2adc162b727a2ca0683aa29c45d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 06:34:33 +0200 Subject: [PATCH 092/234] nixos/release-notes: Add VirtualBox changes The change is backwards-compatible for users of the NixOS module but not if people were using the package directly, so let's warn users about that. Signed-off-by: aszlig --- nixos/doc/manual/release-notes/rl-1609.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 70759ee25f8..792b4458caa 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -90,6 +90,15 @@ following incompatible changes: Use security.audit.enable = true; to explicitly enable it. + + + pkgs.linuxPackages.virtualbox now contains only the + kernel modules instead of the VirtualBox user space binaries. + If you want to reference the user space binaries, you have to use the new + pkgs.virtualbox instead. + + + From 6846b22bb49d07574e6da3273c38305a765e136f Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Tue, 13 Sep 2016 07:00:39 +0200 Subject: [PATCH 093/234] squishyball: init at 19580 (#18354) --- pkgs/applications/audio/opusfile/default.nix | 4 +- .../audio/opusfile/include-multistream.patch | 12 +++++ .../audio/squishyball/default.nix | 48 +++++++++++++++++++ .../audio/squishyball/gnu-screen.patch | 20 ++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/opusfile/include-multistream.patch create mode 100644 pkgs/applications/audio/squishyball/default.nix create mode 100644 pkgs/applications/audio/squishyball/gnu-screen.patch diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index b55ea30bae0..4937d09e532 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libogg libopus ]; + buildInputs = [ openssl libogg ]; + propagatedBuildInputs = [ libopus ]; + patches = [ ./include-multistream.patch ]; meta = { description = "High-level API for decoding and seeking in .opus files"; diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/pkgs/applications/audio/opusfile/include-multistream.patch new file mode 100644 index 00000000000..7c6dd847596 --- /dev/null +++ b/pkgs/applications/audio/opusfile/include-multistream.patch @@ -0,0 +1,12 @@ +diff -Naur a/include/opusfile.h b/include/opusfile.h +--- a/include/opusfile.h 2014-04-29 19:07:09.000000000 +0200 ++++ b/include/opusfile.h 2016-09-05 17:50:15.147553798 +0200 +@@ -107,7 +107,7 @@ + # include + # include + # include +-# include ++# include + + /**@cond PRIVATE*/ + diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix new file mode 100644 index 00000000000..2022183f4a0 --- /dev/null +++ b/pkgs/applications/audio/squishyball/default.nix @@ -0,0 +1,48 @@ +{ stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses +, opusfile, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "squishyball-${rev}"; + rev = "19580"; + + src = fetchsvn { + url = "https://svn.xiph.org/trunk/squishyball"; + rev = rev; + sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ flac libao libvorbis ncurses opusfile ]; + + patches = [ ./gnu-screen.patch ]; + + postInstall = '' + # Why doesn’t this happen automagically? + mkdir -p $out/share/man/man1 + cp squishyball.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "A tool to perform sample comparison testing on the command line"; + longDescription = '' + squishyball is a simple command-line utility for performing + double-blind A/B, A/B/X or X/X/Y testing on the command line. + The user specifies two input files to be compared and uses the + keyboard during playback to flip between the randomized samples + to perform on-the-fly compar‐ isons. After a predetermined + number of trials, squishyball prints the trial results to + stdout and exits. Results (stdout) may be redirected to a file + without affecting interactive use of the terminal. + + squishyball can also be used to perform casual, non-randomized + comparisons of groups of up to ten samples; this is the default + mode of operation. + ''; + homepage = https://svn.xiph.org/trunk/squishyball; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/squishyball/gnu-screen.patch b/pkgs/applications/audio/squishyball/gnu-screen.patch new file mode 100644 index 00000000000..addc30d604c --- /dev/null +++ b/pkgs/applications/audio/squishyball/gnu-screen.patch @@ -0,0 +1,20 @@ +diff -Naur a/main.c b/main.c +--- a/main.c 2016-09-06 13:37:32.259895631 +0200 ++++ b/main.c 2016-09-07 01:41:51.014309863 +0200 +@@ -693,6 +693,11 @@ + } + + /* set up terminal */ ++ if (!strncmp(getenv("TERM"), "screen", 6)) { ++ char term[256]; ++ snprintf(term, sizeof(term), "xterm%s", getenv("TERM") + 6); ++ setenv("TERM", term, 1); ++ } + atexit(min_panel_remove); + panel_init(pcm, test_files, test_mode, start, end>0 ? end : len, len, + beep_mode, restart_mode, tests, running_score); +@@ -1170,4 +1175,3 @@ + fprintf(stderr,"Done.\n"); + return 0; + } +- diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11e57d169a7..aa610892a33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14780,6 +14780,8 @@ in spideroak = callPackage ../applications/networking/spideroak { }; + squishyball = callPackage ../applications/audio/squishyball { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; From c96ddb643354c675389a205345caeaea048226a0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 13 Sep 2016 07:01:16 +0200 Subject: [PATCH 094/234] bup: 0.26 -> 0.28.1 (#18531) --- pkgs/tools/backup/bup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index efca158efc6..f1774507225 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.26"; in +let version = "0.28.1"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d"; + sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; }; buildInputs = [ git pythonPackages.python ]; From 3e7bb6579bccd885c67bca47ad1a4592769260f0 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 13 Sep 2016 01:02:06 -0400 Subject: [PATCH 095/234] redis-desktop-manager: fix build (#18543) We need to run the pre/post configure hooks. --- pkgs/applications/misc/redis-desktop-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index d4da0fbd314..9d333da01cb 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { qtquick1 qtquickcontrols qtsvg qttools ]; - configurePhase = "true"; + dontUseQmakeConfigure = true; buildPhase = '' srcdir=$PWD From b32252ddfa530ff67e297ff6ba9e5cb0f91a767a Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 13 Sep 2016 14:04:02 +0900 Subject: [PATCH 096/234] NixOS manual: add module option types doc (#18525) --- .../development/option-declarations.xml | 88 +--- nixos/doc/manual/development/option-types.xml | 394 ++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + 3 files changed, 398 insertions(+), 85 deletions(-) create mode 100644 nixos/doc/manual/development/option-types.xml diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index b0689aa1d97..7be5e9d51d4 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -31,9 +31,9 @@ options = { type - The type of the option (see below). It may be omitted, - but that’s not advisable since it may lead to errors that are - hard to diagnose. + The type of the option (see ). + It may be omitted, but that’s not advisable since it may lead to errors + that are hard to diagnose. @@ -65,86 +65,4 @@ options = { -Here is a non-exhaustive list of option types: - - - - - types.bool - - A Boolean. - - - - - types.int - - An integer. - - - - - types.str - - A string. - - - - - types.lines - - A string. If there are multiple definitions, they are - concatenated, with newline characters in between. - - - - - types.path - - A path, defined as anything that, when coerced to a - string, starts with a slash. This includes derivations. - - - - - types.package - - A derivation (such as pkgs.hello) or a - store path (such as - /nix/store/1ifi1cfbfs5iajmvwgrbmrnrw3a147h9-hello-2.10). - - - - - types.listOf t - - A list of elements of type t - (e.g., types.listOf types.str is a list of - strings). Multiple definitions are concatenated together. - - - - - types.attrsOf t - - A set of elements of type t - (e.g., types.attrsOf types.int is a set of - name/value pairs, the values being integers). - - - - - types.nullOr t - - Either the value null or something of - type t. - - - - - -You can also create new types using the function -mkOptionType. See -lib/types.nix in Nixpkgs for details. - diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml new file mode 100644 index 00000000000..8871b02cebf --- /dev/null +++ b/nixos/doc/manual/development/option-types.xml @@ -0,0 +1,394 @@ +
+ +Options Types + + Option types are a way to put constraints on the values a module option + can take. + Types are also responsible of how values are merged in case of multiple + value definitions. +
Basic Types + + Basic types are the simplest available types in the module system. + Basic types include multiple string types that mainly differ in how + definition merging is handled. + + + + types.bool + A boolean, its values can be true or + false. + + + types.int + An integer. + + + types.path + A filesystem path, defined as anything that when coerced to + a string starts with a slash. Even if derivations can be considered as + path, the more specific types.package should be + preferred. + + + types.package + A derivation or a store path. + + + +String related types: + + + + types.str + A string. Multiple definitions cannot be + merged. + + + types.lines + A string. Multiple definitions are concatenated with a new + line "\n". + + + types.commas + A string. Multiple definitions are concatenated with a comma + ",". + + + types.envVar + A string. Multiple definitions are concatenated with a + collon ":". + + + types.separatedString + sep + A string with a custom separator + sep, e.g. types.separatedString + "|". + + + +
+ +
Composed Types + + Composed types allow to create complex types by taking another type(s) + or value(s) as parameter(s). + It is possible to compose types multiple times, e.g. with types; + nullOr (enum [ "left" "right" ]). + + + + types.listOf t + A list of t type, e.g. + types.listOf int. Multiple definitions are merged + with list concatenation. + + + types.attrsOf t + An attribute set of where all the values are of + t type. Multiple definitions result in the + joined attribute set. + + + types.loaOf t + An attribute set or a list of t + type. Multiple definitions are merged according to the + value. + + + types.loeOf t + A list or an element of t type. + Multiple definitions are merged according to the + values. + + + types.nullOr t + null or type + t. Multiple definitions are merged according + to type t. + + + types.uniq t + Ensures that type t cannot be + merged. It is used to ensure option definitions are declared only + once. + + + types.enum l + One element of the list l, e.g. + types.enum [ "left" "right" ]. Multiple definitions + cannot be merged + + + types.either t1 + t2 + Type t1 or type + t2, e.g. with types; either int + str. Multiple definitions cannot be + merged. + + + types.submodule o + A set of sub options o. + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in . + + + +
+ +
Submodule + + Submodule is a very powerful type that defines a set of sub-options that + are handled like a separate module. + It is especially interesting when used with composed types like + attrsOf or listOf. + + The submodule type take a parameter o, that + should be a set, or a function returning a set with an + options key defining the sub-options. + The option set can be defined directly () or as reference (). + + Submodule option definitions are type-checked accordingly to the options + declarations. It is possible to declare submodule options inside a submodule + sub-options for even higher modularity. + +Directly defined submodule + +options.mod = mkOption { + name = "mod"; + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + +Submodule defined as a + reference + +let + modOptions = { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = int; + }; + }; + }; +in +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule modOptions); +}; + + +
Composed with <literal>listOf</literal> + + When composed with listOf, submodule allows multiple + definitions of the submodule option set. + +Declaration of a list + of submodules + +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + +Definition of a list of + submodules + +config.mod = [ + { foo = 1; bar = "one"; } + { foo = 2; bar = "two"; } +]; + +
+ + +
Composed with <literal>attrsOf</literal> + + When composed with attrsOf, submodule allows multiple + named definitions of the submodule option set. + +Declaration of + attribute sets of submodules + +options.mod = mkOption { + description = "submodule example"; + type = with types; attrsOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + +Declaration of + attribute sets of submodules + +config.mod.one = { foo = 1; bar = "one"; }; +config.mod.two = { foo = 2; bar = "two"; }; + +
+
+ +
Extending types + + Types are mainly characterized by their check and + merge functions. + + + + check + The function to type check the value. Takes a value as + parameter and return a boolean. + It is possible to extend a type check with the + addCheck function (), or to fully override the + check function (). + +Adding a type check + +byte = mkOption { + description = "An integer between 0 and 255."; + type = addCheck (x: x >= 0 && x <= 255) types.int; +}; + +Overriding a type + check + +nixThings = mkOption { + description = "words that start with 'nix'"; + type = types.str // { + check = (x: lib.hasPrefix "nix" x) + }; +}; + + + + merge + Function to merge the options values when multiple values + are set. +The function takes two parameters, loc the option path as a +list of strings, and defs the list of defined values as a +list. +It is possible to override a type merge function for custom +needs. + + + +
+ +
Custom Types + +Custom types can be created with the mkOptionType + function. +As type creation includes some more complex topics such as submodule handling, +it is recommended to get familiar with types.nix +code before creating a new type. + +The only required parameter is name. + + + + name + A string representation of the type function name, name + usually changes accordingly parameters passed to + types. + + + check + A function to type check the definition value. Takes the + definition value as a parameter and returns a boolean indicating the + type check result, true for success and + false for failure. + + + merge + A function to merge multiple definitions values. Takes two + parameters: + + + loc + The option path as a list of strings, e.g. + ["boot" "loader "grub" + "enable"]. + + + defs + The list of sets of defined value + and file where the value was defined, e.g. + [ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; + value = 2 } ]. The merge function + should return the merged value or throw an error in case the + values are impossible or not meant to be merged. + + + + + + getSubOptions + For composed types that can take a submodule as type + parameter, this function generate sub-options documentation. It takes + the current option prefix as a list and return the set of sub-options. + Usually defined in a recursive manner by adding a term to the prefix, + e.g. prefix: elemType.getSubOptions (prefix ++ + ["prefix"]) where + "prefix" is the newly added + prefix. + + + getSubModules + For composed types that can take a submodule as type + parameter, this function should return the type parameters submodules. + If the type parameter is called elemType, the + function should just recursively look into submodules by returning + elemType.getSubModules;. + + + substSubModules + For composed types that can take a submodule as type + parameter, this function can be used to substitute the parameter of a + submodule type. It takes a module as parameter and return the type with + the submodule options substituted. It is usally defined as a type + function call with a recursive call to + substSubModules, e.g for a type + composedType that take an elemtype + type parameter, this function should be defined as m: + composedType (elemType.substSubModules m). + + + +
+
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index a68b122ce02..ef6920160e6 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -176,6 +176,7 @@ in { + From eabecc19e06fadb7446cdf5c475dfb3eb30a9f08 Mon Sep 17 00:00:00 2001 From: Christian Gerbrandt Date: Tue, 13 Sep 2016 07:04:41 +0200 Subject: [PATCH 097/234] hhvm: 3.12.1 -> 3.15.0 (#18508) --- pkgs/development/compilers/hhvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index f8524e777a0..6e4cd9a9c73 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.14.5"; + version = "3.15.0"; # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "f516f1bb9046218f89885a220354c19dda6d8f4d"; - sha256 = "0sv856ran15rvnrj4dk0a5jirip5w4336a0aycv9wh77wm4s8xdb"; + rev = "92a682ebaa3c85b84857852d8621f528607fe27d"; + sha256 = "0mn3bfvhdf6b4lflyjfjyr7nppkq505xkaaagk111fqy91rdzd3b"; fetchSubmodules = true; }; From 87ee2736ce61d53f2919b155749c4cc3594cc6f1 Mon Sep 17 00:00:00 2001 From: James Wood Date: Tue, 13 Sep 2016 06:06:23 +0100 Subject: [PATCH 098/234] asunder: init at 2.8 (#18510) --- pkgs/applications/audio/asunder/default.nix | 51 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/audio/asunder/default.nix diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix new file mode 100644 index 00000000000..0ddb7143bc2 --- /dev/null +++ b/pkgs/applications/audio/asunder/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, makeWrapper, gtk, libcddb, intltool, pkgconfig, cdparanoia +, mp3Support ? false, lame +, oggSupport ? true, vorbis-tools +, flacSupport ? true, flac +, opusSupport ? false, opusTools +, wavpackSupport ? false, wavpack +#, musepackSupport ? false, TODO: mpcenc +, monkeysAudioSupport ? false, monkeysAudio +#, aacSupport ? false, TODO: neroAacEnc +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "2.8"; + name = "asunder-${version}"; + src = fetchurl { + url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; + sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; + }; + + buildInputs = [ gtk libcddb intltool pkgconfig makeWrapper ]; + + runtimeDeps = + optional mp3Support lame ++ + optional oggSupport vorbis-tools ++ + optional flacSupport flac ++ + optional opusSupport opusTools ++ + optional wavpackSupport wavpack ++ + optional monkeysAudioSupport monkeysAudio ++ + [ cdparanoia ]; + + postInstall = '' + wrapProgram "$out/bin/asunder" \ + --prefix PATH : "${makeBinPath runtimeDeps}" + ''; + + meta = { + description = "A graphical Audio CD ripper and encoder for Linux"; + homepage = http://littlesvr.ca/asunder/index.php; + license = licenses.gpl2; + maintainers = with maintainers; [ mudri ]; + platforms = platforms.linux; + + longDescription = '' + Asunder is a graphical Audio CD ripper and encoder for Linux. You can use + it to save tracks from an Audio CD as any of WAV, MP3, OGG, FLAC, Opus, + WavPack, Musepack, AAC, and Monkey's Audio files. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa610892a33..5da1e0f9fb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -945,6 +945,8 @@ in asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; + asunder = callPackage ../applications/audio/asunder { }; + autossh = callPackage ../tools/networking/autossh { }; asynk = callPackage ../tools/networking/asynk { }; From b023e8f303893d34916284d9434d1fb806e6e124 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 13 Sep 2016 07:07:46 +0200 Subject: [PATCH 099/234] haveged module: clean up service configuration (#18513) Switches from the forking service type to simple by running haveged in the foreground. Also restricts the execution environment a bit (these are inspired by the Debian service file). --- nixos/modules/services/security/haveged.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index 2aa523bf70a..eca52918881 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -48,14 +48,18 @@ in { description = "Entropy Harvesting Daemon"; unitConfig.Documentation = "man:haveged(8)"; wantedBy = [ "multi-user.target" ]; - + path = [ pkgs.haveged ]; - - serviceConfig = - { Type = "forking"; - ExecStart = "${pkgs.haveged}/sbin/haveged -w ${toString cfg.refill_threshold} -v 1"; - PIDFile = "/run/haveged.pid"; - }; + + serviceConfig = { + ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1"; + SuccessExitStatus = 143; + PrivateTmp = true; + PrivateDevices = true; + PrivateNetwork = true; + ProtectSystem = "full"; + ProtectHome = true; + }; }; }; From b76badd21b6a90946883a4f48b28f0358f40d6a0 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 13 Sep 2016 07:10:04 +0200 Subject: [PATCH 100/234] pythonPackages.Mako: 1.0.2 -> 1.0.4 (#18494) --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e4c6cdff49..f654ca7f81f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13048,14 +13048,14 @@ in modules // { Mako = buildPythonPackage rec { - name = "Mako-1.0.2"; + name = "Mako-1.0.4"; src = pkgs.fetchurl { url = "mirror://pypi/M/Mako/${name}.tar.gz"; - sha256 = "17k7jy3byi4hj6ksszib6gxbf6n7snnnirnbrdldn848abjc4l15"; + sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; }; - buildInputs = with self; [ markupsafe nose mock ]; + buildInputs = with self; [ markupsafe nose mock pytest ]; propagatedBuildInputs = with self; [ markupsafe ]; doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 From ac65abad0c7a51ed1c6186d52d46d51388291008 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Tue, 13 Sep 2016 09:10:43 +0400 Subject: [PATCH 101/234] xflux-gui: 1.1.1 -> 2016-08-08 (#18489) Also make it work with new python changes. --- pkgs/tools/misc/xflux/gui.nix | 25 +++++++++++++++---------- pkgs/tools/misc/xflux/setup.patch | 28 ---------------------------- 2 files changed, 15 insertions(+), 38 deletions(-) delete mode 100644 pkgs/tools/misc/xflux/setup.patch diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 0cf30942e73..8300c8ef30a 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,40 +1,45 @@ -{ stdenv, pkgs, fetchFromGitHub, buildPythonPackage, +{ stdenv, fetchFromGitHub, buildPythonPackage, pexpect, pyGtkGlade, pygobject, pyxdg, gnome_python, + libappindicator-gtk2, + xflux, + python }: buildPythonPackage rec { - version = "1.1.1"; name = "xflux-gui-${version}"; + version = "2016-08-08"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "d897dfd"; - sha256 = "1mx1r2hz3g3waafn4w8hql0gaasfizbzz60bk5llw007k4k8892r"; + rev = "4125e70b6ad0aeda7de46b3a7083a26c392555dc"; + sha256 = "1l56f59hnjyi7nn8wn3dfdx6lw2qjbrhdlcfz0qvwj6b0953f2s7"; }; - # remove messing with shipped binary - patches = [ ./setup.patch ]; - # not sure if these need to be propagated or not? propagatedBuildInputs = [ pexpect pyGtkGlade pygobject pyxdg - pkgs.libappindicator-gtk2 + libappindicator-gtk2 gnome_python ]; buildInputs = [ - pkgs.xflux + xflux ]; postPatch = '' - substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${pkgs.xflux}/bin/xflux\"" + substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" + ''; + + postFixup = '' + wrapPythonPrograms + patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py ''; meta = { diff --git a/pkgs/tools/misc/xflux/setup.patch b/pkgs/tools/misc/xflux/setup.patch deleted file mode 100644 index c36f81f7d80..00000000000 --- a/pkgs/tools/misc/xflux/setup.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/setup.py b/setup.py -index e11f199..b1cb0e5 100644 ---- a/setup.py -+++ b/setup.py -@@ -4,13 +4,6 @@ from distutils.core import setup - from sys import maxsize - from os import rename - --# Determines which is the appropriate executable for 32-bit --if maxsize == 2147483647: -- rename("xflux32", "xflux") --# ... or 64-bit processors --elif maxsize == 9223372036854775807: -- rename("xflux64", "xflux") -- - setup(name = "f.lux indicator applet", - version = "1.1.8", - description = "f.lux indicator applet - better lighting for your computer", -@@ -22,8 +15,7 @@ setup(name = "f.lux indicator applet", - packages = ["fluxgui",], - package_data = {"fluxgui" : ["*.glade"] }, - data_files=[('share/icons/hicolor/scalable/apps', ['fluxgui.svg', 'fluxgui-light.svg', 'fluxgui-dark.svg']), -- ('share/applications', ['desktop/fluxgui.desktop']), -- ('bin', ['xflux']),], -+ ('share/applications', ['desktop/fluxgui.desktop']),], - scripts = ["fluxgui"], - long_description = """f.lux indicator applet is an indicator applet to - control xflux, an application that makes the color of your computer's From eea4af1c4cc7e885f66b1a804be0246c7ad63d1a Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 07:24:58 +0200 Subject: [PATCH 102/234] nixos/virtualbox-image: Fix path to virtualbox VirtualBox user space binaries now no longer reside in linuxPackages, so let's use the package for the real user space binaries instead. Tested using the following command: nix-build nixos/release.nix -A ova.x86_64-linux Signed-off-by: aszlig --- nixos/modules/virtualisation/virtualbox-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index b6a5b3e4788..d68b3bb7390 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -34,7 +34,7 @@ in { postVM = '' export HOME=$PWD - export PATH=${pkgs.linuxPackages.virtualbox}/bin:$PATH + export PATH=${pkgs.virtualbox}/bin:$PATH echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..." VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage From a65e1c560c8f51ae79424d37bd858d2762842087 Mon Sep 17 00:00:00 2001 From: Erik Rybakken Date: Tue, 13 Sep 2016 07:29:57 +0200 Subject: [PATCH 103/234] neomutt: 20160827 -> 20160910 (#18485) --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index be4ce9e41f2..c1c7947cd0a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: stdenv.mkDerivation rec { - version = "20160827"; + version = "20160910"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1gam2iyy75drlp9ap1hlfb38i0p6zwgw09m08m5x50dbp3lxf7xp"; + sha256 = "1i1idqk9l3njqsiw8n8jgjawcz9n9h5180qvpxfwg7sg9zx2sjhj"; }; buildInputs = From 8553883ba11d54b78018e0b2ac7b5487bf545777 Mon Sep 17 00:00:00 2001 From: uralbash Date: Tue, 13 Sep 2016 10:35:16 +0500 Subject: [PATCH 104/234] vscode: 1.4.0 -> 1.5.1 (#18468) --- pkgs/applications/editors/vscode/default.nix | 27 ++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 78964e316c5..f69c9706e37 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,17 +1,22 @@ { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }: let - version = "1.4.0"; - rev = "6276dcb0ae497766056b4c09ea75be1d76a8b679"; + version = "1.5.1"; + rev = "07d663dc1bd848161edf4cd4ce30cce410d3d877"; - sha256 = if stdenv.system == "i686-linux" then "1k228kv1v2765qnz6zw41h79fddwx5pcy9v9jyhsrwyla83fx4ar" - else if stdenv.system == "x86_64-linux" then "1v0am0xpgnlwb3k35v7wxlv22035444ii3v5gv6hf1xbnybsa7lm" - else if stdenv.system == "x86_64-darwin" then "0395wnq8wi9x382l51wf8wiaclx7bjf5p0j39gq8y6j2ww8y2z7n" + sha256 = if stdenv.system == "i686-linux" then "1a2854snjdmfhzx6qwib4iw3qjhlmlf09dlsbbvh24zbrjphnd85" + else if stdenv.system == "x86_64-linux" then "0gg2ad7sp02ffv7la61hh9h4vfw8qkfladbhwlh5y4axbbrx17r7" + else if stdenv.system == "x86_64-darwin" then "18q4ldnmm619vv8yx6rznpznpcc19zjczmcidr34552i5qfg5xsz" else throw "Unsupported system: ${stdenv.system}"; - urlMod = if stdenv.system == "i686-linux" then "linux-ia32" - else if stdenv.system == "x86_64-linux" then "linux-x64" - else if stdenv.system == "x86_64-darwin" then "darwin" + urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; + + urlStr = if stdenv.system == "i686-linux" then + urlBase + "code-stable-code_${version}-1473369468_i386.tar.gz" + else if stdenv.system == "x86_64-linux" then + urlBase + "code-stable-code_${version}-1473370243_amd64.tar.gz" + else if stdenv.system == "x86_64-darwin" then + urlBase + "VSCode-darwin-stable.zip" else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -19,7 +24,7 @@ in inherit version; src = fetchurl { - url = "https://az764295.vo.msecnd.net/stable/${rev}/VSCode-${urlMod}-stable.zip"; + url = urlStr; inherit sha256; }; @@ -33,7 +38,9 @@ in categories = "GNOME;GTK;Utility;TextEditor;Development;"; }; - buildInputs = [ unzip ]; + buildInputs = if stdenv.system == "x86_64-darwin" + then [ unzip ] + else [ ]; installPhase = '' mkdir -p $out/lib/vscode $out/bin From 06b2897c4049f62da3c5fb08a5ae788bf051cbc7 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 13 Sep 2016 07:55:17 +0200 Subject: [PATCH 105/234] networking.dhcpcd: Don't add to system closure when using networkd (#18436) --- nixos/modules/services/networking/dhcpcd.nix | 12 +++++++++++- nixos/modules/tasks/network-interfaces-systemd.nix | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 49d74dfdf0f..4b0e9088651 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -10,7 +10,8 @@ let interfaces = attrValues config.networking.interfaces; - enableDHCP = config.networking.useDHCP || any (i: i.useDHCP == true) interfaces; + enableDHCP = config.networking.dhcpcd.enable && + (config.networking.useDHCP || any (i: i.useDHCP == true) interfaces); # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. @@ -85,6 +86,15 @@ in options = { + networking.dhcpcd.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable dhcpcd for device configuration. This is mainly to + explicitly disable dhcpcd (for example when using networkd). + ''; + }; + networking.dhcpcd.persistent = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 301ee43fd0e..974041d7e1a 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -43,7 +43,7 @@ in message = "networking.bridges.${n}.rstp is not supported by networkd."; }); - systemd.services.dhcpcd.enable = mkDefault false; + networking.dhcpcd.enable = mkDefault false; systemd.services.network-local-commands = { after = [ "systemd-networkd.service" ]; From 896b2916ab255b650174dc1ae3583fef9df20f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=BE=20=D0=93=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=D1=81=D1=8C=D0=BA=D0=B8=D0=B9=20=28Danylo=20Hlynskyi=29?= Date: Tue, 13 Sep 2016 09:04:00 +0300 Subject: [PATCH 106/234] nixos: fix typo in networking.interfaces..virtual (#18548) --- nixos/modules/tasks/network-interfaces.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index c52bd904cae..dc62cae24c7 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -231,7 +231,7 @@ let type = types.bool; description = '' Whether this interface is virtual and should be created by tunctl. - This is mainly useful for creating bridges between a host a virtual + This is mainly useful for creating bridges between a host and a virtual network such as VPN or a virtual machine. ''; }; From 2f2243433f4df69e78f7ea484188ae6e5343dea0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2016 22:36:14 +0200 Subject: [PATCH 107/234] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v2.0.1-8-g914b77b using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/3a577eda9a11923156fe4f3006ca914673c3ffde - LTS Haskell: https://github.com/fpco/lts-haskell/commit/36c0f4fa5e01617466cc1de3449e52e8c881eead - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/8b258a761d580f7be233d4d44d892d27d5240ccf --- .../haskell-modules/configuration-lts.nix | 13 + .../haskell-modules/hackage-packages.nix | 783 +++++++++++------- 2 files changed, 491 insertions(+), 305 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index 850f78c5ecb..4f5c579635e 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -987,6 +987,7 @@ self: super: { "Wheb" = dontDistribute super."Wheb"; "WikimediaParser" = dontDistribute super."WikimediaParser"; "Win32" = doDistribute super."Win32_2_3_1_0"; + "Win32-console" = dontDistribute super."Win32-console"; "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; "Win32-errors" = dontDistribute super."Win32-errors"; "Win32-junction-point" = dontDistribute super."Win32-junction-point"; @@ -1310,6 +1311,7 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async-ajax" = dontDistribute super."async-ajax"; + "async-dejafu" = doDistribute super."async-dejafu_0_1_2_2"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1425,6 +1427,7 @@ self: super: { "basex-client" = dontDistribute super."basex-client"; "bash" = dontDistribute super."bash"; "basic-lens" = dontDistribute super."basic-lens"; + "basic-prelude" = doDistribute super."basic-prelude_0_5_2"; "basic-sop" = dontDistribute super."basic-sop"; "baskell" = dontDistribute super."baskell"; "battlenet" = dontDistribute super."battlenet"; @@ -1621,6 +1624,7 @@ self: super: { "bond-haskell" = dontDistribute super."bond-haskell"; "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bookkeeper" = dontDistribute super."bookkeeper"; + "bookkeeper-permissions" = dontDistribute super."bookkeeper-permissions"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -2448,6 +2452,7 @@ self: super: { "definitive-reactive" = dontDistribute super."definitive-reactive"; "definitive-sound" = dontDistribute super."definitive-sound"; "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = doDistribute super."dejafu_0_3_2_1"; "deka" = dontDistribute super."deka"; "deka-tests" = dontDistribute super."deka-tests"; "delaunay" = dontDistribute super."delaunay"; @@ -3007,6 +3012,7 @@ self: super: { "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-statistics" = dontDistribute super."foldl-statistics"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; @@ -4428,6 +4434,7 @@ self: super: { "hsyslog" = doDistribute super."hsyslog_2_0"; "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_3"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htestu" = dontDistribute super."htestu"; @@ -4494,6 +4501,7 @@ self: super: { "hulk" = dontDistribute super."hulk"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = doDistribute super."hunit-dejafu_0_3_0_1"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5291,6 +5299,7 @@ self: super: { "mahoro" = dontDistribute super."mahoro"; "maid" = dontDistribute super."maid"; "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp" = dontDistribute super."mailchimp"; "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; "mailgun" = dontDistribute super."mailgun"; "majordomo" = dontDistribute super."majordomo"; @@ -7582,6 +7591,7 @@ self: super: { "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_11_0_3"; + "tasty-dejafu" = doDistribute super."tasty-dejafu_0_3_0_1"; "tasty-golden" = doDistribute super."tasty-golden_2_3_1"; "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; @@ -8150,6 +8160,7 @@ self: super: { "vector-random" = dontDistribute super."vector-random"; "vector-read-instances" = dontDistribute super."vector-read-instances"; "vector-sized" = dontDistribute super."vector-sized"; + "vector-space" = doDistribute super."vector-space_0_10_3"; "vector-space-map" = dontDistribute super."vector-space-map"; "vector-space-opengl" = dontDistribute super."vector-space-opengl"; "vector-space-points" = dontDistribute super."vector-space-points"; @@ -8339,6 +8350,8 @@ self: super: { "wordsetdiff" = dontDistribute super."wordsetdiff"; "workdays" = dontDistribute super."workdays"; "workflow-osx" = dontDistribute super."workflow-osx"; + "workflow-types" = dontDistribute super."workflow-types"; + "workflow-windows" = dontDistribute super."workflow-windows"; "wp-archivebot" = dontDistribute super."wp-archivebot"; "wraparound" = dontDistribute super."wraparound"; "wraxml" = dontDistribute super."wraxml"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dd5ae329c20..60bf341a051 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11682,6 +11682,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MemoTrie_0_6_6" = callPackage + ({ mkDerivation, base, newtype-generics }: + mkDerivation { + pname = "MemoTrie"; + version = "0.6.6"; + sha256 = "304de318ed0d029b8b3c86eb1179a9ba32ddbfae9aea088081a95e2b53c6129a"; + libraryHaskellDepends = [ base newtype-generics ]; + homepage = "https://github.com/conal/MemoTrie"; + description = "Trie-based memo functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MetaHDBC" = callPackage ({ mkDerivation, base, convertible, hashtables, HDBC, HDBC-odbc , mtl, template-haskell @@ -18158,6 +18171,18 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; + "Win32-console" = callPackage + ({ mkDerivation, base, Win32 }: + mkDerivation { + pname = "Win32-console"; + version = "0.1.0.0"; + sha256 = "69d8cc973b9d08571e01eb33aca6840aae4a084e80e55313c878ac3602712704"; + libraryHaskellDepends = [ base Win32 ]; + description = "Binding to the Win32 console API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Win32-dhcp-server" = callPackage ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { @@ -20711,6 +20736,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-compat_0_3_6" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans + , bytestring, containers, exceptions, hashable, nats, QuickCheck + , quickcheck-instances, scientific, semigroups, tagged, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.6"; + sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring containers exceptions + hashable nats scientific semigroups tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable nats QuickCheck quickcheck-instances + scientific semigroups tagged tasty tasty-hunit tasty-quickcheck + text time time-locale-compat unordered-containers vector + ]; + homepage = "https://github.com/phadej/aeson-compat#readme"; + description = "Compatibility layer for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-diff" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , edit-distance-vector, filepath, Glob, hashable, hlint, mtl @@ -20946,28 +20999,6 @@ self: { }) {}; "aeson-pretty" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , cmdargs, scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-pretty"; - version = "0.8.1"; - sha256 = "922a7c4413394b28c83e70d41f105e5bb2b991e1e47e2d802876a33589b6e6a1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring scientific text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring cmdargs - ]; - homepage = "http://github.com/informatikr/aeson-pretty"; - description = "JSON pretty-printing library and command-line tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-pretty_0_8_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , cmdargs, scientific, text, unordered-containers, vector }: @@ -20987,7 +21018,6 @@ self: { homepage = "http://github.com/informatikr/aeson-pretty"; description = "JSON pretty-printing library and command-line tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-qq" = callPackage @@ -26383,7 +26413,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "async-dejafu" = callPackage + "async-dejafu_0_1_2_2" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }: mkDerivation { pname = "async-dejafu"; @@ -26391,12 +26421,14 @@ self: { sha256 = "ff459f69420e8ef8c26d5c7f2158d49501d1ee06a4c3a664b8826fb90f517db0"; libraryHaskellDepends = [ base dejafu exceptions ]; testHaskellDepends = [ base dejafu HUnit hunit-dejafu ]; + jailbreak = true; homepage = "https://github.com/barrucadu/dejafu"; description = "Run MonadConc operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "async-dejafu_0_1_3_0" = callPackage + "async-dejafu" = callPackage ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit , hunit-dejafu }: @@ -26408,11 +26440,9 @@ self: { testHaskellDepends = [ base concurrency dejafu HUnit hunit-dejafu ]; - jailbreak = true; homepage = "https://github.com/barrucadu/dejafu"; description = "Run MonadConc operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-extras" = callPackage @@ -26821,15 +26851,15 @@ self: { }) {}; "atp-haskell" = callPackage - ({ mkDerivation, applicative-extras, base, containers, HUnit, mtl - , parsec, pretty, template-haskell, time + ({ mkDerivation, applicative-extras, base, containers, extra, HUnit + , mtl, parsec, pretty, template-haskell, time }: mkDerivation { pname = "atp-haskell"; - version = "1.13"; - sha256 = "9e71ff29922844208afc039bf0541392a58ef4d651f6020e19679a8fa68bb5b0"; + version = "1.14"; + sha256 = "350bd95dee79275f6ee1929f8ea4940a2a909f8ab8133f20c0c3c4abbfec04d0"; libraryHaskellDepends = [ - applicative-extras base containers HUnit mtl parsec pretty + applicative-extras base containers extra HUnit mtl parsec pretty template-haskell time ]; testHaskellDepends = [ base containers HUnit time ]; @@ -29079,7 +29109,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "basic-prelude" = callPackage + "basic-prelude_0_5_2" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector @@ -29095,9 +29125,10 @@ self: { homepage = "https://github.com/snoyberg/basic-prelude"; description = "An enhanced core prelude; a common foundation for alternate preludes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "basic-prelude_0_6_1" = callPackage + "basic-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector @@ -29113,7 +29144,6 @@ self: { homepage = "https://github.com/snoyberg/basic-prelude"; description = "An enhanced core prelude; a common foundation for alternate preludes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basic-sop" = callPackage @@ -31750,32 +31780,6 @@ self: { }) {}; "bitcoin-payment-channel" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, base58string - , base64-bytestring, binary, bytestring, cereal, errors - , haskoin-core, hexstring, QuickCheck, scientific, text, time - }: - mkDerivation { - pname = "bitcoin-payment-channel"; - version = "0.2.2.0"; - sha256 = "cc0d19904ea5363453765c702b5f1e6f1ac99a2a90d8d17223d94d610dee3806"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary - bytestring cereal errors haskoin-core hexstring scientific text - time - ]; - executableHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary - bytestring cereal haskoin-core hexstring QuickCheck text time - ]; - homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; - description = "Library for working with Bitcoin payment channels"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "bitcoin-payment-channel_0_2_3_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base58string , base64-bytestring, binary, bytestring, cereal, errors , haskoin-core, hexstring, QuickCheck, scientific, text, time @@ -33235,8 +33239,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.5.0.0"; - sha256 = "3720a7004ebe8b1334bbc1c2fe240f20a49fbb1ca9003a5f7257dad5ed2ba3ab"; + version = "0.6.0.0"; + sha256 = "1b6437cda224d2c1250ff83fa9af1c4e9b7890613a6de7b658672f9dc35cee0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33302,6 +33306,7 @@ self: { aeson base bond bytestring cmdargs directory filepath monad-loops ]; testHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://github.com/rblaze/bond-haskell#readme"; description = "Bond code generator for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -33334,6 +33339,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bookkeeper-permissions" = callPackage + ({ mkDerivation, base, bookkeeper, type-level-sets }: + mkDerivation { + pname = "bookkeeper-permissions"; + version = "0.1.0.0"; + sha256 = "66ea36897fd62e23eaf4de657e12c43067d86f86b441ecb819c4216889fc7cb4"; + libraryHaskellDepends = [ base bookkeeper type-level-sets ]; + homepage = "https://github.com/pkamenarsky/bookkeeper-permissions"; + description = "Permissions for bookkeeper records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -40029,6 +40046,7 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; @@ -40217,6 +40235,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "clckwrks_0_23_19" = callPackage + ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base + , blaze-html, bytestring, cereal, containers, directory, filepath + , happstack-authenticate, happstack-hsp, happstack-jmacro + , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs + , ixset, jmacro, lens, mtl, network, network-uri, old-locale + , openssl, process, random, reform, reform-happstack, reform-hsp + , safecopy, stm, text, time, time-locale-compat + , unordered-containers, userid, utf8-string, uuid-orphans + , uuid-types, vector, web-plugins, web-routes, web-routes-happstack + , web-routes-hsp, web-routes-th, xss-sanitize + }: + mkDerivation { + pname = "clckwrks"; + version = "0.23.19"; + sha256 = "ba92996b4ccde157e6bde7f0a50c921537af450b394773cb306741372cf4896e"; + libraryHaskellDepends = [ + acid-state aeson aeson-qq attoparsec base blaze-html bytestring + cereal containers directory filepath happstack-authenticate + happstack-hsp happstack-jmacro happstack-server + happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl + network network-uri old-locale process random reform + reform-happstack reform-hsp safecopy stm text time + time-locale-compat unordered-containers userid utf8-string + uuid-orphans uuid-types vector web-plugins web-routes + web-routes-happstack web-routes-hsp web-routes-th xss-sanitize + ]; + librarySystemDepends = [ openssl ]; + homepage = "http://www.clckwrks.com/"; + description = "A secure, reliable content management system (CMS) and blogging platform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "clckwrks-cli" = callPackage ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl , network, parsec @@ -47891,50 +47943,6 @@ self: { }) {inherit (pkgs) curl;}; "darcs" = callPackage - ({ mkDerivation, array, async, attoparsec, base, base16-bytestring - , binary, bytestring, cmdargs, containers, cryptohash, curl - , data-ordlist, directory, fgl, filepath, FindBin, graphviz - , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network - , network-uri, old-time, parsec, process, QuickCheck, random - , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar - , terminfo, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, unix, unix-compat, utf8-string, vector - , zip-archive, zlib - }: - mkDerivation { - pname = "darcs"; - version = "2.12.2"; - sha256 = "20b2eb292854c89036bae74330e71f1f3b253a369610916ddcc44f0d49f38bdd"; - configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async attoparsec base base16-bytestring binary bytestring - containers cryptohash data-ordlist directory fgl filepath graphviz - hashable haskeline html HTTP mmap mtl network network-uri old-time - parsec process random regex-applicative regex-compat-tdfa sandi tar - terminfo text time transformers transformers-compat unix - unix-compat utf8-string vector zip-archive zlib - ]; - librarySystemDepends = [ curl ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base bytestring cmdargs containers directory filepath FindBin - HUnit mtl QuickCheck shelly split test-framework - test-framework-hunit test-framework-quickcheck2 text zip-archive - ]; - doCheck = false; - postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs - ''; - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; - license = "GPL"; - }) {inherit (pkgs) curl;}; - - "darcs_2_12_3" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, curl , data-ordlist, directory, fgl, filepath, FindBin, graphviz @@ -47976,7 +47984,6 @@ self: { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -51312,7 +51319,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dejafu" = callPackage + "dejafu_0_3_2_1" = callPackage ({ mkDerivation, array, atomic-primops, base, containers, deepseq , dpor, exceptions, monad-control, monad-loops, mtl, semigroups , stm, template-haskell, transformers, transformers-base @@ -51329,9 +51336,10 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Overloadable primitives for testable, potentially non-deterministic, concurrency"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dejafu_0_4_0_0" = callPackage + "dejafu" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, dpor , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers , transformers-base @@ -51347,7 +51355,6 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -51922,28 +51929,6 @@ self: { }) {}; "deriving-compat" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell - , transformers, transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.3.2"; - sha256 = "2a89646d707202e6010155bc224aa3791032e05d433fa8629fc7dfccaf3d5888"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell transformers - transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck template-haskell - transformers transformers-compat - ]; - homepage = "https://github.com/haskell-compat/deriving-compat"; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_3_3" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell , transformers, transformers-compat @@ -51960,11 +51945,9 @@ self: { base base-compat base-orphans hspec QuickCheck template-haskell transformers transformers-compat ]; - jailbreak = true; homepage = "https://github.com/haskell-compat/deriving-compat"; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -54967,15 +54950,15 @@ self: { }) {dns_sd = null;}; "do-list" = callPackage - ({ mkDerivation, base, dlist, hspec }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "do-list"; - version = "0.9.1"; - sha256 = "db524f3d62271d79f6f675e13dbe069ce9d3faf0b1512d5b26a61fdd6234ccf8"; - libraryHaskellDepends = [ base dlist ]; + version = "1.0.0"; + sha256 = "64fab9aca46541aa95efc4e7a6f4074277fee6f81ca0d98eb41081f061c33738"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/tserduke/do-list"; - description = "List construction with do notation"; + homepage = "https://github.com/tserduke/do-list#readme"; + description = "Do notation for free"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -55084,8 +55067,8 @@ self: { }: mkDerivation { pname = "dockercook"; - version = "0.5.0.0"; - sha256 = "fbb9373444c64cc1e16659f4d16edb60f80db4c6254e7e24feca16ad20f7c4fb"; + version = "0.5.0.3"; + sha256 = "ba1e45921535e8fb4767c53e77ac48b3e99c0501acb0efb99ed100b6f3cae032"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55101,7 +55084,6 @@ self: { optparse-applicative process text unordered-containers ]; testHaskellDepends = [ base HTF text vector ]; - jailbreak = true; homepage = "https://github.com/factisresearch/dockercook"; description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; @@ -64233,6 +64215,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "foldl-statistics" = callPackage + ({ mkDerivation, base, foldl, math-functions, profunctors + , quickcheck-instances, statistics, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "foldl-statistics"; + version = "0.1.0.0"; + sha256 = "7a5a95fb465d87810e6653d39235d861516f53229144cd9d46ab7a3bdf316cd3"; + libraryHaskellDepends = [ base foldl math-functions profunctors ]; + testHaskellDepends = [ + base foldl profunctors quickcheck-instances statistics tasty + tasty-quickcheck vector + ]; + jailbreak = true; + homepage = "http://github.com/Data61/foldl-statistics#readme"; + description = "Statistical functions from the statistics package implemented as Folds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foldl-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , doctest, foldl, free, monoid-subclasses, profunctors @@ -67149,20 +67150,6 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "generic-deriving"; - version = "1.11"; - sha256 = "16d40544e4dad85af78d93158e9b6a39b35c88ca10a455cfc861a4282556240d"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - homepage = "https://github.com/dreixel/generic-deriving"; - description = "Generic programming library for generalised deriving"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generic-deriving_1_11_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec , template-haskell }: @@ -67174,11 +67161,9 @@ self: { base containers ghc-prim template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; - jailbreak = true; homepage = "https://github.com/dreixel/generic-deriving"; description = "Generic programming library for generalised deriving"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-lucid-scaffold" = callPackage @@ -73634,6 +73619,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "google-oauth2-jwt_0_1_2_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.1.2.0"; + sha256 = "894d233d8253a69643aaeb2f230dbe6984cac4cdaf45c939835a523fadca66bf"; + libraryHaskellDepends = [ + base base64-bytestring bytestring HsOpenSSL RSA text unix-time + ]; + homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; + description = "Get a signed JWT for Google Service Accounts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-search" = callPackage ({ mkDerivation, base, free, nats, text, time }: mkDerivation { @@ -89553,24 +89555,26 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot - , js-jquery, mmap, network, network-uri, old-locale, process - , QuickCheck, resourcet, tar, template-haskell, text, time - , transformers, uniplate, utf8-string, vector, wai, wai-logger - , warp, warp-tls, zlib + , js-jquery, mmap, network, network-uri, network-uri-flag + , old-locale, process, QuickCheck, resourcet, tar, template-haskell + , text, time, transformers, uniplate, utf8-string, vector, wai + , wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; version = "5.0.1"; sha256 = "7aea6d779e14574f78f4506949f96a020ac1f8273b84f418094197366cc3112e"; + revision = "1"; + editedCabalFile = "f4c60280f4b1981d841303c3ee7902cc5c35779eef469f521aa6e590450f5b21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring cmdargs conduit conduit-extra connection containers deepseq directory extra filepath haskell-src-exts http-conduit http-types js-flot js-jquery mmap - network network-uri old-locale process QuickCheck resourcet tar - template-haskell text time transformers uniplate utf8-string vector - wai wai-logger warp warp-tls zlib + network network-uri network-uri-flag old-locale process QuickCheck + resourcet tar template-haskell text time transformers uniplate + utf8-string vector wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; homepage = "http://hoogle.haskell.org/"; @@ -89578,7 +89582,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle_5_0_3" = callPackage + "hoogle_5_0_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot @@ -89589,8 +89593,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.3"; - sha256 = "76bda66fd5be7d0ad79da1c512a4e60caf3be15d988a40e8274f16cd7df3815b"; + version = "5.0.4"; + sha256 = "7ae3b649d435afa178241ade97f3eef3d8519ddd86f4a97d23b7aa5a88c9a665"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91102,6 +91106,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ruby;}; + "hruby_0_3_4_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck + , ruby, scientific, stm, text, unordered-containers, vector + }: + mkDerivation { + pname = "hruby"; + version = "0.3.4.2"; + sha256 = "4e7afc76770d5a9f887f574c8ce69d8c23a39b9df369d7ca263fd88c73b59a28"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring scientific stm text + unordered-containers vector + ]; + librarySystemDepends = [ ruby ]; + testHaskellDepends = [ + aeson attoparsec base QuickCheck text vector + ]; + description = "Embed a Ruby intepreter in your Haskell program !"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) ruby;}; + "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: mkDerivation { @@ -92856,14 +92881,13 @@ self: { }: mkDerivation { pname = "hsini"; - version = "0.4.2"; - sha256 = "b98aa37900b03403bf8bcb40d300ef539a8dc50476a219e8f19c41ff057379fe"; + version = "0.5.0"; + sha256 = "d1c2075b6d35c2139db86ba6c514b8855f97f03acfde121cd6a9065ba5ebb499"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers HUnit mtl parsec QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th ]; - jailbreak = true; description = "Package for user configuration files (INI)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -94726,7 +94750,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {com_err = null; zephyr = null;}; - "htaglib" = callPackage + "htaglib_1_0_3" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HUnit , taglib, test-framework, test-framework-hunit, text }: @@ -94742,9 +94766,10 @@ self: { homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; - "htaglib_1_0_4" = callPackage + "htaglib" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , taglib, text }: @@ -94755,11 +94780,9 @@ self: { libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; - jailbreak = true; homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; "htags" = callPackage @@ -95466,17 +95489,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client-tls_0_3_0" = callPackage - ({ mkDerivation, base, bytestring, connection, data-default-class - , hspec, http-client, http-types, network, tls + "http-client-tls_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, connection + , cryptonite, data-default-class, hspec, http-client, http-types + , memory, network, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.0"; - sha256 = "811b30a53156dc12e3eb34f8921778f081521ef388b7f4d7ce6c59d086cb3358"; + version = "0.3.1"; + sha256 = "681aab193582fee5da6cd2e278b8e2ac9e3fc1d24cacc4834307b97f4d6de552"; libraryHaskellDepends = [ - base bytestring connection data-default-class http-client network - tls + base bytestring case-insensitive connection cryptonite + data-default-class http-client http-types memory network tls + transformers ]; testHaskellDepends = [ base hspec http-client http-types ]; jailbreak = true; @@ -95535,7 +95560,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-conduit_2_2_0_1" = callPackage + "http-conduit_2_2_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -95545,8 +95570,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.0.1"; - sha256 = "54e7d2a3346e45f3785dc14b98f534c931236db20a1ea20335893ada922558a7"; + version = "2.2.1"; + sha256 = "95bf2c3bd641f5e8bbd4bc639618c44a39765f990231d9c1a02b9f76d1600754"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -96480,19 +96505,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu" = callPackage + "hunit-dejafu_0_3_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; version = "0.3.0.1"; sha256 = "77fbda0fe00b5463fcc59fb3402169679294aab30fa8a57d57e667fefa64eb33"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + jailbreak = true; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hunit-dejafu_0_3_0_2" = callPackage + "hunit-dejafu" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; @@ -96502,7 +96529,6 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunit-gui" = callPackage @@ -107809,7 +107835,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-puppet_1_3_1" = callPackage + "language-puppet_1_3_1_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -107823,8 +107849,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.1"; - sha256 = "8aa7558b51825ba3e4b00c92a74f2d98b55430f2d7333501572f491554862ad2"; + version = "1.3.1.1"; + sha256 = "e2fba21b6adb148896819687062378022393fc6b237d0c65ddb7196bc86ddd12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112019,8 +112045,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1"; - sha256 = "e5f7cf1a9bd2c4726718ee7606664f4d16a863c339012cae9da29c1cd54b687c"; + version = "3.1.0.1"; + sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5"; libraryHaskellDepends = [ base containers enumset fixed-length llvm-ffi non-empty storable-record tfp transformers utility-ht @@ -114270,6 +114296,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "mailchimp" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client + , http-client-tls, servant, servant-client, text, transformers + }: + mkDerivation { + pname = "mailchimp"; + version = "0.1.0"; + sha256 = "dbbc4645a3322e11ce33059a4660dd837574f58530aaa459b4d99dc7b1b91fe2"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring http-client http-client-tls + servant servant-client text transformers + ]; + homepage = "https://github.com/jpvillaisaza/mailchimp-haskell"; + description = "Bindings for the MailChimp API"; + license = stdenv.lib.licenses.mit; + }) {}; + "mailchimp-subscribe" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls , http-types, reflection, scotty, text, transformers, wai-extra @@ -126233,33 +126276,6 @@ self: { }) {}; "octane" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, binary-bits - , bytestring, containers, data-binary-ieee754, data-default-class - , deepseq, file-embed, http-client, http-client-tls - , overloaded-records, regex-compat, tasty, tasty-hspec, text - , unordered-containers, vector - }: - mkDerivation { - pname = "octane"; - version = "0.15.0"; - sha256 = "f5e89b98315efa4a62e0a07595dfecda52604bade45216def1eb23adbfc8218c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bimap binary binary-bits bytestring containers - data-binary-ieee754 data-default-class deepseq file-embed - overloaded-records regex-compat text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - }) {}; - - "octane_0_16_1" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, data-default-class , deepseq, file-embed, http-client, http-client-tls @@ -126287,7 +126303,6 @@ self: { homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octohat" = callPackage @@ -126896,35 +126911,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.5.0.0"; - sha256 = "8fa68edc8e322f624c704526acbf2c813903bf73beab829849f515a7854415b5"; - revision = "2"; - editedCabalFile = "43d127c37fe4ff98db79dfb9c44cbc111aa77e6cbe9f449ef652e7a449b39b03"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups time - ]; - doCheck = false; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_5_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset , postgresql-simple, pretty, product-profunctors, profunctors @@ -126945,10 +126931,10 @@ self: { aeson base containers contravariant multiset postgresql-simple product-profunctors profunctors QuickCheck semigroups text time ]; + doCheck = false; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -139893,6 +139879,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quantum-random_0_6_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansigraph, base, bytestring + , directory, haskeline, hspec, http-conduit, mtl, QuickCheck + , regex-posix, terminal-size, text + }: + mkDerivation { + pname = "quantum-random"; + version = "0.6.3"; + sha256 = "ef14cb9adf4e05ed71d1707ebb773dc8be9ffd1bd8a54016f1c1f9b5c0def714"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal ansigraph base bytestring directory + http-conduit regex-posix terminal-size text + ]; + executableHaskellDepends = [ base haskeline mtl ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/BlackBrane/quantum-random/"; + description = "Retrieve, store and manage real quantum random data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qudb" = callPackage ({ mkDerivation, alex, array, base, bytestring, directory, happy , mtl, snappy @@ -146692,16 +146701,17 @@ self: { }) {}; "rosmsg" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, data-default - , lens-family, pureMD5, template-haskell, text + ({ mkDerivation, attoparsec, base, binary, bytestring + , data-default-class, lens-family-core, pureMD5, template-haskell + , text }: mkDerivation { pname = "rosmsg"; - version = "0.4.4.0"; - sha256 = "be16282c302f6ae7ed080460aae939c313253f364b76afbe182ff262b6c74e84"; + version = "0.5.1.0"; + sha256 = "982a2cfb16d2882c1914ed1c3f03696423e72adb9adba8c530ecfbe8affe9ef7"; libraryHaskellDepends = [ - attoparsec base binary bytestring data-default lens-family pureMD5 - template-haskell text + attoparsec base binary bytestring data-default-class + lens-family-core pureMD5 template-haskell text ]; homepage = "https://github.com/RoboticsHS/rosmsg#readme"; description = "ROS message parser, render, TH"; @@ -146714,8 +146724,8 @@ self: { }: mkDerivation { pname = "rospkg"; - version = "0.2.2.1"; - sha256 = "904d31b3b2efd0807e4db2d6d7b83ff07ed2c19ee9cd5984ce93ee8cb6d19695"; + version = "0.2.3.0"; + sha256 = "237ffd07b77f4a832e1e0a553de19ba372ca0adee80bfca099564152f39d8d8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151256,16 +151266,19 @@ self: { "servant-github-webhook" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto , github, http-types, servant, servant-server, string-conversions - , text, wai + , text, wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.1.0.0"; - sha256 = "6d7f7c782a3652204bcf85c765212b71815f025d03e2939f1fea304af5326649"; + version = "0.2.0.0"; + sha256 = "41e1b67d3fd0716da36d78124b479b09678887af5996845ead2a3c2ed445e4b7"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Crypto github http-types servant servant-server string-conversions text wai ]; + testHaskellDepends = [ + aeson base bytestring servant-server wai warp + ]; jailbreak = true; homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; @@ -151371,8 +151384,8 @@ self: { pname = "servant-lucid"; version = "0.7.1"; sha256 = "ec26ba7d159b09be10beacf6242f6ae1bd111e9c738bfbf3cf2f560f48e0fe40"; - revision = "1"; - editedCabalFile = "1fd84dbff6493df7e55bb6f4f6bc194f48ad7e9f63b404669139b1dd231d1cc2"; + revision = "2"; + editedCabalFile = "77b212213098519d9d45d87a3a86b47a8be46b7ca631b54844d2fc19f90c0dc1"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant support for lucid"; @@ -151826,8 +151839,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "9"; - editedCabalFile = "a30c9b97b94cd82fe83b4ad43943e82edba51428ce421ab59166a8cd3622b7bb"; + revision = "10"; + editedCabalFile = "a310660af1ba68dc6b337878852bc27aad6d444c16c64864a6aea22584bd2611"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -159249,6 +159262,8 @@ self: { pname = "stache"; version = "0.1.6"; sha256 = "078e223a2549f08ee48b2c9d40f7242992b5870e02eef2f9ef1ea8d542ff4e36"; + revision = "1"; + editedCabalFile = "3c023b0738484069b7515bfe80d3b3c9c4a64406d36aef82f9f893068198d862"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -161024,6 +161039,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "store_0_2_1_2" = callPackage + ({ mkDerivation, array, base, base-orphans, base64-bytestring + , bytestring, cereal, cereal-vector, conduit, containers, criterion + , cryptohash, deepseq, directory, fail, filepath, ghc-prim + , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base + , monad-control, mono-traversable, primitive, resourcet, safe + , semigroups, smallcheck, store-core, syb, template-haskell, text + , th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.2.1.2"; + sha256 = "5accb9a9aa79fd5dbc315b398a926722dee424935271c9a6cb90aea84f3e1cad"; + libraryHaskellDepends = [ + array base base-orphans base64-bytestring bytestring conduit + containers cryptohash deepseq directory fail filepath ghc-prim + hashable hspec hspec-smallcheck integer-gmp lifted-base + monad-control mono-traversable primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector void + ]; + testHaskellDepends = [ + array base base-orphans base64-bytestring bytestring cereal + cereal-vector conduit containers criterion cryptohash deepseq + directory fail filepath ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector vector-binary-instances void weigh + ]; + jailbreak = true; + homepage = "https://github.com/fpco/store#readme"; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text , transformers @@ -161040,6 +161096,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store-core_0_2_0_2" = callPackage + ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text + , transformers + }: + mkDerivation { + pname = "store-core"; + version = "0.2.0.2"; + sha256 = "025f6d186f96329d1f0b76e2e2753e78852413896d19917856c096bf22e6420e"; + libraryHaskellDepends = [ + base bytestring fail ghc-prim primitive text transformers + ]; + homepage = "https://github.com/fpco/store#readme"; + description = "Fast and lightweight binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "str" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Crypto , hashable, MissingH, text, utf8-string @@ -162779,6 +162852,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "svg-tree_0_5_1_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , JuicyPixels, lens, linear, mtl, scientific, text, transformers + , vector, xml + }: + mkDerivation { + pname = "svg-tree"; + version = "0.5.1.2"; + sha256 = "0c285cf21203555c7d7179e6c3924c0ba1b5e03ed42dacf596ff891317893da0"; + libraryHaskellDepends = [ + attoparsec base bytestring containers JuicyPixels lens linear mtl + scientific text transformers vector xml + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "svg2q" = callPackage ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb , xml @@ -165165,19 +165256,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-dejafu" = callPackage + "tasty-dejafu_0_3_0_1" = callPackage ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; version = "0.3.0.1"; sha256 = "9794201798e3afdfd84f22a6bd89fd869db3105ec33d406d6d4df742d5d0b683"; libraryHaskellDepends = [ base dejafu tagged tasty ]; + jailbreak = true; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tasty-dejafu_0_3_0_2" = callPackage + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; @@ -165187,7 +165280,6 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -165849,6 +165941,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "telegram-api_0_5_0_1" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either + , filepath, hjpath, hspec, http-api-data, http-client + , http-client-tls, http-media, http-types, mime-types + , optparse-applicative, servant, servant-client, string-conversions + , text, transformers, utf8-string + }: + mkDerivation { + pname = "telegram-api"; + version = "0.5.0.1"; + sha256 = "24eca611772e6810f837b372dca1b0fb7492cff8b72b68d66d886193da030ef3"; + libraryHaskellDepends = [ + aeson base bytestring either http-api-data http-client http-media + http-types mime-types servant servant-client string-conversions + text transformers + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base filepath hjpath hspec http-client + http-client-tls http-types optparse-applicative servant + servant-client text transformers utf8-string + ]; + jailbreak = true; + homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; + description = "Telegram Bot API bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "teleport" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , configurator, optparse-applicative, system-filepath, text, turtle @@ -167547,6 +167667,7 @@ self: { QuickCheck quickcheck-instances semigroups tagged template-haskell text th-lift transformers transformers-compat void ]; + doCheck = false; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; @@ -169303,6 +169424,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-parsers_0_1_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers + , tasty, tasty-hunit, template-haskell, text, time + }: + mkDerivation { + pname = "time-parsers"; + version = "0.1.1.0"; + sha256 = "872d2ad4727ed7ac00a06b2acb7d7965da04d432c2d45017805fd4e6975d6ab2"; + libraryHaskellDepends = [ base parsers template-haskell time ]; + testHaskellDepends = [ + attoparsec base bifunctors parsec parsers tasty tasty-hunit + template-haskell text time + ]; + homepage = "https://github.com/phadej/time-parsers#readme"; + description = "Parsers for types in `time`"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-patterns" = callPackage ({ mkDerivation, base, intervals, lens, thyme, vector-space }: mkDerivation { @@ -169728,12 +169868,11 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.1"; - sha256 = "61eb1559bea5a5d5548a5ac0a915d741e6336eae0c3634b7f503583ed7221ef7"; + version = "0.1.0.2"; + sha256 = "5c8050daceec73b642a1ec85827d6914b2e0bfe32813b5c715a9200d0143ad76"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; - jailbreak = true; homepage = "http://github.com/jonpetterbergman/timezone-olson-th"; description = "Load TimeZoneSeries from an Olson file at compile time"; license = stdenv.lib.licenses.bsd3; @@ -169757,8 +169896,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "timezone-series"; - version = "0.1.6"; - sha256 = "f95ba0ad126009f98a05d1637247b677a32a087cc5036e6cfc22e77f165bdd01"; + version = "0.1.6.1"; + sha256 = "65ea9a8c3b1143a0f1d154943ac8311b53bb2ec7b5e52b09bd035343025c2cc3"; libraryHaskellDepends = [ base time ]; homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; @@ -177105,7 +177244,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-space" = callPackage + "vector-space_0_10_3" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; @@ -177114,9 +177253,10 @@ self: { libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "vector-space_0_10_4" = callPackage + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; @@ -177125,7 +177265,6 @@ self: { libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-map" = callPackage @@ -181995,6 +182134,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "workflow-types" = callPackage + ({ mkDerivation, base, comonad, containers, deepseq, Earley + , exceptions, free, hashable, semigroups, split, transformers + }: + mkDerivation { + pname = "workflow-types"; + version = "0.0.0"; + sha256 = "54991eaf641bdf43e0d3e99bee650fa6ae2690adeb34d0f6378b5a0d93aaafa7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base comonad containers deepseq Earley exceptions free hashable + semigroups split transformers + ]; + executableHaskellDepends = [ base ]; + homepage = "http://github.com/sboosali/workflow-types#readme"; + description = "Automate keyboard\/mouse\/clipboard\/application interaction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "workflow-windows" = callPackage + ({ mkDerivation, base, doctest, hspec, QuickCheck }: + mkDerivation { + pname = "workflow-windows"; + version = "0.0.0"; + sha256 = "4c922f26ea5580022b8ecd184ce473eabead4a035cc95ea9394f9fc04efdff92"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + jailbreak = true; + homepage = "http://github.com/sboosali/workflow-windows#readme"; + description = "Automate keyboard/mouse/clipboard/application interaction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wp-archivebot" = callPackage ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }: mkDerivation { @@ -182842,32 +183017,6 @@ self: { }) {}; "xdcc" = callPackage - ({ mkDerivation, ascii-progress, async, base, bytestring - , case-insensitive, concurrent-extra, concurrent-output, errors - , iproute, irc-client, irc-conduit, irc-ctcp, irc-dcc, lifted-base - , network, optparse-applicative, path, random, safe-exceptions, stm - , text, text-format, transformers, unix-compat - }: - mkDerivation { - pname = "xdcc"; - version = "1.1.2"; - sha256 = "d3268b0e1ffc28dabd33ffdc8c5f2e632b114002b5b3cc1d6836faa2d640b35d"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ascii-progress async base bytestring case-insensitive - concurrent-extra concurrent-output errors iproute irc-client - irc-conduit irc-ctcp irc-dcc lifted-base network - optparse-applicative path random safe-exceptions stm text - text-format transformers unix-compat - ]; - homepage = "https://github.com/JanGe/xdcc"; - description = "A wget-like utility for retrieving files from XDCC bots on IRC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "xdcc_1_1_3" = callPackage ({ mkDerivation, ascii-progress, async, base, bytestring , case-insensitive, concurrent-output, errors, iproute, irc-client , irc-dcc, monad-control, network, optparse-applicative, path @@ -188168,6 +188317,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zip;}; + "zip-archive_0_3_0_5" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , digest, directory, filepath, HUnit, mtl, old-time, pretty + , process, temporary, text, time, unix, zip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.0.5"; + sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7"; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl old-time pretty text time unix zlib + ]; + testHaskellDepends = [ + base bytestring directory HUnit old-time process temporary time + unix + ]; + testToolDepends = [ zip ]; + homepage = "http://github.com/jgm/zip-archive"; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) zip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet From 6780ac9d033feeb4bbbf15fea547c91471bfa2bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2016 07:41:51 +0200 Subject: [PATCH 108/234] haskell-timezone-series: clean up overrides --- .../haskell-modules/configuration-ghc-7.10.x.nix | 1 - .../haskell-modules/configuration-ghc-8.0.x.nix | 7 ------- 2 files changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 3ffce7a52ec..a0f8056c081 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -123,7 +123,6 @@ self: super: { prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; }); - timezone-series = doJailbreak super.timezone-series; timezone-olson = doJailbreak super.timezone-olson; xmonad-extras = overrideCabal super.xmonad-extras (drv: { postPatch = '' diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index a18ee496012..5c7348678b7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -54,13 +54,6 @@ self: super: { broken = true; # needs template-haskell >=2.9 && <2.11 }) {}; - # https://github.com/ygale/timezone-series/issues/2 - timezone-series_0_1_5_1 = appendPatch super.timezone-series_0_1_5_1 (pkgs.fetchpatch { - url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; - sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; - }); - timezone-series = self.timezone-series_0_1_5_1; - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; From 4adbcc60fc420bb5d0306816273657a6f63ceb63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2016 07:31:11 +0200 Subject: [PATCH 109/234] configuration-hackage2nix.yaml: fix evaluation errors --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fbbc8d47d24..d282638a58e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -116,6 +116,7 @@ dont-distribute-packages: hfsevents: [ i686-linux, x86_64-linux ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] From a514bf604c6098f47e09feb173e953ba3a3a13ff Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sat, 10 Sep 2016 12:01:19 +0200 Subject: [PATCH 110/234] pytest-rerunfailures: init at 2.0.1 (cherry picked from commit 6ddf8f31d3998e464c10fdb59385bf79cf08ef09) (cherry picked from commit 074013bca596571a33852f18ff0f29c4578c347c) --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1017218cd38..0c74fc5e768 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4671,6 +4671,31 @@ in modules // { }; }; + pytest-rerunfailures = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-rerunfailures"; + version = "2.0.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/${pname}/${name}.tar.gz"; + sha256 = "1zzxlswbny8dp3c1sbhpyms1xkknxb6qfji3y3azc7gc95324xsv"; + }; + + propagatedBuildInputs = with self; [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "pytest plugin to re-run tests to eliminate flaky failures."; + homepage = https://github.com/pytest-dev/pytest-rerunfailures; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds ]; + platforms = platforms.all; + }; + }; + pytestflakes = buildPythonPackage rec { name = "pytest-flakes-${version}"; version = "1.0.0"; From deb59785b080ee720ba30d7add66013aec3e4930 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sat, 10 Sep 2016 12:20:39 +0200 Subject: [PATCH 111/234] tmuxp: Add pytest-rerunfailures to dependencies (cherry picked from commit 6fc67944bf8a9841b649c8d36f852ce65bbae0e1) (cherry picked from commit f0d1ac606232a02771343f6ad84d4c769ae2ad54) --- pkgs/tools/misc/tmuxp/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 91a55694f85..1f1ec0437f8 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -11,7 +11,17 @@ pythonPackages.buildPythonApplication rec { sha256 = "05z5ssv9glsqmcy9fdq06bawy1274dnzqsqd3a4z4jd0w6j09smn"; }; - buildInputs = with pythonPackages; [ pytest ]; + patchPhase = '' + # Dependencies required for testing shouldn't pinned to + # a specific version. + substituteInPlace requirements/test.txt \ + --replace "==" ">=" + ''; + + buildInputs = with pythonPackages; [ + pytest + pytest-rerunfailures + ]; propagatedBuildInputs = with pythonPackages; [ click colorama kaptan libtmux From e53b3ea8591567171f10d69560e58962722fd9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Sep 2016 09:42:26 +0200 Subject: [PATCH 112/234] pypeg2: disable tests on py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2adbd13f9561edf7771fc8687b9299a817ee71b6) Signed-off-by: Domen Kožar --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c74fc5e768..02ab27e07e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28221,6 +28221,9 @@ in modules // { sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b"; }; + #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35 + doCheck = !isPy3k; + meta = { description = "PEG parser interpreter in Python"; homepage = http://fdik.org/pyPEG; From 6ff44c571bb3c9bc810afcb7d7f9ea72c713e37d Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Tue, 13 Sep 2016 00:07:48 +0300 Subject: [PATCH 113/234] mumble: fix failing vm tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit modify tests to not fail if the event handlers are registered too slowly or if the wrong window is in focus (cherry picked from commit e087b0d12f97604ee1fdd09ef3d78b772c12468e) Signed-off-by: Domen Kožar --- nixos/tests/mumble.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 35f44002699..7959b85a0cf 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -36,18 +36,29 @@ in # cancel client audio configuration $client1->waitForWindow(qr/Audio Tuning Wizard/); $client2->waitForWindow(qr/Audio Tuning Wizard/); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendKeys("esc"); $client2->sendKeys("esc"); # cancel client cert configuration $client1->waitForWindow(qr/Certificate Management/); $client2->waitForWindow(qr/Certificate Management/); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendKeys("esc"); $client2->sendKeys("esc"); # accept server certificate $client1->waitForWindow(qr/^Mumble$/); $client2->waitForWindow(qr/^Mumble$/); + $server->sleep(5); # wait because mumble is slow to register event handlers + $client1->sendChars("y"); + $client2->sendChars("y"); + $server->sleep(5); # wait because mumble is slow to register event handlers + + # sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again + $client1->sendKeys("alt-tab"); + $client2->sendKeys("alt-tab"); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendChars("y"); $client2->sendChars("y"); From 18ba3297f04af05b340f467209d83aa34cd43f98 Mon Sep 17 00:00:00 2001 From: exi Date: Mon, 12 Sep 2016 13:42:44 +0300 Subject: [PATCH 114/234] Fix kmymoney test build failure on 32bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f4618e14b956055da3df400fa9d302c5ea64a7f8) Signed-off-by: Domen Kožar --- pkgs/applications/office/kmymoney/default.nix | 5 +++- .../office/kmymoney/seqaccessmgrtest.patch | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/office/kmymoney/seqaccessmgrtest.patch diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 2516cfd4597..f375da17504 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { KDEDIRS = libalkimia; - patches = [ ./qgpgme.patch ]; + patches = [ + ./qgpgme.patch + ./seqaccessmgrtest.patch + ]; meta = { homepage = http://kmymoney2.sourceforge.net/; diff --git a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch new file mode 100644 index 00000000000..d01a433ba09 --- /dev/null +++ b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch @@ -0,0 +1,26 @@ +Fix tests for 32bit builds until we can bring these upstream +diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +index dcb4b4a..e803203 100644 +--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp ++++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor() + QCOMPARE(m->m_nextPayeeID, 0ul); + QCOMPARE(m->m_nextScheduleID, 0ul); + QCOMPARE(m->m_nextReportID, 0ul); +- QCOMPARE(m->m_institutionList.count(), 0ul); +- QCOMPARE(m->m_accountList.count(), 5ul); +- QCOMPARE(m->m_transactionList.count(), 0ul); +- QCOMPARE(m->m_transactionKeys.count(), 0ul); +- QCOMPARE(m->m_payeeList.count(), 0ul); +- QCOMPARE(m->m_tagList.count(), 0ul); +- QCOMPARE(m->m_scheduleList.count(), 0ul); ++ QCOMPARE(m->m_institutionList.count(), (size_t)0); ++ QCOMPARE(m->m_accountList.count(), (size_t)5); ++ QCOMPARE(m->m_transactionList.count(), (size_t)0); ++ QCOMPARE(m->m_transactionKeys.count(), (size_t)0); ++ QCOMPARE(m->m_payeeList.count(), (size_t)0); ++ QCOMPARE(m->m_tagList.count(), (size_t)0); ++ QCOMPARE(m->m_scheduleList.count(), (size_t)0); + + QCOMPARE(m->m_dirty, false); + QCOMPARE(m->m_creationDate, QDate::currentDate()); From 26247ec718352cc377a94100414e6dbf19ac4cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Sep 2016 10:37:39 +0200 Subject: [PATCH 115/234] xburst-tools: doesn't build on 32bit linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 635b48d373bdf98324d696419c53a81512038bb4) Signed-off-by: Domen Kožar --- pkgs/tools/misc/xburst-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 56d16fbd905..e58fc391f43 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms.x86_64; }; } From d6a4a30fb1ce0e03110850b0252a4dd249499a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Sep 2016 10:33:52 +0200 Subject: [PATCH 116/234] pijul: build only on 64bit platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 8479962862563783ce216c1aec1aa08c1da696b2) Signed-off-by: Domen Kožar --- pkgs/applications/version-management/pijul/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 66dd63956d6..4f1f28a7aac 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -31,7 +31,7 @@ buildRustPackage rec { homepage = https://pijul.org/; description = "Fast DVCS based on a categorical theory of patches"; license = licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb maintainers = with maintainers; [ puffnfresh ]; }; } From 2ff10415bc3ac505958c77a179315662971cd402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Sep 2016 10:55:08 +0200 Subject: [PATCH 117/234] fix eval --- pkgs/tools/misc/xburst-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index e58fc391f43..408879a4534 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms.x86_64; + platforms = stdenv.lib.platforms.x86_64; }; } From d2151a50be4ba58662a796c8d38f7f80dac61c2b Mon Sep 17 00:00:00 2001 From: "A.J.Rouvoet" Date: Tue, 13 Sep 2016 09:10:35 +0200 Subject: [PATCH 118/234] libspatialite: builds on unix when libiconv is included --- pkgs/development/libraries/libspatialite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index eb3917b1192..faa0b988be2 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos }: +{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }: stdenv.mkDerivation rec { name = "libspatialite-4.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz"; }; - buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos ]; + buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos libiconv ]; configureFlags = "--disable-freexl"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://www.gaia-gis.it/fossil/libspatialite; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From cac553e8e098022a444661c35526562737675bb3 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 19:48:13 -0400 Subject: [PATCH 119/234] steam: runtime-generated.nix md5->sha256 --- pkgs/games/steam/runtime-generated.nix | 1552 ++++++++++++------------ pkgs/games/steam/update-runtime.py | 6 +- 2 files changed, 779 insertions(+), 779 deletions(-) diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 260b7a9b8d8..694274053bf 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -5,1747 +5,1747 @@ amd64 = [ rec { name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64"; - md5 = "cbbb1118a27ed0dfb126a109d1d265b3"; + sha256 = "03yfjxzsyf14zqwxb43piyh78xxap7yxh5f4gx649qv28h7ygfrm"; url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64"; - md5 = "c54e97c2023e1d1d5df16eb2c426c0be"; + sha256 = "1wi5fad0f7nqps55isvbb42njqssbhyzmd38q8413afjyhmm6icc"; url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "freeglut3.deb"; }; } rec { name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64"; - md5 = "1c719a43eb7fa0745eabcea972b0c473"; + sha256 = "1za8f7wkwcww4wacydqq3fvi5p1ivgcr2n3npirqir1gr25cbxaj"; url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64"; - md5 = "3870b0a51a7614f28bc40e3e58d39a9c"; + sha256 = "03y4239swznwlgdx6yc58sj6w5irqq7432hxcmcw8608m3w0m29h"; url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines.deb"; }; } rec { name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64"; - md5 = "607f89071971116adf22fe989408a395"; + sha256 = "1iwmgzkdxjvr2q2kz5bjz64r4qjqbcf6ynz3sy5y81dl254pjnmh"; url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - md5 = "ea6e6b0f99808a2cc8135036824bcfca"; + sha256 = "0md5vjz8wnayppcxkl5x7874w2z4w7pjz96gprv24hid4azmyci8"; url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { name = "libacl1_2.2.51-5ubuntu1+srt6_amd64"; - md5 = "5a11378ebba911b6e139c1dc3fee7990"; + sha256 = "02xwrfzspf58j9lr6b128jq1klkvd4b69lrclpqzwm9cqddg6mr5"; url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libacl1.deb"; }; } rec { name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64"; - md5 = "2ab7433f1e12be2d35c3916e2530b969"; + sha256 = "08m1w5mhzl613gbjg6lvf7wcm7bs00xddaaci8f1944icl8pdibb"; url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libappindicator1.deb"; }; } rec { name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "aaf2e682393b856d25619d05c44c2108"; + sha256 = "0m69ar6w3lzsggn79lyc3614p9rr2dy29vwqvl4w3gmshp6aqhs4"; url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64"; - md5 = "9e32b15b95be699bc9270dac78fd384c"; + sha256 = "1bh911nx5a2abn38h9sa90ji358r6is2n7ymm10v94yibdf63rwg"; url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2.deb"; }; } rec { name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64"; - md5 = "82b9f608c4e02ae70542466690ddb904"; + sha256 = "1l36hxgnml9pglrihm17vkgqp3jpqslicg1mpycixzz9cpgfyxbz"; url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { name = "libasyncns0_0.8-4+srt4_amd64"; - md5 = "f318986e6b639fd680117e27e60ab497"; + sha256 = "154bh8mpslr4xwf54h1xds4v2yjf8rbyvv1lc0azl9gnkan1y0an"; url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasyncns0.deb"; }; } rec { name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64"; - md5 = "36b951c9e4bb13126bd12f4a895c77ce"; + sha256 = "0kky7mfkx38lj4gafrv886z0vbf17xnpymq6qas59x8f35bzx742"; url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { name = "libattr1_2.4.46-5ubuntu1+srt4_amd64"; - md5 = "4bfcd91866196506d53c114d81b5bf90"; + sha256 = "11hn8q45pddm4khq0qp1qj19c1syfawscnvrl6cv1xmahpb3nm3i"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libattr1.deb"; }; } rec { name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64"; - md5 = "e2f370e89883d69abdf4cae6151bb22d"; + sha256 = "0yrgvh80i1gpcq2w64hkqnmiymgrn7r2v67wyd1iijc2zyb4x0c3"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-client3.deb"; }; } rec { name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64"; - md5 = "154923fce5cea989b98ca1c11fe35196"; + sha256 = "1r1rqpqdqmqxn3g1iifc77jgrhfkr5275s7d5h3p1hvkmlzyvwd2"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-common3.deb"; }; } rec { name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "6d9d47d9695b5ece354c5a6cbcde905d"; + sha256 = "09fwqr29dxhxkkf1gd9f9sph2jgv0qx3p7k6qxxwq3bg4lh2971n"; url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavcodec53.deb"; }; } rec { name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "f5d71b18f095842d8f881e3362d031ac"; + sha256 = "0fynn6g6mc4raj144hg9r7qbiz7b2s4p7aidjpy34xkbxcn2vq45"; url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavfilter2.deb"; }; } rec { name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "88181968144020fb0fbf90ae740456d8"; + sha256 = "0qdfr19xfxwab9q5w4bvwgv873cs8zgm4s10hwg6741xr6qifnhg"; url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavformat53.deb"; }; } rec { name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "790046586a22c706ab561ad5f3c94ac6"; + sha256 = "0pfgxnrf1jjlb7gvwklwn7m61n591yfzqfzzqb76gyr20r6v6dzw"; url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavutil51.deb"; }; } rec { name = "libbz2-1.0_1.0.6-1+srt4_amd64"; - md5 = "9e9dc9f5739feb34dbabc4e471317a5a"; + sha256 = "13rsp2cyayvnh2755kjbs6g6j85rdpl6cwlx22b97hid5pq5nk60"; url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64"; - md5 = "a474e80d3f221776d59084f2ac60ef00"; + sha256 = "0iv16gfc1b8n4p088jbask9i8i56agip8dd5b1r22r52hg28gi9y"; url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcairo2.deb"; }; } rec { name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "18a66b67dce65dad49c374965e0921f0"; + sha256 = "19gl25hjzxw375qqbckmgfr14qd48zaccnny4zbddlz8aj5w4wig"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "2b756be54454a87929c5d3a724297496"; + sha256 = "1kgq90l6rafqk7zfxafvzkh8msys5mlc95qr3rcv6l0f03w785dy"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "bc12bbc912b3d71dc8c6340e9f43136c"; + sha256 = "01x6y4gq1ivpdywglx418gr4m56qvm05nicmavwimnafxga3c5sk"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra0.deb"; }; } rec { name = "libcap2_2.22-1ubuntu3+srt4_amd64"; - md5 = "d8264c1c6f71865f4357d7f59062098f"; + sha256 = "1rhfhq1n45fq40p6c2aipkica2dw8w95w7bsdrxfby48gdppgzy7"; url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcap2.deb"; }; } rec { name = "libcg_3.0.0016-0ubuntu1+srt4_amd64"; - md5 = "c0c923294f11ba74f0ef566e1effb4e6"; + sha256 = "0yifiwr2hc7rvvd6snf530gma05v2qpiyl652drdc9rvcfjrj9zi"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcg.deb"; }; } rec { name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; - md5 = "12cd8bbe50da1b698d5280c8cd1efe38"; + sha256 = "1cll5iwdply1lz211j83n22aidsxfx2jvy09a02qa79a7g1qv6c3"; url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcomerr2.deb"; }; } rec { name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64"; - md5 = "bf3f1fd3fb7376ac8a4de5837d0b24a3"; + sha256 = "1xaxim0df5713hj4kq141rnf51zvyhvpv015q4q41c3nh4d9bz7w"; url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcups2.deb"; }; } rec { name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - md5 = "12acf5241daf7ff86e9dc23c64a2f71b"; + sha256 = "0vwdpkiisnbrm1j22qzjj2g5vsiv4wdja3j34j16pc30088f4c3i"; url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3.deb"; }; } rec { name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - md5 = "0fddfa641103922bdc38ec71c61ba681"; + sha256 = "0rvrjcxpmnbq42aq6x31gxxglwiccm059r2q78hqiw82i86b7j28"; url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; - md5 = "5082143b56f4d6a72c21244c4b7bc653"; + sha256 = "1nkzsi04m1icwb3b1nky15d0frnc0hpfsyrm3xx1hriv02iqwgvw"; url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64"; - md5 = "28cf6b803847aa977ce557f479f52846"; + sha256 = "19xnslykd4y22ff5mfs2rg4rjppmcrmrbwynzx4v2rvxckvvq77f"; url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64"; - md5 = "85833a32196fb585db2bbb65fdd28c1d"; + sha256 = "1x1szx7m6y6i0d6ahffnrdhs693rk4wi4hrhbmmn2g1sizr9qhmb"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64"; - md5 = "ee79e60c712f7139a305d929c51974e1"; + sha256 = "0nrydq0mjjsx1v9gk78j5xcgdaay5dhxn5rj9ydkbkw7ih4xm2m1"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64"; - md5 = "6234ec87a59fb9a534e53efb3978347a"; + sha256 = "09pjkyjykvsmddx20ji4wgr5gnqbshj1hpm77129ini9qp61wxig"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexif12.deb"; }; } rec { name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; - md5 = "a7148db45279001346cebc02a7d7c1af"; + sha256 = "0axky1v55yalkng9mn22ignmapv100gkcfb0xs82pllzaws32yhb"; url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexpat1.deb"; }; } rec { name = "libffi6_3.0.11~rc1-5+srt4_amd64"; - md5 = "522cb933493dd7ad25b35381325579aa"; + sha256 = "1brqpwjbf6dd6crvs32b7q73m11anlq1s1r1m0p5cv17sc89q3q4"; url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libffi6.deb"; }; } rec { name = "libflac8_1.2.1-6+srt4_amd64"; - md5 = "87dcbc179e3d5ba43629b3d3045d9253"; + sha256 = "1sdbbm4gdq0mw103z3nwhywvix1z21gdq6lc5xf4s12zpj1zq2gc"; url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libflac8.deb"; }; } rec { name = "libfltk1.1_1.1.10-10+srt4_amd64"; - md5 = "4d89126341f2e70a7a248e20dc024240"; + sha256 = "0x5xxxkkj7g5wyhxl1rv846irn3r8hh744fqyn8hgmbp4mdgils0"; url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfltk1.1.deb"; }; } rec { name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64"; - md5 = "d90eb7f1c85b5c1c256e87ae0f840986"; + sha256 = "0mcdd9x8dc153sk2dqixxy4rxvl9hvc7dz0msfwiywrgbilzfbl4"; url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfontconfig1.deb"; }; } rec { name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; - md5 = "06f7ccb54bba06c1e2673471866039a0"; + sha256 = "08x0fg01qbycdwdgqj3xal0fi676pnkkgsk0kbvxfg3i4ln944l1"; url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfreetype6.deb"; }; } rec { name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "a16aa8ab25b2d926085b686bdccfd31d"; + sha256 = "05pg02l16fj7fdv8gkx95jy4j4cikqwmdkyq65a8qf20in3qs04m"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcc1.deb"; }; } rec { name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64"; - md5 = "54e9d0b216e195c52491aa6714262abc"; + sha256 = "0mmgmnzyi9rlk7k6ir3f127brml366bbk7v5aq75y90z6qdp5h62"; url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64"; - md5 = "502feac74b4fdda9c2b4a12efd15c82e"; + sha256 = "0qpxrm37js3pgi8hwcfqyqgkipypb0gw6nvsbz5dd112hmnpkp37"; url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcrypt11.deb"; }; } rec { name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64"; - md5 = "6becfe1861ebea500d23273acece2eb7"; + sha256 = "00kq05jzlrvd4gx8pz54k1i8sm9v8l07vih4if6wanr45ifsjqlp"; url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { name = "libglew1.10_1.10.0-3+srt4_amd64"; - md5 = "f61ea5e775178ce123d40198c1157b9f"; + sha256 = "0ybry9jiyp0bgfm9b0bznf5qllyf7jc6avd8rcc20ai7yf719mwc"; url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.10.deb"; }; } rec { name = "libglew1.6_1.6.0-4+srt4_amd64"; - md5 = "bdff67db0a4d67674896f13bbc6effd3"; + sha256 = "1y4ywi4lp5df3nasxz8p5rmybl2vbv8bbww1s8alin5waidl7qav"; url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.6.deb"; }; } rec { name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64"; - md5 = "a1a4af8a6ecf974bfdac345319a2e953"; + sha256 = "1imdb4wyy7qndg8xmlrfnj0x3a6fg7dv0izn2rajp5q77ivry51v"; url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64"; - md5 = "170edcba12461120395cfae26db8ef39"; + sha256 = "1bgks33ck18asizisa5d7wj4wsv8hxccpshl0f2ihdvs6qgxgs76"; url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64"; - md5 = "ddae75bcd90b6e11cde2071ccb05799d"; + sha256 = "1la9938zrqrf8v4bcn5063xxxwwankhzh69m0sy8csixfg480c1a"; url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgmp10.deb"; }; } rec { name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64"; - md5 = "5393d7b8c652fcdb4bc7b0063e7bc595"; + sha256 = "1zrrprip93m9r2c7zd54pz8f5jvdgb0jir6ifvqbl60d521lfbl7"; url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgnutls26.deb"; }; } rec { name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "0a2b96a562ddf2e2e8018ee42fc44697"; + sha256 = "094y3af19hg7s0hklh9slhmb19h2hhbfl4fpfpqcvbagkh6gwxl1"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgomp1.deb"; }; } rec { name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64"; - md5 = "2732fe5e798a8355f1f42ce803144b5e"; + sha256 = "0zw0zrl50y86y292zjcgpxiqjwyw0krnrmi28qvb0ba2ahp18f7v"; url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgpg-error0.deb"; }; } rec { name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "68cc7194070bc391898a2ac64f60238d"; + sha256 = "1mmd16fh58gnyyjwg9ac1br0xia670xc0ag65bfgxwnpfnkr7nyj"; url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "aec9eef24bdbf46a564a8c3a2e5e9996"; + sha256 = "063k09yyr9mn0lacp29cgwagpiix220p7ahs5shpyigkjk5bp174"; url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64"; - md5 = "d7d638c9706de787b067b90538f5d161"; + sha256 = "0r60n1xym2alg4jr1icgzvd8x614p7vky0zxfvn8x9qd2hzr8k5q"; url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64"; - md5 = "5b1d88d1613f8a15dbcf4721006a928e"; + sha256 = "0xynq7jgb0x8npb6apj58ag5zccl0gh4npyrfvs0ys4hzlv2fkmm"; url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - md5 = "3967c473e9250f043ce694f0f0881b95"; + sha256 = "0zbsr09xam3sl5qpnl34hgiir98g3rcfg2nblzwp8yr9kkrsb7zk"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - md5 = "5a2f731bdac2bd089780af2f63635f7b"; + sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64"; - md5 = "042f301b15c2213e918332b827ed876e"; + sha256 = "1bv962vi9x8m41ss6g73q91xlxhf1pd733wsywflllkxa5qyabpl"; url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "c714f66ed7629e5ea8da89b301314dbf"; + sha256 = "1s67jx924c06arhf18dpqncphlih26a7frshzd4ndwzp8xp87xyc"; url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "adc4837d7e7a8bb59d1eff8dc009a787"; + sha256 = "0zchyajpd78rflfh4md3i0cvzd0gbkwf6l8kqcyavvib42mmdga8"; url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "c9832147e9399447d25db46b932009d5"; + sha256 = "0lz83zkg4f1rjhf0sigk09s4kbksm9j2lalf7k04bci1sxs2wj2y"; url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "ec9e8fc0b860a9e67a75965a684a1b10"; + sha256 = "0bcn57af9g4psxfiqqfsmfv7z3a713z86760lspgl63xfxlsm4d5"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { name = "libice6_1.0.7-2build1+srt4_amd64"; - md5 = "165e91c5ea7d2268e54c4483d6bfee21"; + sha256 = "0lygkw0my7diasqyw7m5a0rfcpp38pb8jq7iqks195j21sy95h0s"; url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libice6.deb"; }; } rec { name = "libidn11_1.23-2+steamrt1+srt4_amd64"; - md5 = "6039786cec09e8196f0344a0eaba4b35"; + sha256 = "0530ygdsq840kmqm1mlqk19a7wxpvwgrbary2dpflzqvclx4gfr1"; url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libidn11.deb"; }; } rec { name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64"; - md5 = "e50b84332411dfe83f3cdb280a340659"; + sha256 = "0j89i9hgdh93a6m71ji3rrhlnyanjb7dbxy460shn38v4f3ax735"; url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libindicator7.deb"; }; } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64"; - md5 = "9e2fbb98f0a36c193b7de2e0aedf504c"; + sha256 = "0l7h8z8fx0pqkbdh5x3v6azz6ddxdlzchgs97h5babrknkfkiar4"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64"; - md5 = "214eaa463aeef6e881231c3bd902fb97"; + sha256 = "0z2df70v2ggw2la3yr4ll926wj6pc84li1x2bxwz9ysw7xsgalg0"; url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64"; - md5 = "fc7df95d832fea01fa6ec6134518f785"; + sha256 = "0n6qsfk42nhwvg8r9win7a90zvb31ba7cp7jvbbc4bhv7ygxxm7f"; url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg62.deb"; }; } rec { name = "libjson0_0.9-1ubuntu1.1+srt2_amd64"; - md5 = "9181b67bd4b26368f29922a872998ad6"; + sha256 = "10r817kzxcviqvrajmi33pdbqss1qxpkmjxda7cclamnnawbcd17"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjson0.deb"; }; } rec { name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "14a85bce181c6fe78bd00c156bd71033"; + sha256 = "1xsl1nwsm6r1gjfkl7x71h8p9qkq7gi624277cj3k68b31qh3g4z"; url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libk5crypto3.deb"; }; } rec { name = "libkeyutils1_1.5.2-2+srt4_amd64"; - md5 = "cc6a001e351c3e4e0ece1f59c92fe9a9"; + sha256 = "0khwz7jqw9yq157r675sjii3bqk2i66dh6wn43b7vhh0wjz6nbdc"; url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkeyutils1.deb"; }; } rec { name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "6de94826e9407f5ebf3880ba4306e287"; + sha256 = "0lfhwqsxpzaapz71rldi2zhsxkdy55krcmfbli06qs4mqx9mf691"; url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "39ce748ff830b7e01f93e12e3829c90e"; + sha256 = "0aqwf07c818apd5md4gxwzx67xvbvv8s6fm890vibqhsrmymi621"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-3.deb"; }; } rec { name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "dda5082adc17603046892b6c9a6f8d96"; + sha256 = "04wacj307jcy8ykyq6w3xw9phmprmfz6cpwv1wyfarxf4gr7nyii"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5support0.deb"; }; } rec { name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64"; - md5 = "6aa3befa823b58e2ef17137c6ce4ed26"; + sha256 = "12kva7qrghlj65khzcmj6xqszij9186ly0iwjjqjs5xl5821aic4"; url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liblcms2-2.deb"; }; } rec { name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "736acf677d1bc728947297ae33d8d53c"; + sha256 = "1xnhh3s2cm4vjny964bsznnk2a6zj9n8ygkxfyrraib3wy61lidv"; url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64"; - md5 = "eeb2a0afa5eb25eb240a7a5aac1fc6eb"; + sha256 = "069s7km994c2z89jndwwrpspq0z7jyxr56ma057hbrilfpp4r7yd"; url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libltdl7.deb"; }; } rec { name = "libmikmod2_3.1.12-2+srt4_amd64"; - md5 = "aaf3c4e2d1c733dc9847d1b4b160faba"; + sha256 = "11flm0w3vwf66yi9mqf43ma3bc6jwg6xcz71h4a3jgqahsg3skfb"; url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libmikmod2.deb"; }; } rec { name = "libncurses5_5.9-4+srt4_amd64"; - md5 = "a1e80e9cb80e7de986ce7730ae0e27d9"; + sha256 = "08wb0y9dizj7ngsivl2rpikjfl246q1jib6r0nqg7c6r05h8k46m"; url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncurses5.deb"; }; } rec { name = "libncursesw5_5.9-4+srt4_amd64"; - md5 = "69f8d641d346520d794ed925961df35c"; + sha256 = "1gv0w7jrx9zd59zg7z38qzlcp48h7yyfj4jrbfsifl54ryn4fgwh"; url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncursesw5.deb"; }; } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "f227e6607d7b84cbe99e3eaf7fa726c8"; + sha256 = "0f3h1hh4vn0ysr099lgwk8dx3462cpvmz3ig8r6d4vhxyzyh5a9z"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-glib4.deb"; }; } rec { name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "da911ace3dc8956ae2d776a9de38491c"; + sha256 = "1dlfym38qs8m3g38z776vvpxg77xx2mjab7qipsc0lnppjn8gnss"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-util2.deb"; }; } rec { name = "libnotify4_0.7.5-1+srt4_amd64"; - md5 = "d75b12a9714d3e5bf5513e43cfecb9e1"; + sha256 = "1d61w65qxs93hpn4a8awzhjqcv7yva96n65309630axsm48cqxbd"; url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnotify4.deb"; }; } rec { name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64"; - md5 = "189258c833f8ddf0eb22fe26ad3fa3b9"; + sha256 = "1k08330f3fhr7c6bpm4b5qdyc2kkmz8fa5bgk1a8psxqvfdlsyap"; url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnspr4.deb"; }; } rec { name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64"; - md5 = "9e73637724364e1e0f95df26ccee054a"; + sha256 = "1bxg7wk179gwi7s4xrn1bkl2amnbqrf11qsdw384cyq9c2hwfagr"; url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnss3.deb"; }; } rec { name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64"; - md5 = "bf9932f2354ee1026d636d3cb7026b05"; + sha256 = "0829hivgxzmhck0l16lg16qbphkhsrnqb2px4ksrzbspmg6b5rb1"; url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libogg0.deb"; }; } rec { name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64"; - md5 = "286033d0e031389e350644f2979f7b62"; + sha256 = "08gj208gfh37lfnxz1xksbmm1g78ax812z0rk12ahl4w72jm1yjy"; url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libopenal1.deb"; }; } rec { name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64"; - md5 = "838a5f35acfc6e454954ed9ae776ef7d"; + sha256 = "0pgiha65y3rrqm095vmwc27498drqcgadiqyh4zyq2h2zi2ki60j"; url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64"; - md5 = "5834045994d6e316a68568a01257bed9"; + sha256 = "1hsncmfp6h3ca5w2bhaxbr6y2ck8fpzp0zhjijgfnyaqvsjc6wwa"; url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libp11-kit0.deb"; }; } rec { name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64"; - md5 = "6f81b9ab5fa21dd99eae337be3ed546e"; + sha256 = "16hwn8a30ydarlw3rvpda48m0z0k5y1qw5vdg6syjaqcbwx15mll"; url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { name = "libpci3_3.1.8-2ubuntu5+srt4_amd64"; - md5 = "6ebc019119624fb5f776d9829ee49478"; + sha256 = "041hxfsk0r7rh02h16igcr0141gmci4ljadljcxsa1yiyn41b4rr"; url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpci3.deb"; }; } rec { name = "libpcre3_8.12-4+srt4_amd64"; - md5 = "134666c4e50fb2422a12018f061dc2ce"; + sha256 = "1m53qvhqbicybi43zjjblhaqxfnlvq1m61mkvdhwskcxh1y5zpic"; url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcre3.deb"; }; } rec { name = "libpcrecpp0_8.12-4+srt4_amd64"; - md5 = "f4beb4a2b0d24d1bf3a75f5794580d9a"; + sha256 = "0dv8a32dsvklrnvw66rxb7xim9ylhr9w4qvns527v6fl98rvg08l"; url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; - md5 = "52134e1b8190957f069268827f2bde74"; + sha256 = "0bljhrivr6dw181gisvy8dz6y9mjn0g9w3d5s2f5h8772g80mx7f"; url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64"; - md5 = "0e79e11954e9dd12b345de34ae9dda6d"; + sha256 = "00wis5q2xpdfh5z42rfl95j63lbsz5l3i5hvsyvim8r2h1r2nyn0"; url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpng12-0.deb"; }; } rec { name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64"; - md5 = "e5314b3129eda4940896d1cad7701a22"; + sha256 = "150gpmn1gb0ykd3cgggc9zkb070figgwrcdqx89qa2kwvkxlg6vl"; url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpulse0.deb"; }; } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "3cdc654725b6fd08c96eee54041b2ce3"; + sha256 = "07ldw9iyy9akp5zq2h7l85q3x8ggsx2hah51d0j41lfqrysyig63"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64"; - md5 = "d5ad690e85842798c27c8afb8c0c9d53"; + sha256 = "0lzgsydisj6z7dgjgkmr42mzv11j61r9wny1m31vgm990p5zkh7n"; url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "librtmp0.deb"; }; } rec { name = "libsamplerate0_0.1.8-4+srt4_amd64"; - md5 = "1680e147372fd0500aa6a27a9a557662"; + sha256 = "1g6nh8p3q8bsqw9w0ifpl86gql9lqqwxk7zn9bl62pq393h107mg"; url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsamplerate0.deb"; }; } rec { name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64"; - md5 = "d51e140f457c694957bc476128dfa965"; + sha256 = "0sp76gcpw1zgqpyq7bp3gmavlncflkrxiyg738nsf9mb65xy4v94"; url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsasl2-2.deb"; }; } rec { name = "libsdl-image1.2_1.2.10-3+srt4_amd64"; - md5 = "965cbe12d8b1b31eae47d0eb9651c72c"; + sha256 = "0jhlbn5jfap15d8nr2fz2hcwlv32ax29gddd5jg08vmfga767sqi"; url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64"; - md5 = "b60fff841525e6097f0bd3f9e224e8a1"; + sha256 = "0cb84d0x3fjsl3w48jmxjzc7xq9c6g73p99baxdg50vhqssr7dmw"; url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64"; - md5 = "30bd93bf4d524594021b8b3f9b35eb2c"; + sha256 = "1dqp16qi413xpv8nmyrbgx2x3dcxsyk2giifz7pa6jyvawcx7ghv"; url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64"; - md5 = "ea14d71381e1d55c59b5790f37531900"; + sha256 = "1zcy3njzkahd5rq4yh7i07q3x1wyfpzl6kzynbsqkx9cnf53342k"; url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { name = "libsdl2_2.0.4+steamrt2+srt1_amd64"; - md5 = "b648fbaea74b0d76b020c6abb78b46ce"; + sha256 = "04v4znqksg9qj4hnz20czwx4qy4i6p9csqql4yd299wvjl9k61j5"; url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2.deb"; }; } rec { name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64"; - md5 = "7a16e55edbcc24311753260947eb2574"; + sha256 = "01kwm3yjq275j7hnd52hfjbhj5ijfz5wxmc1vpdp88q89zbkw227"; url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-image.deb"; }; } rec { name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64"; - md5 = "00c0fceba317e355e52353f1b453419c"; + sha256 = "0bzv3spjksn504ma7haywyi3dlb5nl35wxp83if9n58i4850j6sd"; url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { name = "libsdl2-net_2.0.1+srt1_amd64"; - md5 = "9544e9d02e1aacdaaefcae68f57baa44"; + sha256 = "16zx9cj56m939x3zrvq1ypxsd26vnc81gmkpkg5j80jl2lwz6b6v"; url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-net.deb"; }; } rec { name = "libsdl2-ttf_2.0.14+srt1_amd64"; - md5 = "7bdbbba9e9150b8596a28afb4c49dd13"; + sha256 = "14sfnmb0zz0mhvl3jl45jqc2sci59gmzdn5kif08ai8ri2bk9sza"; url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64"; - md5 = "cb3455f005e98fd8eb7aa5d4a72e7458"; + sha256 = "1y2a5f9qsxgdhak7vf72jsd6drjim172qp6m897yx7xbbk8ikpnr"; url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libselinux1.deb"; }; } rec { name = "libsm6_1.2.0-2build1+srt4_amd64"; - md5 = "7682f5ffd1f30dc5818b3759be85e21a"; + sha256 = "0fjb9grh86vz58g6cb5d89hxnppqf7w5apivqb3h6sd5axkg2z1r"; url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsm6.deb"; }; } rec { name = "libsndfile1_1.0.25-4+srt4_amd64"; - md5 = "e7a184667cc034127615e7bc15bc050b"; + sha256 = "0fdv7ca60s23qc5azjsg7aaznqksx5xh0bngzc6sl8bqvnnc8z1g"; url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsndfile1.deb"; }; } rec { name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64"; - md5 = "95acf2dbab5d8c6d7c0cd4b809025b87"; + sha256 = "1as44g6g5li8q6mdxwnwfbqg9f779vyjh2bqygv5xm339viaj510"; url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeex1.deb"; }; } rec { name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64"; - md5 = "38f8216be0d2b2dfd2850d87c7e306df"; + sha256 = "0rsrl5z379bls6bhb0nqc92ilkd7jkg7bdmxw0xg6vw9l66w78ln"; url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; - md5 = "1a9c37c32fa46f7d55a2e384cd6ce5a6"; + sha256 = "1x1byhdvr0zdfl9dj07qpndifbs9x416vxl7rpmig9g0makxvsmx"; url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64"; - md5 = "eabb32b42b50ae68d5a4b2ef0b323c95"; + sha256 = "11n8iwsc562i1glpisjs9xvlmz4a4xibq6axkhi0xnvv0pbfnxiw"; url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "c5d4ad341622e56660a5202500af4930"; + sha256 = "0fdmjsyl8a5n14gkwhvkr3xfcfr7q9djapsk8gj56d6r0ydg9yxc"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6.deb"; }; } rec { name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64"; - md5 = "0776afbc253637cb3491d08d65601a7e"; + sha256 = "1yn54vcd5hxx7rxzvshbfidfksl1c0pvl8xv427lkf7xni3jx0xb"; url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "0aac40ddee7040acf921dbacc2776bea"; + sha256 = "0y0k0glqnmsq69sbp3s47pw37vvf969n3chniv3jmrjkjghkp44h"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libswscale2.deb"; }; } rec { name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; - md5 = "6e092ebafe0cf5a49ee9319e2cf6f4fd"; + sha256 = "0kqv3ndnw1lcz5p190bxpq6rglpcxdsz44wyr6yl7w5wpfwcbs61"; url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtasn1-3.deb"; }; } rec { name = "libtbb2_4.0+r233-1+srt4_amd64"; - md5 = "ccd7521c751d0e3596ef200a3363df4b"; + sha256 = "1ngm0nkzk8w5s7dp01983lybd256130kdc8f4jmlyikhvyx0khgh"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtbb2.deb"; }; } rec { name = "libtdb1_1.2.9-4+srt4_amd64"; - md5 = "56b46df3ed2af08c54838cbe67c0b937"; + sha256 = "112dq62phrd3czhi27kdk4ra9is5phxpzbn26x4bis4y3ccm0cfm"; url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtdb1.deb"; }; } rec { name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64"; - md5 = "c1381636444b1d35be7898611fbc4150"; + sha256 = "01zvb8msi6pkjs85y4j78a110fzlmnjp69m7z7qwr2r7rr05w6r0"; url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtheora0.deb"; }; } rec { name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; - md5 = "7c44d58a6acf73b6c298cfa03e982e0f"; + sha256 = "13j4pqqba0bf2fq0871s8b4wkw8zyv0q80x0n07lkjiv7bvrrkcw"; url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtiff4.deb"; }; } rec { name = "libtinfo5_5.9-4+srt4_amd64"; - md5 = "708d85139b45dc5e93a3ca00990204ab"; + sha256 = "07pp7dgp33yjdk0i3s7q73qq0pd0ylfbpvr5jssjap0wsp3aqq66"; url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtinfo5.deb"; }; } rec { name = "libudev0_175-0ubuntu9.2+srt4_amd64"; - md5 = "89d4fbfa14053514448ecaff1d8cb2c4"; + sha256 = "07jvb8ghflb87f4dvgii5jv5qzz31g9s7c3k8wb9w9jp574y7079"; url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libudev0.deb"; }; } rec { name = "libusb-1.0-0_1.0.19-1+srt1_amd64"; - md5 = "3d2612fa64d30aa01a477e02886f9ea1"; + sha256 = "19f9mhbjm6r4yxdr3fvsn0ad8j7dm07y4bzwqf0n5i715jcc0qaf"; url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64"; - md5 = "0d0a1e7e54df9e10e758ee90e96a8f55"; + sha256 = "060wnsbhxl0aqyh1ymbcdma59v10b1vgi3h3xvvilzl869ivwr1p"; url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libuuid1.deb"; }; } rec { name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "21794fa4d2936f13999455ea16575df4"; + sha256 = "1v6n0ryr48d8f25vy06d9vh84z2zf3kmg6k8pg89j0s3spdyb44v"; url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-glx1.deb"; }; } rec { name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "ebf9276cc75fddbc81958aa8e7a2f285"; + sha256 = "03s9kbprf6r48y4ycfixx96ga0n8vfjn7v74sv88kl0lrs8xzjy8"; url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-x11-1.deb"; }; } rec { name = "libva1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "6d8d1a89d63c536e4ba77cffb9af7df9"; + sha256 = "0700lprd2c636dhqs000amw0nkys77h8mb7698bg30j25yd5kqr4"; url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva1.deb"; }; } rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; - md5 = "d31594fc832bfd0bc65c43f2e7f40ac5"; + sha256 = "0a519njbsdwpvc49pn08sya34z2wcd8hpl0j44plr4bd2df010g2"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvdpau1.deb"; }; } rec { name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "6acf08e8df17c93563dae9a381cc26ac"; + sha256 = "1jdvxgvlwnjcvg6009qfklr8mf3678ydrg855smgv8a0nd7v5qiv"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbis0a.deb"; }; } rec { name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "b6a1ab86060a3c4e1963d513ae68376b"; + sha256 = "1ysm1ika8cymh7gmd3p2hdfsnm3jrzyn4g2r12r4m9m6q3l9knz7"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "56218bd8b7278303574f6f4bc23fac1a"; + sha256 = "0y4r9s5cjcjxi6hy0svzfbqlkaxklb883vcsqn1j0kp9li3jpkbx"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { name = "libvpx1_1.0.0-1+srt4_amd64"; - md5 = "7ecb41c7e23f1caa6764abed122a2f6b"; + sha256 = "1275437ph91i67q6naigz4nhmw2a330q72mjv282slk7y187ana5"; url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvpx1.deb"; }; } rec { name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64"; - md5 = "4d9ac7966de8160a13817291206b51a4"; + sha256 = "18v5vbrvg6l9m768k4cb4xwbxahqrr7zspx1b5a8fv6bw8h3d9l4"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvulkan1.deb"; }; } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "a1e5b4a8f8200feef82dab976f1b4e5d"; + sha256 = "02baqaxcpw306cgr5dvz5pcir7ys08r603m8ahk22bzgxpzl6xk4"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { name = "libwrap0_7.6.q-21+srt4_amd64"; - md5 = "52c3a2c8395cbba79e65c3d60a82e1fd"; + sha256 = "12wq77h9jczq974fh3c8n4fkqa876kbizvai96jizh7c90z94kvk"; url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwrap0.deb"; }; } rec { name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - md5 = "22ca2e28aa3f3d70b77632a8772a4a9d"; + sha256 = "0qp2q9q1z9sz0pyc7l1n6xa0bc22xsml3vf2yhdls71im3ks7bi9"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-6.deb"; }; } rec { name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - md5 = "c012bbc8654c3c012dc7b5901c486f4d"; + sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-data.deb"; }; } rec { name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - md5 = "e94af0629e0b59f21c1ccc4f4d4088b5"; + sha256 = "1vsvf6ihz8jbnsarygnfrjb1y7pg44gpk89b8sk449p0c1kmv4yz"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { name = "libxau6_1.0.6-4+srt4_amd64"; - md5 = "a1de8ce9992f09ca56f20ab8327c34a2"; + sha256 = "1bm0jp69kfnirvlsyj7qxf7dg5b1n53875kxr9asdpw4aqmfj3a6"; url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxau6.deb"; }; } rec { name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64"; - md5 = "57942d64120a191d0a1ca3bcb1fb2b8f"; + sha256 = "15r0f6zhjr13pca7mdxfhk0v48923q0kndp23kpxw8rz75nc15s7"; url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxaw7.deb"; }; } rec { name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ec25a999e0cd681955ef2f9b06161dfe"; + sha256 = "072z8vwk4gmbnyf5acn6y4rjiidk7rvi1k05za1j5hlqzlydb6x9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64"; - md5 = "a34a6950609570a554e574b086b73c7f"; + sha256 = "1062g911skvvlvxr6ihxkb0inyg6xg1j4m4k5rfqs333rw4npc2i"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - md5 = "d4fd2c66b60ff1db1c87e6884d5ae093"; + sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-doc.deb"; }; } rec { name = "libxcb-dpms0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ba4c437f0ab6f71284dca7d61b0e6df0"; + sha256 = "1xq6zh8val8mc7wcry0jwdx11aagm4af383c6vs2z6a8vz97c6sj"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ea4e1ff16a644f136ae45c7e2b9849c8"; + sha256 = "1kipdyw3wgdywznr5qxbdl85igizc40hwjd3s5f3y5pvd8kprarz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64"; - md5 = "386ba46c8f015d642d9351d690f0a822"; + sha256 = "04bqidf71j55qp2b83bfjm26sa62gslidzhzg81knynlqi8kk00q"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e2eeda427ea95e90068f4434a926fd25"; + sha256 = "03wndp2gkjw016rl6k4jhkcpbs1njg74flnb0ppk30j7nxnxqcm9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64"; - md5 = "0519bd96e7af25f6acf1a6cd63536d38"; + sha256 = "18f38c275h2y9221mn7x0s8ap5fhlry6rdz34lz0rr3pn83fhpvf"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-present0.deb"; }; } rec { name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64"; - md5 = "bc24264b0ca68cc209e66f1620aeb232"; + sha256 = "08c7fx2vc35l7s72f2z02j0wh0b728ibn3zf103jc0yri9pgfinz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64"; - md5 = "2ee93429107681f1afddcd932b55710b"; + sha256 = "1ddr52m5x9ah4j313fvq2ira96l13w8dd4qi0z38llarmrhw2p2y"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-record0.deb"; }; } rec { name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ec46d80b43969cffd7aebbef27359897"; + sha256 = "07kyplilgxk0dj9gxk9zdf5l108d8ya9j4j1ji0frn0mk06i45kl"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-render0.deb"; }; } rec { name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64"; - md5 = "74a13db70ec5ab4a0be7ea5afababa8b"; + sha256 = "0pxpgam9xjzf0m6hrqhl0679qa10qk91ami0p7k899b5b1573j6d"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-res0.deb"; }; } rec { name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e20c88e8b39404b5e60841ea24860c48"; + sha256 = "1i09z5nszbh9ikjpviwcixayicbq0v9rdg7gygxhs54zxxjccw8y"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64"; - md5 = "64773ffa7219574d1356fa2b621d5f4f"; + sha256 = "02c87qhymk8ncywaw7zrs73spl1x1byklnafk2drfw76gpf2pa26"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64"; - md5 = "d263f46ada805900e88deb8bd6e7016e"; + sha256 = "0yzk3yx3c20ms7np2g956m1j3y5xf241gnvpsv37z173a4j7hlhn"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64"; - md5 = "df0ce39512e455f442268bf9f9c0c52e"; + sha256 = "1lkch9qhzlx8hpv6msvfa2nd7qqkx6xj86akxwgj1wbl10lbqv47"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64"; - md5 = "dfd64e3afb9c3eb4c2938bbf8288323a"; + sha256 = "0f4g04lrbyfjgcphv12zcmsvxa6krjk33kjn4lfdfq3440znvkig"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64"; - md5 = "09107ec941a6361acb73922f49905edf"; + sha256 = "11c6yh1kax9d5qp17znbvll41q953x4ymx5yvhkjx23z6ra8skbb"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64"; - md5 = "cf8ee2c9b5459dd229f2967ab28b7bba"; + sha256 = "0fhprxkv94sgyghcif81dzng5jwyrb6g1y8z78g0wrppjf0k2ixc"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64"; - md5 = "c418c00f009cdb7e4ed25a0fc4059a1e"; + sha256 = "0wbs15dy8zr45d1jqnky6kki6slv150hqlylglva5n0cs2ami0si"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64"; - md5 = "c06f25c1c69e78e0f0fe39f0e20ca796"; + sha256 = "1y6h2awv9h5h09xzhbfr9cd500928knx38ixc28q9v3r0xbw8i8k"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64"; - md5 = "760966200beff9f7c9ff0f4af224e65a"; + sha256 = "0ifmby85fzcazzlw36mliz8ylmbxdxxqbpibzlzn65dj3fmmkmhl"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e2f30b8aaf1cdc0bf7d234db9bbbf50e"; + sha256 = "09ia0zfb63wmr7a7hlgyn5dnq2dv78apkd834150pzbz83yr00vz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64"; - md5 = "d16c7873af0ffc0b370332ce1d562755"; + sha256 = "0r4yhw2h3clkscpxfg9vpl3x7sh89lxrqmddfvz2mwbqxs64i44q"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ea26ad6eef4b71fff944008f542eed5d"; + sha256 = "0fjms3ram2zjg4b6njwqj37dyfw9m39syhw78w0p5q97my4vcrs2"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { name = "libxcb1_1.10-2ubuntu1+srt4_amd64"; - md5 = "93dbb1e6d32178cc1a2e994b6d87d8d3"; + sha256 = "18d9armijpdncqv8crz969dgrana0cw6f81di0clqwhx3sgmm29v"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb1.deb"; }; } rec { name = "libxcomposite1_0.4.3-2build1+srt4_amd64"; - md5 = "e817d11de4660b9fd4a66db90cdc2588"; + sha256 = "0xiqwrgsz6dfa0pd9and19gyvmpha8x2sgh5hg3j6kn04cza8523"; url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcomposite1.deb"; }; } rec { name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64"; - md5 = "7055ec097c7ed9cc6497f111311b4f75"; + sha256 = "0zzj3j8k1ci94y3kydyia61crfw31qg4gqj10lih0m86ci5asyyw"; url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcursor1.deb"; }; } rec { name = "libxdamage1_1.1.3-2build1+srt4_amd64"; - md5 = "2b3f144fdbd30408c25379a7409ba045"; + sha256 = "12bb67z98j857wixl51bjg0mgq59zid69ng5lkdjwl5a7cqjgl0f"; url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdamage1.deb"; }; } rec { name = "libxdmcp6_1.1.0-4+srt4_amd64"; - md5 = "201844de38f2d957a5ced6a28d2c80cb"; + sha256 = "1sw99jdxdafl57y67nssd0ninmiycfgmd8vbi7q3rpp545vc878p"; url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdmcp6.deb"; }; } rec { name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; - md5 = "b6dcf651f5b9dda20fd39912bf03a4c3"; + sha256 = "0z9jhx6jplin6fzbj4v11aq3d1wqvy2rb2p3g952kymi9372mnr3"; url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxext6.deb"; }; } rec { name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; - md5 = "a80bcd458215e445daddf4cf0d625758"; + sha256 = "0531x9n6p5b9n8isjwmfnr8kmwxyjp81mxrdkmxf6v0k4j0y9sgg"; url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxfixes3.deb"; }; } rec { name = "libxft2_2.2.0-3ubuntu2+srt4_amd64"; - md5 = "de249fadd51c61b98bada7eb7cff8d29"; + sha256 = "1bipk6d6dw57pdcybbyhvszjad68qckg4i8s9hkn3kn89d2s46bc"; url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxft2.deb"; }; } rec { name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; - md5 = "f25d86e540477fe044c0294670b5f1b5"; + sha256 = "0m9h9k5qbqjiay4003v51vbbm9i24j7g3nx6q901csndjk5aq6ss"; url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxi6.deb"; }; } rec { name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64"; - md5 = "44dc2b8d96d4d3db048e358174500584"; + sha256 = "03dqvmdvcdraw0p483qrqv6xchr6a96vpmbbni6qcdak1gic2xkb"; url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxinerama1.deb"; }; } rec { name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64"; - md5 = "cca32ece7e930886fc2667e6f4849af5"; + sha256 = "0c5acgsr7as7afjwvl6qbqbgn3wpima2k55awgga6prvhzkas60p"; url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxml2.deb"; }; } rec { name = "libxmu6_1.1.0-3+srt4_amd64"; - md5 = "8f6657584a244c039bcfa24ad8934e75"; + sha256 = "1l08mkf2kwgskhzh9s43g5vcl4v1qphn68ila8g9gfw05gq7r0j1"; url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxmu6.deb"; }; } rec { name = "libxpm4_3.5.9-4+srt4_amd64"; - md5 = "807b3e86250c3640175da4980db87ab5"; + sha256 = "1z72sbc802sanhagf0w26hkk3yw0zdahw7dk89hjcgp57qmyyb08"; url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxpm4.deb"; }; } rec { name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; - md5 = "bde5d98946e1bfd60a42482339e29787"; + sha256 = "1yqfa0nllfqk9rnwj65nx8ni5xy4pn2nfasbkhzs8cfcyfd96y4x"; url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrandr2.deb"; }; } rec { name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; - md5 = "6781fa18b873dc95da21e82cc61609d6"; + sha256 = "06v7qfp10gfzx04znksc1mhx5a90za29hi90vinjrzccv096ak99"; url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrender1.deb"; }; } rec { name = "libxss1_1.2.1-2+srt4_amd64"; - md5 = "3d034c5c118d8794e2b76207c52a198e"; + sha256 = "0w0idnk6i94klavy80bv83pvkg2m8qvjaa9w641995r6drm9nag7"; url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxss1.deb"; }; } rec { name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64"; - md5 = "e4d13d933531f436c56e3245c94be638"; + sha256 = "1blcs2ngp6k5g87y10f2wgshr7m44943ks1ykpb59ss1w5j6cmx6"; url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxt6.deb"; }; } rec { name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64"; - md5 = "75a55367e5185eac420f89807e39faa2"; + sha256 = "0mff4swa68mldsv915hirllccybbgjn3i4j23bj4bf26hasr0m6x"; url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxtst6.deb"; }; } rec { name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64"; - md5 = "e8e91fa6a42cfce330883dc1286f3d78"; + sha256 = "0ahk7z05sshj649vanr2hvarwqp3aphqwbdzf3hjd5rb9cg061fm"; url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64"; - md5 = "d9d307b821b71b3cdd91cb8d2137c527"; + sha256 = "1sgjxdgx8fd780imrqwiwqlhwlmgrndam8km9visymcr431yjbnb"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64"; - md5 = "44a2bda05acf6d10aaad2216a69507db"; + sha256 = "12csbx3bzziygw2xa0w4d0i3gh7l2h1sc93npvsmqnjxs6qmwnnz"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zenity.deb"; }; } rec { name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64"; - md5 = "3370614dc8c2667679aefb4c1e4c07af"; + sha256 = "06l2s654sg4z16g2b1whrjkz2gwqd0mjgf9w3jzvwwdbprc71gmg"; url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zlib1g.deb"; }; } @@ -1753,1747 +1753,1747 @@ i386 = [ rec { name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386"; - md5 = "2ec67bae5e0c088d1ac13ba4eee194bf"; + sha256 = "0i6phg3gmiqx4in4ym5iv3l15x396d0gkrs57x5p7mw8ahb5fq7q"; url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { name = "freeglut3_2.6.0-1ubuntu3+srt4_i386"; - md5 = "8fc95adac306cc313523179824b43835"; + sha256 = "1vsm25lzylxf4mvqs5p171qrl8aspdi5rvlnpfhc35cx3vhkxg79"; url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "freeglut3.deb"; }; } rec { name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386"; - md5 = "499ec92726b0ce7115697d2553d0176d"; + sha256 = "1s7wvx23xnv3i3mw6a2pk9nr9s9wzpc99cr6rzgq3jxfmph78c4r"; url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386"; - md5 = "2c7feb2392d943f07c985d8cf83ed067"; + sha256 = "0rlhcsx8lvnmd6hx4iqh6z49jqxb2wlzl8n74qcbkx8vzg3jyffn"; url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines.deb"; }; } rec { name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386"; - md5 = "73bc5a4840f1ab72d715964721e97f75"; + sha256 = "1jkma0v5z7i7plamg49ljk0mhg3qf92k1disdj8yjjlgjf3d0isl"; url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - md5 = "cf294afff2a4d5893e48beb4d308f7b8"; + sha256 = "00p0qi47nnzlh31ajwalfh5kimsmdzjicgl5lnfg4viwb0r07vmd"; url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { name = "libacl1_2.2.51-5ubuntu1+srt6_i386"; - md5 = "b335451ab178fabccf1ea5d3fc3bf17e"; + sha256 = "188r323k4y6jvq64qywhglllxfbcpji15zvws1qlicv4nrjh2yk2"; url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libacl1.deb"; }; } rec { name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386"; - md5 = "e1998f1e6dfd34d993ae2cb1a2621c05"; + sha256 = "049qhih0dl0z13ag1kradvwydwz90pllwriwnyjx78726fvcsa56"; url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libappindicator1.deb"; }; } rec { name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "49228f60eedb525d344a8f756ac18df0"; + sha256 = "0gp2falswr4hfcrfj7avp1g216mf5sargqflwyxl6ixxy1yxp22w"; url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386"; - md5 = "b9712e5765c6dc66683e4c7f62090a71"; + sha256 = "0cy9s4wpnq2yd08shvip5mzg5a5mk76zmwyq68brqblaf1yqw907"; url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2.deb"; }; } rec { name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386"; - md5 = "eee45bd08e763a5e702707a87b2ee127"; + sha256 = "10qhsgcsabp0mrihssj7znw67kjfmw9kv2sbplpwl8bc52pxdz6z"; url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { name = "libasyncns0_0.8-4+srt4_i386"; - md5 = "59ed0cdc4eb0cae2355c368dbdd5103b"; + sha256 = "1h2fs8azxz9z2wa45igxwvfaarp50pqx26jznyrv35ayxhnzsg8w"; url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasyncns0.deb"; }; } rec { name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386"; - md5 = "7fbe2a86e8e8a547626b9dc42edd6c83"; + sha256 = "08sbk32cv4r0nmhp8ydbmjy8mcnsi4y2wjm606d1hrqqnvhlk1yi"; url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { name = "libattr1_2.4.46-5ubuntu1+srt4_i386"; - md5 = "cd9827abda30e1bf97c78a7d3dffc150"; + sha256 = "06ms0pfsb85y53l83fvs2zh39dqzh7bw0jh6zsf5wi9g47y2kzhd"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libattr1.deb"; }; } rec { name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386"; - md5 = "b62360b70b965c13c86536fbcd5c3dd2"; + sha256 = "0gsbwnc5s6hd412djs257fgy50ayjph5gg1jhmvgz0nf0wqqy60g"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-client3.deb"; }; } rec { name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386"; - md5 = "ef91c00328996a43243b7de90f60d145"; + sha256 = "0cfn660pngq7ackkcid410g8245grcs0izawwlmkhr6y19nma0jg"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-common3.deb"; }; } rec { name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "4787c81afc9a17c9b9f7700249d42e9d"; + sha256 = "0dz4d63whrhlsylvd1mqzz5v3xpwf88cgga8qr8vgf2vaz7ns0k1"; url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavcodec53.deb"; }; } rec { name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "396ec91c52c5f3bd22d53c6f9ec58836"; + sha256 = "1rxbm4n09q4brhklaa5hwzaipv3y34a3jphrc724s29dg178bb6y"; url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavfilter2.deb"; }; } rec { name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "a0b3c36045eaa4b93ec0c8db5999e95c"; + sha256 = "0f38h7h4m1g63jh9lsnq9win2k5zvg8i5khsadwb154y4iragm2f"; url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavformat53.deb"; }; } rec { name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "21589331257b33edf01f06f2cea89494"; + sha256 = "05lh422gvhl990yvlp4a0l3mfqn4n0l41fdaq4m4r5i23izcl3s0"; url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavutil51.deb"; }; } rec { name = "libbz2-1.0_1.0.6-1+srt4_i386"; - md5 = "6af7e943feae8691d7331c8e616ea402"; + sha256 = "1hh77sg2pan5qlvxg82my0h1dy53rxrgnl84bggn2kiz9i61ls2m"; url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386"; - md5 = "33c0e1be296288e7681d88d5775cd3c1"; + sha256 = "141rbp47gkvzfqzrwg4j80m1ay2l573p4q3x2ym5nxzw3f9jb00a"; url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcairo2.deb"; }; } rec { name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "53b3f4d615e0571aefec5ba4990c246d"; + sha256 = "1mfv3q731b0sjl2axc5qf1drp4dfwsmg2i0c222bs3ccvk9m7bcr"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "af77180b67e083ca1c7c16f125d773d8"; + sha256 = "0iddn7f56g1lajd1f0s77s06qwh5nk0iv2ai2r5rcanhq693k3jp"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "ffca46ec6dc8f075f3bd224ae0e4e535"; + sha256 = "0qpil9xifaq1kkmrga6v9sz4sl9dh78rp9kzm8p6c9hq2f4w5j4i"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra0.deb"; }; } rec { name = "libcap2_2.22-1ubuntu3+srt4_i386"; - md5 = "21af02a5fe56b6ec332eb0c6f1e1d187"; + sha256 = "0llaf4hgb4v66hwkc6ibrhpadhjxkiz3frl00f6yagm9g6z2yxvy"; url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcap2.deb"; }; } rec { name = "libcg_3.0.0016-0ubuntu1+srt4_i386"; - md5 = "5d8b9bd239ea094bc25041c7437a60d7"; + sha256 = "0ka9z2sq315xvdbqmbqg76j3wknfa88hk41jg94svnqf4fbawbrz"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcg.deb"; }; } rec { name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; - md5 = "a7450fa3b218cc993b252f7f51b4f83a"; + sha256 = "0d0zpm7qx1p4zpi5xk585hxfirn6i3v53r0br7dlaiqfy0divv5z"; url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcomerr2.deb"; }; } rec { name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386"; - md5 = "134c7e63ef61bb469ebc61c26309e42e"; + sha256 = "1l49h8v8dgi4n2j32012zzxkyqgg7b9z7d9lxijj0cqwwjq6fzpx"; url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcups2.deb"; }; } rec { name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - md5 = "b2dc62a422bf1ebc4014073664d38b3b"; + sha256 = "0z5qnjgmz9c917vm6r1m3856a10brdwx3d0k4qcv9vlv1gj1ln0j"; url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3.deb"; }; } rec { name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - md5 = "f95df746d4c7319e4cb83f082d39ab38"; + sha256 = "09bx2gxldswb63nql2b7x5mq55miaz7x5gbzscrc1kybnm0vvv75"; url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; - md5 = "36d5b7a27a90cc6069c14317c5b182e8"; + sha256 = "1lp548l33i3c7wavq9q0n9jhxm44mg0jlrgi89ngfm705141zw4f"; url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386"; - md5 = "4082582c368e35112478847ca5afad30"; + sha256 = "13dcsf3ipayvrzj1ksmxph31gk2zs3m0ghy5jh3aq648s5ql2jj9"; url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386"; - md5 = "593ce60da5a985932e8a43802e662237"; + sha256 = "14glmvc6923djpcn2a9kwhqm4myg1y9mp38n7gkby1wz6y63zvp5"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386"; - md5 = "1982414c7f72db3106ab8446596cdbb9"; + sha256 = "19ijz82wkk9z8w4yjp628hga6dsv7qr7x37kr8j8fq430gbl5y8s"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386"; - md5 = "eb203ec5c79ed77e053efaa1bc8d65d4"; + sha256 = "1dh1idpqqh66l2awfim17vk94238wb073d3xj74ci8gxfp0rxkvr"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexif12.deb"; }; } rec { name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; - md5 = "44b8336cf9a2340a693528f2ebe19da2"; + sha256 = "0wv8iym5bhwlvnsljxfjwhl8z39wh5nba6li1i7nnzqj365hmdc4"; url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexpat1.deb"; }; } rec { name = "libffi6_3.0.11~rc1-5+srt4_i386"; - md5 = "4a07d2ad9dc8e67ad6edaccad85170ae"; + sha256 = "1064kf252d1v8asi59m67bz7zg2k7fmgkqzbib872yb6qyrgj7p2"; url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libffi6.deb"; }; } rec { name = "libflac8_1.2.1-6+srt4_i386"; - md5 = "543202e74de54764bd9ca25548d4bd86"; + sha256 = "17hb02f5yapkfkasamx6whxm76p1gpjrz7nq7i59zv0lfxwgjry7"; url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libflac8.deb"; }; } rec { name = "libfltk1.1_1.1.10-10+srt4_i386"; - md5 = "8be404e25f342918fb99b40320f8bc4c"; + sha256 = "1vz2b02asscpr155v516zclawfi28m4yxf1ya33848ydg067iz35"; url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfltk1.1.deb"; }; } rec { name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386"; - md5 = "57d781f78fc1c75d947208e09a58a39b"; + sha256 = "1dm12wk4pj2h4y0ykyvv9fs6s0vix1iy3hkvz2fvqx8wdb8710n6"; url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfontconfig1.deb"; }; } rec { name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; - md5 = "2b1dd9e53e6a94443e9959de83d8621f"; + sha256 = "0661g4ghhynz49kkbr5kds1ms8prqmpm5rz0qv3c7cf62a2lb3x1"; url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfreetype6.deb"; }; } rec { name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "61f4822f145d812c453b2fc5d71f5eae"; + sha256 = "19qracxc45irfmsbcn668zwdxx37avp1igj1z4c6xq8bmp6w685d"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcc1.deb"; }; } rec { name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386"; - md5 = "1c0863073b6fdbdbe5ff911ed3cc781d"; + sha256 = "1srwysvh165hwiqxyl0aac3j39zzg2v4g3alix51cbvc4s6yzhy3"; url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386"; - md5 = "a77e997aabfde09c5cdf4b5f5d8e305f"; + sha256 = "1cg2kps7cfmildp9hlijxsj7bc2j71xal6bm57ldz2vjcv6k06hl"; url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcrypt11.deb"; }; } rec { name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386"; - md5 = "9108b1542d78b682f141c3b488f33821"; + sha256 = "1n5pyqw2v87xw32lj73aywhfgcmnzi2wvxxw2gqv52d56vzj254s"; url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { name = "libglew1.10_1.10.0-3+srt4_i386"; - md5 = "cbd2c842295be412d25bf35ad4329c7a"; + sha256 = "1aswani1ymq52jyr4yhw4vi42gzw6xqk5ygh1d7zycakgrfs179b"; url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.10.deb"; }; } rec { name = "libglew1.6_1.6.0-4+srt4_i386"; - md5 = "36344ae65699fdfac8d169c54f45dabf"; + sha256 = "0yxnfi8arnp3cphxdviyqslw7nxnd1mx11v9i5i2xnl907iyaxpq"; url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.6.deb"; }; } rec { name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386"; - md5 = "2bb8b70952f8f6d724700e72db8bbef8"; + sha256 = "1lmxm2gfz0mkjafpw8f98y73f0lj5m5nfdarqlpbb8dqbmpabwvk"; url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386"; - md5 = "bbdb5055ac6164380a6c344bdca59a74"; + sha256 = "11sdfs3zphb8ks2cpb646z4vza6s4zpbfgaq99drn5z9b8d109zi"; url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386"; - md5 = "669fcbbac0ba7510cb5df1ed7a4b58a8"; + sha256 = "1f6ss23vybyqkifjr9nam0y6va34m2vdpaxbwjmwi2z4wwj7pn9k"; url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgmp10.deb"; }; } rec { name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386"; - md5 = "360d15ec7d327371bcb69a8b51b1e556"; + sha256 = "0580r5n6z9s147q4bkkm75a2pwb1ganz9msbp440rwwh6xahrh56"; url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgnutls26.deb"; }; } rec { name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "d52479b3e735785256c8b6ba2a278ed3"; + sha256 = "04mywbz2lmxap8nq1rvj7aggkrvrgfz4869q41f0d6dnsmnbsj5k"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgomp1.deb"; }; } rec { name = "libgpg-error0_1.10-2ubuntu1+srt4_i386"; - md5 = "8cda79074a80e9c079251962c86cc5cf"; + sha256 = "0hjfgcmrjr02xk788chyafg7j8viwmp2vrqyfjdjf79kvpy0354s"; url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgpg-error0.deb"; }; } rec { name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "bba863478cbafe60780618b9e2e3ba39"; + sha256 = "06sqdxf38qm6cd76gdir6m9rvbg4xv70jhh36zshxxhi50lhpjcx"; url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "1160d5fb86160631a7e699d66f1d6805"; + sha256 = "015jb2j56ia3zvfmjlx72yjlvfv8z8bg0ff4z5nh1d25cambqcbs"; url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386"; - md5 = "b3e0cb34c2b21fb68fe4fbde8ae640a7"; + sha256 = "14z4v2j7lc5xnzbfpf8b3b5qg0d2yg917v4ighxy2nydf2zy0mrs"; url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386"; - md5 = "633c94c28db5caa2001fce91ca6a726f"; + sha256 = "06lp4ajhnczb5salf6njgi1q24zv3yrkqhgvbyq45dvsax76kafj"; url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - md5 = "a903c62e138ca58cc32aa7412ec4a3ec"; + sha256 = "0qhvr5pyjj0vh2c1658gmx9r7h194py8qbcx69qfca2czp9hhacs"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - md5 = "5a2f731bdac2bd089780af2f63635f7b"; + sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386"; - md5 = "a120c25c89a1136ef0daa25644387d26"; + sha256 = "0z8ncxaqxna0ihlp19i7b59k9vbkynak49kim821rwxsxvjqsfcd"; url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "14714cd92839ae0a1716929840bd340f"; + sha256 = "195yrcwrw8bnai5kkvhdq7nnjv643af5dyc97qcnfnvnvs20az42"; url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "9be4a5f3f6735aa3b9153c8cb5ba4ff9"; + sha256 = "0g2dml08mw4yy9llnn2149x1niy97mqbz56rphw3g3zv5nivnbp3"; url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "363aac3460da3724144165325f29f52a"; + sha256 = "0dbs4gxbfdhn2sbzfny75fzxiab9k8l1vd3vm7i4zfkbkx3lbr2x"; url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "5591041cf73d1593730ff40428b407dc"; + sha256 = "01z9qr5r7n7vfkkb95apmkcc35va43qxsf0nzxff8x1ll82l3n7a"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { name = "libice6_1.0.7-2build1+srt4_i386"; - md5 = "ed56f05e4b1fcf06189374a60aa740eb"; + sha256 = "1gmykmbbxk9590snli45dcvj00v77xn2za8v8193v020qa8hvmik"; url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libice6.deb"; }; } rec { name = "libidn11_1.23-2+steamrt1+srt4_i386"; - md5 = "79c6f01961c13e74d48978fe94aecce3"; + sha256 = "1xmv6kqn3zpnls7nyqd2bjqzc03y4w2gp0xmq6l8wwi659dkr4vz"; url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libidn11.deb"; }; } rec { name = "libindicator7_0.5.0-0ubuntu1+srt4_i386"; - md5 = "a365d22a80311e9875bde88c9b7b5146"; + sha256 = "0j1v3ljb01wyy5v8a5ad8ar9wmx2hf6qd50k7cl95si60zs79bk6"; url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libindicator7.deb"; }; } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386"; - md5 = "c0e59176b50a2da0ec61d48902014ce5"; + sha256 = "06gz25p9qm0lbxaqzag2y2lhc0wx9cnkxz7zdm2yfdcx1y4vbymx"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386"; - md5 = "83c82f7924110b659b8786b54ca6fb27"; + sha256 = "1m1986mn0ad5basd8hlby4d6jxpps4v0ib2g2pwqxdlil39gmar5"; url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386"; - md5 = "5084441d1da0b2d77de32cfadc21ee5f"; + sha256 = "1fjbscq7qp895z5g5aw5l98rfj0qpr66rl5r4m0f1ilrjn83i96y"; url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg62.deb"; }; } rec { name = "libjson0_0.9-1ubuntu1.1+srt2_i386"; - md5 = "358ed87729682d1d5a44b04a99f9cca8"; + sha256 = "0nlhsclyxqa1s05hnzid6j8h0986v9viv6dysg22bc16gfdg9i1j"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjson0.deb"; }; } rec { name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "09e0b933d71e0b842906f22334845104"; + sha256 = "0h2iv7p0w5ydd9nqfwmm4avjhcnki7nl000gpsdnrpfjrbv4rnlb"; url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libk5crypto3.deb"; }; } rec { name = "libkeyutils1_1.5.2-2+srt4_i386"; - md5 = "77b6a1fdfe5d2976650e882df68f1bb7"; + sha256 = "1v9b3dg1s3ykj5abi4y2392m12dw2n7zrays6sv1n2dw46f2lj4k"; url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkeyutils1.deb"; }; } rec { name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "94eb595546d5b421504c6df661d29975"; + sha256 = "0h4mnxfsf8j12g33lca2nlrcma9d8gdchxckzr916yp4snzjk0bb"; url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "4efd6dd3da5e989b7aaf990cb5dae9a4"; + sha256 = "1ay1g283y3y6czm56r7wiibarwv267bg707ncaq4m7a9bxa0fmy2"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-3.deb"; }; } rec { name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "ce8372e9411aa5d734ef44773820cd3b"; + sha256 = "031qjg6aajyrdj7ny9dl2v6p9syyngqfrdy277351814zcclhm1l"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5support0.deb"; }; } rec { name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386"; - md5 = "aea8d6beda7f992becfdbb3880b5b3c6"; + sha256 = "03ix9r3mxvgq5i5qv7zhjmmg8bki8gvgg4n8r79az5zbp4nxmi4f"; url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liblcms2-2.deb"; }; } rec { name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386"; - md5 = "770471a9c33a9b708427dfa5d8b944b4"; + sha256 = "0aycpf6xkr4fxr72np52jg6y384sy5b2r68kmmnzixqifykgc7jx"; url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { name = "libltdl7_2.4.2-1ubuntu1+srt4_i386"; - md5 = "ab9d4dabd065bcc31430d839a04a5844"; + sha256 = "1kjphpfqjr5zsa1z1zq4dibxwhm5861vardc3xic4izqf05vd6nj"; url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libltdl7.deb"; }; } rec { name = "libmikmod2_3.1.12-2+srt4_i386"; - md5 = "fb5286eb01a90318bb95bdd671c6c512"; + sha256 = "1rm18888n955wgh75srgrfhm0zgxz0n5sr030zc4lpp3bx4x2pfd"; url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libmikmod2.deb"; }; } rec { name = "libncurses5_5.9-4+srt4_i386"; - md5 = "f3343e67c571b9f279ca0f9ce27f8981"; + sha256 = "1lc9s9rapyq6ld0xzlagqi5ah07gh59lixg0sh4xxm4sz75z6h21"; url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncurses5.deb"; }; } rec { name = "libncursesw5_5.9-4+srt4_i386"; - md5 = "aa693feffb52a101beda0d578de71db3"; + sha256 = "1j5r17ph0z43npv4nh5xgz0fdw9magas5ryr6qpi2pcqf5x9pp9r"; url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncursesw5.deb"; }; } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - md5 = "361fba889b4a4fb66c7fc59f7e837f6e"; + sha256 = "1jr5nysd947lvk39ki1lx1y8csyaw10vlm9db7djrn20b1a6dsns"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-glib4.deb"; }; } rec { name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - md5 = "39d620f28e9ecee9dc25e7ac4e679a81"; + sha256 = "01gf2wf722mc28hyfh3g45p2qq0v04nrhkhz96xd8mwa7jdx0cb9"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-util2.deb"; }; } rec { name = "libnotify4_0.7.5-1+srt4_i386"; - md5 = "a4207e3d76879a94430cb641fe2001be"; + sha256 = "00nfvgckkdfal6qfbj4hcp5jc0rs57ksl48ciy87v46inxgp67z5"; url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnotify4.deb"; }; } rec { name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386"; - md5 = "6d15e2401761ea09428c7170381a3ff3"; + sha256 = "00di7dw9a124ahc04m1rs8w3mdx1kpjhf696zvgxprn8qrwwp84n"; url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnspr4.deb"; }; } rec { name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386"; - md5 = "bc611346e46985b47d0cf7fe0464e4af"; + sha256 = "1n46ln69sny735q75sn8g7sp23ahdav277bp0d0bl62k11xa3fnm"; url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnss3.deb"; }; } rec { name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386"; - md5 = "bc3afb09d1ea93764c808c7a268c1cd2"; + sha256 = "0bnsrk44pwzwjs7yw44kzbr5b10kq3jsvrskzxxr2sv12ljhxmrj"; url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libogg0.deb"; }; } rec { name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386"; - md5 = "2548d953611d999a85463581df4efac5"; + sha256 = "18g56z1s8yyxhklqmpy6l22zcbzkvws26v6b1xgg4w3k33hbcjng"; url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libopenal1.deb"; }; } rec { name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386"; - md5 = "d2cd63e1f984b45561128d7d4d67bd06"; + sha256 = "0yfqakir28jnn873xxqdickf54mnlpp25946fi1malvxadjcqjll"; url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { name = "libp11-kit0_0.12-2ubuntu1+srt4_i386"; - md5 = "e5dacb77c07e97db660bc5312387a9d6"; + sha256 = "1f97dfd0z1fzk1l4zphdabxq7q02pdql03ifc265chzq4zpaghbh"; url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libp11-kit0.deb"; }; } rec { name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386"; - md5 = "dbc50fdd82e6df45bb9bb8ce18f1fe2c"; + sha256 = "0xda2k934wpfq01lrc9yw6fy6bispnfyyp5k0iszzh8awfjghrjj"; url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { name = "libpci3_3.1.8-2ubuntu5+srt4_i386"; - md5 = "cdf2a41b3ba93c2061f196920420b99d"; + sha256 = "1zi4g80r8cgy4zawdddfkklp6q98xm3qlad1a27rfw6zlg66a028"; url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpci3.deb"; }; } rec { name = "libpcre3_8.12-4+srt4_i386"; - md5 = "d4134108e9b21b6e623eafeaaa84e37f"; + sha256 = "1v1jj9vwsd6k0f6l9a72pbx3idlnjs32zxd1gci2fanma7fsp4vj"; url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcre3.deb"; }; } rec { name = "libpcrecpp0_8.12-4+srt4_i386"; - md5 = "e1bd40c3840669cbfb0b12e6dd07629d"; + sha256 = "01qklrzg9mprb45mn0bj9r5p5d3lmrz0mhiqwjxg07w533gycyr6"; url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; - md5 = "630fa4416398e12dfae1816acdac1d89"; + sha256 = "004abdax9r66z0a359rik8dqc9bsx177m8z5ygjsh40yv7fjgc9g"; url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386"; - md5 = "978502e6116df1c98dd985dd07bc1022"; + sha256 = "0ahap0mzqdl51ia615j09yaawi36khv9bj9z5bd0wspfyjls0a74"; url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpng12-0.deb"; }; } rec { name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386"; - md5 = "4591d057af7dc6709d1960c5ce590560"; + sha256 = "1gwsfmr80r59y7ic21shbflf505wl0izsm1mvld3yif80vfz4hdn"; url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpulse0.deb"; }; } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "cc8d8e5b7a4e002de9e86633b2c53804"; + sha256 = "0lfzgjyp4gxs6ns3v0xx82gpr784b7rwnhh37njq9zmhaq7mxpn6"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386"; - md5 = "3ccb52ce883b4c1885857c80cbd11e56"; + sha256 = "0x6dkzfc9bdcjr0sq6dl0vk0sjjm9pwp4hb2m8wjynykpinbzbxi"; url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "librtmp0.deb"; }; } rec { name = "libsamplerate0_0.1.8-4+srt4_i386"; - md5 = "e218128429da602e392c047940b62a23"; + sha256 = "10dm5k8c6f8q6vgk0ab52kvikbrgiflbmkflbix42rm5l44bz8hd"; url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsamplerate0.deb"; }; } rec { name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386"; - md5 = "963632ad4d1477ef230dc4c68dc7ffa2"; + sha256 = "19pkr848bjg2zg43z2l5npx97ydx4jgf7c5n33ckj6wbgxvzbn1s"; url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsasl2-2.deb"; }; } rec { name = "libsdl-image1.2_1.2.10-3+srt4_i386"; - md5 = "1adfd99b505fe3ff6fd08a2919277780"; + sha256 = "1d3m36a58iwpykc442axj4bd6s4h7f9qq269qfv07i6cyfp2j87l"; url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386"; - md5 = "8687aaa0fb6981d674ade4062884ff52"; + sha256 = "0wij7i9d5g9bbjq4xrvrbzqcsdpjn6dhj1pjn997lpgxsfwyl0nd"; url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386"; - md5 = "887ac0bbaa344b203d9effdd32dd072a"; + sha256 = "1ih95dgbaksgj12x6p7528hywm4zqalv0zyg7k5mp3yfgdxi37xr"; url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386"; - md5 = "7b4319a41a9dcb24aab37be255579ce7"; + sha256 = "1qsmhdzs2rr13vgagma0yn39x4njx2gixw82l3zmp6b0rp8x0ff9"; url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { name = "libsdl2_2.0.4+steamrt2+srt1_i386"; - md5 = "e56c66c0719d067589f7f13e01815274"; + sha256 = "1xxj20q6kv4n8g1d1f5pbg1qaqdaq4nigqi2sq4lzmnvzkm8nj91"; url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2.deb"; }; } rec { name = "libsdl2-image_2.0.1+steamrt2+srt1_i386"; - md5 = "076b0df6aff11c3a828eb5978be1ff66"; + sha256 = "0s7gyc3d0acddzipc4pc89k5cdyjl8ik7pk1znrq0292rnmnwbk4"; url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-image.deb"; }; } rec { name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386"; - md5 = "1883cd445c1e5d3ad12bbb7f8d1932cc"; + sha256 = "0hqqxqnh8pyvaqhb9rhk20qnf4plrmh3w0n80sfzcn1vjrdcg8mr"; url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { name = "libsdl2-net_2.0.1+srt1_i386"; - md5 = "f97097f7e4594a691f7e866e1f4bd6d4"; + sha256 = "14cn8v8bnllkbj88qy2chlj44m4qrdd6h1x705plwy10qma18iln"; url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-net.deb"; }; } rec { name = "libsdl2-ttf_2.0.14+srt1_i386"; - md5 = "6b4c6e4c15de54d5222da1ccab849b69"; + sha256 = "06r8vsji64dcswd7mwy9yyacp6pkza8lsa3dwz07yqyb49md9xrv"; url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386"; - md5 = "f96dd8143f7f3bb2600d761f5fb6e854"; + sha256 = "19vfb4zlpv25x5428zfm5mkwqgdc229mc3saq32pas3b2faxfan7"; url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libselinux1.deb"; }; } rec { name = "libsm6_1.2.0-2build1+srt4_i386"; - md5 = "fcdebe0131ecd0b0777e52b06ad99055"; + sha256 = "0c1rca5w1m1cqi2a5g9k7zpvkvky6da9hkfg1ar5c8xw4ilw304j"; url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsm6.deb"; }; } rec { name = "libsndfile1_1.0.25-4+srt4_i386"; - md5 = "0a2518a2d66430e20d660883c71b84a2"; + sha256 = "0pbb7yv86am1x1fd2s15s7ybyz3q1xjlxij8in9dal1bkpj6yhsj"; url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsndfile1.deb"; }; } rec { name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386"; - md5 = "f34f05ac30f3c11bde9b20cdc219c676"; + sha256 = "1n2146dh1famhl58i1s4cdp0gyfz89w8vj5msh8hsdjjr8csa83s"; url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeex1.deb"; }; } rec { name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386"; - md5 = "239a3b273c387ca41ecff1e371b90d41"; + sha256 = "0gk0b28d9f7zya9vbmg1kj5xm3k3339ky2n16id3w6aks7lc5y8w"; url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; - md5 = "6653a03901b263af6fce56e6c394e9b3"; + sha256 = "160pzj7hmqm5hkixj002q81gcqybkv7xn8z8746dw7h90cvlyvrh"; url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386"; - md5 = "abed18b597fc44363a47caf1f4d760c4"; + sha256 = "142c6vwq852mra2i2jp802wfsprd5jia80xn09ms0rxxa1aa7xsk"; url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "76c7adc814605b316426ef1d9ffab195"; + sha256 = "187nknssd0x7r0qsw71f3d06pvwbkqanajah4f7a01xk3hc8cxh1"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6.deb"; }; } rec { name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386"; - md5 = "2a5142925aeb5054395edd56112e83a9"; + sha256 = "1j2wsczzlh5jpqyr8k6j72107kmhxa3hdiqm0s648i0fyrks54wp"; url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "facd5280993d266f3f1f1809138e6cd2"; + sha256 = "0x3xbbzf643mia8cx9py8vrn9d8c5njxh7x233ylmh8lybac9z5x"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libswscale2.deb"; }; } rec { name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; - md5 = "c24dd57cc16746dbead2fbfa571f978a"; + sha256 = "050w4qc87h9kvniknk62jxpx2i40pl8djbmzbhj2w2lmjbzr7g83"; url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtasn1-3.deb"; }; } rec { name = "libtbb2_4.0+r233-1+srt4_i386"; - md5 = "99dd92dba5e3f93e0e349ee9f3ebe22a"; + sha256 = "1ava8m0iv62cb1gi28l486nibd981lsnjbx08b7cg7dd8hjw5lnj"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtbb2.deb"; }; } rec { name = "libtdb1_1.2.9-4+srt4_i386"; - md5 = "8d165fc985106bb4b3df301bda4a8c22"; + sha256 = "17q687bsc7v2jkcvp1y85mnzdq8kdxwlvxib0h5i6v6qvwrj01hn"; url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtdb1.deb"; }; } rec { name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386"; - md5 = "966fee9cbc71519350a2730e34a1d8e6"; + sha256 = "0viaqm59q9qbj23s5b4s4mq99imyfv799b6ph78cz2yi6l94qvqx"; url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtheora0.deb"; }; } rec { name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; - md5 = "8374a1fc7909c42faa5ee585eb967b20"; + sha256 = "1zyggf4hp7xxd7jn2rahg27vxk1pxpwcvjlrmc3lnp4d2krnf0pq"; url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtiff4.deb"; }; } rec { name = "libtinfo5_5.9-4+srt4_i386"; - md5 = "9c5ab1104d91b8bd6cd2fd21c06eb9ee"; + sha256 = "0iy5lalmyr9lv8vm7mc5zdis70ir3x82aav798s4dvwmhzw7a45a"; url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtinfo5.deb"; }; } rec { name = "libudev0_175-0ubuntu9.2+srt4_i386"; - md5 = "f2dfa9304cacc609abce0c85f984b48f"; + sha256 = "1wxkfv34nqch3zi4hyshmwbg9s33q7inlz8zl396p22m1q5m5sfx"; url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libudev0.deb"; }; } rec { name = "libusb-1.0-0_1.0.19-1+srt1_i386"; - md5 = "f4328e5fa069f3b43d301992719b2d8e"; + sha256 = "0mmn9l99i595l4fd446jjyh301airh17wbc4wfiigsmz4b4mylb0"; url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { name = "libuuid1_2.20.1-1ubuntu3+srt4_i386"; - md5 = "d5ef9ef9c92b5b7edfd2bac2853d00ad"; + sha256 = "1hcrpngalirqbzqfn209akkizqnm4qpkhp42mcys78xx0i0p5kxr"; url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libuuid1.deb"; }; } rec { name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "6ef48bb25671111d17d696ff4db2c684"; + sha256 = "0g7vra6wlgrvpn1cqx1xnckfxn7r2lzh8bk2gs32cdxc4qy7w22r"; url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-glx1.deb"; }; } rec { name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "90e2e7271ca563cd66993ea4652018c3"; + sha256 = "0m5p4ciafgdvm4a29z07bcy8gx5n9vr634bwg1x2fj8z5w1y2bnx"; url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-x11-1.deb"; }; } rec { name = "libva1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "dfc1877ecc94d01b4cdae6b527bee3a9"; + sha256 = "1k44nikbgll3zh94p0zgnajjwkaxc0lzc1ss24frq1pzj76jgg54"; url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva1.deb"; }; } rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; - md5 = "61cd2560476f54dc11b3e859e104daec"; + sha256 = "0yya462g7ar6k54bb8aw9qw6zcnzqlzrqjni9w77pm5vbiy1r0yp"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvdpau1.deb"; }; } rec { name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386"; - md5 = "03077bd7302ea56045c0548c6b2cb983"; + sha256 = "0s2m9sa8gyqk56icsb8y65fhfnmbay56a8gy8znz690l8aq6fcvl"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbis0a.deb"; }; } rec { name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386"; - md5 = "6efe364cedbc437ddb1446cb846ad532"; + sha256 = "1848325zzklbdc03a738jvs0jpgypjd11sw80qv47i73zmc0wnfz"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386"; - md5 = "7521e4dcb5378621ee56ea860f0f00ca"; + sha256 = "0p63wgif2h9q6pd61mfpl63qa1m12344d5nkrd6daq47hmldfibw"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { name = "libvpx1_1.0.0-1+srt4_i386"; - md5 = "97cc2ca1fd5a0e8134d33884fbd8decd"; + sha256 = "1dkpqaaclks24kw4wdbzfnkdbsf4yz3j8ygfl6w0y3w2sxwcxldl"; url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvpx1.deb"; }; } rec { name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386"; - md5 = "de2c787fcc443fb989b1862367a2e0c7"; + sha256 = "1fir2kw66z14pfs6zqa5i620c9rli075dk9mj9802d723hr78ylh"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvulkan1.deb"; }; } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "6265aab9d541aea8aad3496ebcc5908e"; + sha256 = "06vhdm7d6h7cihk97v5bf2b8mb5z1ncca1yfahcxmgykm0amq89w"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { name = "libwrap0_7.6.q-21+srt4_i386"; - md5 = "a0ac6fa38ef4664b1dc1e3255788852c"; + sha256 = "07qszw3j351x9vwz5q6qvzanp291xn27zif1ir5khdwidr5lb58b"; url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwrap0.deb"; }; } rec { name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - md5 = "cc208840d2883eec6f9770b623c24b9d"; + sha256 = "0wsr47fjfvjxz0ks07va0mqs8d6b8prll5512hvivj6hf6x8cngm"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-6.deb"; }; } rec { name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - md5 = "c012bbc8654c3c012dc7b5901c486f4d"; + sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-data.deb"; }; } rec { name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - md5 = "2ef2ffe569708f8433cfb36e754526ec"; + sha256 = "11fhyqvfbs0jf71cnmld09q23abvnrzgp20zabrvi2r5vk0ai6f9"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { name = "libxau6_1.0.6-4+srt4_i386"; - md5 = "9274a9813575848a1646d67b44e10bac"; + sha256 = "0pw507i7nfr1zqjf8ysjzqgml053bwlac2jxv78b2rp3l3xky4sp"; url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxau6.deb"; }; } rec { name = "libxaw7_1.0.9-3ubuntu1+srt4_i386"; - md5 = "70fa4b78b06a4d4b194cfb6baf1cdef1"; + sha256 = "172kg32mck6v60cy7bxb3wpmhn09jay6lg0mghb65f57bkqb539v"; url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxaw7.deb"; }; } rec { name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386"; - md5 = "a72a94bc35581c25ef827023f643489d"; + sha256 = "0m28k3pwgscxzbp4vhrncv12l0940s22qc8lrgzb0vi5ha4vb1zk"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386"; - md5 = "50f4656bbcb193c3a3047c45db06a4f7"; + sha256 = "0z180s301vq0bpnv18hqad3n5hsipv6svjgiwacq9c4srryn22af"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - md5 = "d4fd2c66b60ff1db1c87e6884d5ae093"; + sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-doc.deb"; }; } rec { name = "libxcb-dpms0_1.10-2ubuntu1+srt4_i386"; - md5 = "f805af07ee88d28de1fd06209aa42fc8"; + sha256 = "1k66jz8ms3mwbmkfdg9xb9wn77igwrkhjrvg6lw847c2f5rrxwp7"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386"; - md5 = "85812dd4c61ff7d99060c495f4d17669"; + sha256 = "00r0pcda8hc7sq1nj93621p55743dys424fi3n26hdmdky9j0rks"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386"; - md5 = "70e2618de627e6e8308e4afda77b0966"; + sha256 = "0lgg6b8sxd6s22vn7vwiyb9vz39v124y9w74g6krxqmfvbkfva2x"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386"; - md5 = "850f3cb9ed1d79a9bdec55960a74611c"; + sha256 = "142f73f4mkvad2l238kyf0xl4kwzgcpcww33ah3rx4qjz7q3ails"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { name = "libxcb-present0_1.10-2ubuntu1+srt4_i386"; - md5 = "e86ec58c992441124622921b38685d01"; + sha256 = "0rlnxwazwrp7kpgh6d6dbfzk5cjvlqp31qxgifd4b8fryjnan91f"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-present0.deb"; }; } rec { name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386"; - md5 = "4acaa6b473aba1684731f529506e2ff8"; + sha256 = "0qg20vdidpbl6jar9w4n65jfmg907fkqrk2nwh6qj0l3xd90pm61"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { name = "libxcb-record0_1.10-2ubuntu1+srt4_i386"; - md5 = "1e28443a65256cd013b2dc0c937badcd"; + sha256 = "1kyjdazkvykcg76yp3gyy2pgj07nwbjld7q0ci96q1zka3a3m4sz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-record0.deb"; }; } rec { name = "libxcb-render0_1.10-2ubuntu1+srt4_i386"; - md5 = "b6362e8ca7da70c873c08e9849ac79ca"; + sha256 = "1r77z60hz0bblg07szl6yir6ll697w0w1y37bd66wv9n4cdlijqd"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-render0.deb"; }; } rec { name = "libxcb-res0_1.10-2ubuntu1+srt4_i386"; - md5 = "1bd0d0e0f5134651c350ba4955463b02"; + sha256 = "1xnnyczipj30kzkyrwngkra2m3xc8jchzd88a3afgy4m6cy6qyyy"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-res0.deb"; }; } rec { name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386"; - md5 = "8b51441ce72d20a788a8e12149ea2cf8"; + sha256 = "155m47mnjbn9b5p895syyfxk9pk1sh76qj614k554rf77nwdx8rq"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386"; - md5 = "470deea0b247279c51c2c76265263980"; + sha256 = "0wm9mm8xyh70zdc7iz8j3y89n2c5yhd72kq68nbxqpnwrz3kyzcz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386"; - md5 = "abb2fe37023253653d404dd6116829a0"; + sha256 = "0ifvwv0jq4crsgzfpbssa4p9r1jk7mck4wlpfq5j11aiijyw5fq6"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386"; - md5 = "3bf95ebc0bd67e4200f754b7282c4608"; + sha256 = "0wsf356qiv9frxky8c503bb7nsksrgn9zii7h2yp7v5wsxpi20p5"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386"; - md5 = "e0a5eda95251b20499a85f4bcec888a5"; + sha256 = "1qynissbyb4ihyyy61nhlm4nqsm5akyfkdfyw38id6qiyh1hnml9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386"; - md5 = "1b227b824b6270407594b25b2dc12769"; + sha256 = "013mhdbavmaqvw99k52p45lzfri1fhyclg6hdzb3xgswzilq1wn4"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386"; - md5 = "c0170a7d5ae40f1c0a4b4680991bc4ff"; + sha256 = "0szrbzqjks1g77x572r3dvkv791k1c8lckcgk6a7wl4pygsksd3m"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386"; - md5 = "4de2e06a592ac634b109affebc31fb07"; + sha256 = "0h01rmw1h93xd1vhz06v7ckjzy89ingi6c6b2sl6sxdd7ii9fkni"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386"; - md5 = "2e154033ce7657e58f3a8e18d35ff5e3"; + sha256 = "07yq1khdrisvgkpbvl39kq1f3kwaqxvyn6jfcib2lcg6w5cbk9n8"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386"; - md5 = "ca610d0695befd4442145e037f6a6f94"; + sha256 = "13dxk56nga9imkx07fb1s4fmgki0dnhcbb41pzr1r0ybxg6crnk9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386"; - md5 = "813f01d8e7012bd8f58df239c2df47b0"; + sha256 = "11ajwd0456dr4nwhkib31zwgk7xpyzir86pvjrgpydnh6yj3dic0"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386"; - md5 = "1ccea01cd8c2549e5cb5b13b90d986d6"; + sha256 = "0xkj414c0svlndqck1ghddc424a7mpxwaw44sdjw25iwsidzqi7i"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386"; - md5 = "4cbe887cb4ed19e79970ea076cc171c8"; + sha256 = "109bkl63vbsmhflqw3ivjdas96jamq5jjh67rf4lvpgxnlscxsgw"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { name = "libxcb1_1.10-2ubuntu1+srt4_i386"; - md5 = "5fcdea3958e6f0d60b841ecec606c3c0"; + sha256 = "1n3ppygmfjy4hwgi4lq2xlm1ldlp47g67ksafbs3zd06a7lyq2rb"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb1.deb"; }; } rec { name = "libxcomposite1_0.4.3-2build1+srt4_i386"; - md5 = "dce0aac7322e5d9e7d74ca464c5db1f5"; + sha256 = "1ga6g4mdz02p4m6l3q7fa8404243qhqfrvvcwinbm9hj8fyshliz"; url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcomposite1.deb"; }; } rec { name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386"; - md5 = "97a5238d1048e8b005d535b14720039e"; + sha256 = "0nalkn0hql9v13b48685jrlcx607n5bn6gk5vmhbq0zpcs2ww709"; url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcursor1.deb"; }; } rec { name = "libxdamage1_1.1.3-2build1+srt4_i386"; - md5 = "3d1d3d865c89c97e5cf980df806966ec"; + sha256 = "0qysvz8hwcra2kr8sd9iyk1x73wawfnhsq5yspjphq08kg2k5gmq"; url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdamage1.deb"; }; } rec { name = "libxdmcp6_1.1.0-4+srt4_i386"; - md5 = "eeefcc12cc694b069acec7937e4a6650"; + sha256 = "0hxixf0y2l3wc6flfg2gwlfc3fp40rg570lwkr0r6hwj1z0zwyf8"; url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdmcp6.deb"; }; } rec { name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; - md5 = "7f18f7c6fb6bca8a033e243ca4222057"; + sha256 = "0s6jc1zw6n2m3bmis62pr3mkzd64migzrj5wcl9hmq5yrnc46shs"; url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxext6.deb"; }; } rec { name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; - md5 = "25d8be35a5e5a6bac479d4bdce8dceba"; + sha256 = "0y5fb7nrnydlxbflhxqw065qz337m2i87sdn4730pd8y693sinyz"; url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxfixes3.deb"; }; } rec { name = "libxft2_2.2.0-3ubuntu2+srt4_i386"; - md5 = "44bf95c720b8634f0ea8419fa939f71e"; + sha256 = "087wclc31napmxc7l09gc73dgjczdkcyrld6zdcq6jq8jm1aq4vk"; url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxft2.deb"; }; } rec { name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; - md5 = "5f82357fd11b009d7fee5020e8ff2c8a"; + sha256 = "0zx652d5gr6dvviwpn5v0mhd9812pcha7xs9z7il3s01d75qcysk"; url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxi6.deb"; }; } rec { name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386"; - md5 = "eb23a3d322ff57ff5cad1ae062201b89"; + sha256 = "16dci5p6amsj1d474ih3avpjc1kc406wz6ywb9f6m44qrnm96w9m"; url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxinerama1.deb"; }; } rec { name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386"; - md5 = "426d497ed13c731342e5af754975e6ef"; + sha256 = "0gld5pbh1qh93nafvw6fx319av0hpfxp54pg3w4svi1cg7hj9rk2"; url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxml2.deb"; }; } rec { name = "libxmu6_1.1.0-3+srt4_i386"; - md5 = "8e7fae57eec7ef0eae90c7573bde46a9"; + sha256 = "0vvxp9fr2rykqny2r1qz6h5vqw26zv5lkh9nyw8jvrv9gx01rma0"; url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxmu6.deb"; }; } rec { name = "libxpm4_3.5.9-4+srt4_i386"; - md5 = "dc095202dcca66b471d2619af7164135"; + sha256 = "0s7pxkhfx84axldwpznv1wj9z05zm90fpp11702lm3qic6829sk1"; url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxpm4.deb"; }; } rec { name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; - md5 = "659bfe8b731e831f32b047e66643ae05"; + sha256 = "08392ac5sqsdq4r4p8n88c3d2nn0078y510grdrxp9z006f89846"; url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrandr2.deb"; }; } rec { name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; - md5 = "e5ea9172d234d61d6a31d86465428b05"; + sha256 = "08dj2kx2kr50jxcyfdj9y9gajkz1lnm6jn9z2pvqf43hzfa4pmp2"; url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrender1.deb"; }; } rec { name = "libxss1_1.2.1-2+srt4_i386"; - md5 = "83aeab12e6c75d38be99d9df3ad1b632"; + sha256 = "1zf5ifqq8s6xr3iiwhjk3g2ifrb9srwanffsdjab28jzfpsb4a9h"; url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxss1.deb"; }; } rec { name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386"; - md5 = "a15335885d70016c10c88b20e65ac677"; + sha256 = "1f01dzslhcm0r89p6wzs1pv32gaqxhxs3jim4jbzrkv18d4pyyc6"; url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxt6.deb"; }; } rec { name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386"; - md5 = "60cf7b25685a4bce2bbf031778831468"; + sha256 = "0w64xxfakharkmh0w9y6pg5446a7zypqhs3wgj6dbsa7clly8ir8"; url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxtst6.deb"; }; } rec { name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386"; - md5 = "7b97be0b67b400eba70eec57f50a92ac"; + sha256 = "1xbxlzmhl8j64k2aayrmpdz9bxn7b6jirdk84qibwh96fna4gd2x"; url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386"; - md5 = "65ed88dfc8eaa02cd5373308826f540b"; + sha256 = "1m4r0mp1i44rlddjjrmmbqi1phg2ksdn5zb4bxjrf55m2zfkgkx3"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386"; - md5 = "58ba7752e14f61f59698ce4aba860cd8"; + sha256 = "162554nhfmpjyyf1pzc35gsbawz4f6n1bm4s8n0923g1hmafpf6g"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zenity.deb"; }; } rec { name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386"; - md5 = "c2c51ba06c022ea81a6af843f27b34b0"; + sha256 = "0gcw3qr6w418idwd69i12hjr90ixnab81d1p3wi7d0rwl1227ihv"; url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zlib1g.deb"; }; } diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py index 0292e725cea..c225d6bf8ad 100755 --- a/pkgs/games/steam/update-runtime.py +++ b/pkgs/games/steam/update-runtime.py @@ -36,13 +36,13 @@ def parse_args(): def download_file(file_base, file_name, file_url): file_shortname = file_base + ".deb" - md5 = subprocess.check_output(["nix-prefetch-url", "--type", "md5", "--name", file_shortname, file_url]) + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--name", file_shortname, file_url]) out.write(" rec {\n") out.write(" name = \"%s\";\n" % file_name) - out.write(" md5 = \"%s\";\n" % md5.strip()) + out.write(" sha256 = \"%s\";\n" % sha256.strip()) out.write(" url = \"%s\";\n" % file_url.replace(REPO, "mirror://steamrt", 1)) out.write(" source = fetchurl {\n") - out.write(" inherit url md5;\n") + out.write(" inherit url sha256;\n") out.write(" name = \"%s\";\n" % file_shortname) out.write(" };\n") out.write(" }\n") From 9c47876b84e5ec1701478afc90f48326d71aa803 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Sep 2016 12:33:12 +0300 Subject: [PATCH 120/234] steam: don't write runtime tag file --- pkgs/games/steam/build-runtime.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/games/steam/build-runtime.py b/pkgs/games/steam/build-runtime.py index 3f23d53b984..e0ff5cebd93 100644 --- a/pkgs/games/steam/build-runtime.py +++ b/pkgs/games/steam/build-runtime.py @@ -20,19 +20,11 @@ def parse_args(): return parser.parse_args() -def install_deb (basename, deb, md5, dest_dir): +def install_deb (basename, deb, dest_dir): installtag_dir=os.path.join(dest_dir, "installed") if not os.access(installtag_dir, os.W_OK): os.makedirs(installtag_dir) - # - # Write the tag file and checksum to the 'installed' subdirectory - # - with open(os.path.join(installtag_dir,basename),"w") as f: - subprocess.check_call(['dpkg-deb', '-c', deb], stdout=f) - with open(os.path.join(installtag_dir,basename+".md5"),"w") as f: - f.write("%s %s.deb\n" % (md5, basename)) - # # Unpack the package into the dest_dir # @@ -98,7 +90,7 @@ print ("Creating Steam Runtime in %s" % args.runtime) with open(args.input) as pkgfile: pkgs = json.load(pkgfile) for pkg in pkgs: - install_deb(pkg["name"], pkg["source"], pkg["md5"], args.runtime) + install_deb(pkg["name"], pkg["source"], args.runtime) fix_debuglinks() fix_symlinks() From f8ea2347208cfeb4c88ca6319dc307bf16b47ae1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Sep 2016 12:57:22 +0300 Subject: [PATCH 121/234] asunder: use gtk2 explicitly --- pkgs/applications/audio/asunder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 0ddb7143bc2..b5897c71cd9 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, gtk, libcddb, intltool, pkgconfig, cdparanoia +{ stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia , mp3Support ? false, lame , oggSupport ? true, vorbis-tools , flacSupport ? true, flac @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; }; - buildInputs = [ gtk libcddb intltool pkgconfig makeWrapper ]; + buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ]; runtimeDeps = optional mp3Support lame ++ From 5d3cf921caecf67ebf93c3a155605c234421ec67 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Sep 2016 13:15:41 +0300 Subject: [PATCH 122/234] banshee: use gnome2 explicitly --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef04ed1b0da..1bb986c86b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12487,7 +12487,7 @@ in }; banshee = callPackage ../applications/audio/banshee { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; libgpod = pkgs.libgpod.override { monoSupport = true; }; }; From 23ff3dddba59b36be2f0dc0b318518a91674e967 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Sep 2016 13:19:06 +0300 Subject: [PATCH 123/234] batti: fix eval --- pkgs/applications/misc/batti/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 22f03419e5b..283e7f19907 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -4,7 +4,7 @@ , makeWrapper }: let - inherit (pythonPackages) dbus-python pygtk2 python; + inherit (pythonPackages) dbus-python pygtk python; in stdenv.mkDerivation rec { name = "batti-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig gettext python gtk2 pygtk2 dbus-python gdk_pixbuf upower makeWrapper ]; + [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ]; configurePhase = "true"; From baf401cdf470cad6f7bc3161578cf09380e7cc40 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 13 Sep 2016 18:20:51 +0800 Subject: [PATCH 124/234] wp-cli: 0.23.1 -> 0.24.1 --- pkgs/development/tools/wp-cli/default.nix | 36 ++++++++++++----------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 418e23eb0e7..a116e8b73e2 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,38 +1,40 @@ -{ stdenv, lib, writeText, bash, fetchurl, php }: +{ stdenv, lib, writeText, writeScript, fetchurl, php }: let + version = "0.24.1"; + name = "wp-cli-${version}"; + phpIni = writeText "wp-cli-php.ini" '' [Phar] phar.readonly = Off ''; -in stdenv.mkDerivation rec { - version = "0.23.1"; - name = "wp-cli-${version}"; + wpBin = writeScript "wp" '' + #! ${stdenv.shell} -e + exec ${php}/bin/php \ + -c ${phpIni} \ + -f ${src} "$@" + ''; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1sjai8gjsx6j82lsxq9m827bczp4ajnldk6ibj4krcisn9pjva5f"; + sha256 = "027nclp8qbfr624ja6aixzcwnvb55d7dskk9l1i042bc86hmphfd"; }; - propagatedBuildInputs = [ php ]; +in stdenv.mkDerivation rec { + + inherit name; buildCommand = '' mkdir -p $out/bin - - cat >$out/bin/wp < Date: Sun, 11 Sep 2016 22:45:17 +0100 Subject: [PATCH 125/234] prometheus-node-exporter: Add module. --- nixos/modules/module-list.nix | 1 + .../monitoring/prometheus/node-exporter.nix | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/node-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7a74fe2d785..a08a596a176 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -288,6 +288,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/prometheus/default.nix + ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix new file mode 100644 index 00000000000..a462d16eef9 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -0,0 +1,47 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.nodeExporter; + cmdlineArgs = cfg.extraFlags ++ [ + "-web.listen-address=${cfg.listenAddress}" + ]; +in { + options = { + services.prometheus.nodeExporter = { + enable = mkEnableOption "Enable the Prometheus node exporter (CPU stats etc)."; + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9100"; + description = '' + Address to listen on. + ''; + }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the node exporter. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.prometheus-node-exporter = { + description = "Prometheus exporter for machine metrics"; + unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; + wantedBy = [ "multi-user.target" ]; + script = '' + exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ + ${concatStringsSep " \\\n " cmdlineArgs} + ''; + serviceConfig = { + User = "nobody"; + Restart = "always"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} From c542e6d239f6e9e3ca8862bf35a804de90740d1a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Sep 2016 13:29:49 +0300 Subject: [PATCH 126/234] haskell: replace gnome mentions with gnome2 as a workaround to fix eval --- .../haskell-modules/hackage-packages.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7cf74b4a634..40fb0abd214 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -32077,7 +32077,7 @@ self: { description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome) pango;}; + }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome2) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -41002,7 +41002,7 @@ self: { description = "Bindings to the Clutter animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;}; "cmaes" = callPackage ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random @@ -66770,7 +66770,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) GConf;}; + }) {inherit (pkgs.gnome2) GConf;}; "gd" = callPackage ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd @@ -69715,7 +69715,7 @@ self: { description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, containers, haskell-gi @@ -69802,7 +69802,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome) pango;}; + inherit (pkgs.gnome2) pango;}; "gi-pango_1_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -69826,7 +69826,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome) pango;}; + inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -69848,7 +69848,7 @@ self: { description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -69890,7 +69890,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "gi-soup_2_4_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -69912,7 +69912,7 @@ self: { description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -69934,7 +69934,7 @@ self: { description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome2) vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -71331,7 +71331,7 @@ self: { description = "Binding to the glade library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libglade;}; + }) {inherit (pkgs.gnome2) libglade;}; "gladexml-accessor" = callPackage ({ mkDerivation, base, glade, HaXml, template-haskell }: @@ -72037,7 +72037,7 @@ self: { description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gnome_keyring;}; + }) {inherit (pkgs.gnome2) gnome_keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -72057,7 +72057,7 @@ self: { description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;}; + }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring @@ -75737,7 +75737,7 @@ self: { description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtkglext;}; + }) {inherit (pkgs.gnome2) gtkglext;}; "gtkimageview" = callPackage ({ mkDerivation, array, base, containers, glib, gtk @@ -75794,7 +75794,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3_0_13_2_1" = callPackage ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools @@ -75813,7 +75813,7 @@ self: { description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib @@ -75831,7 +75831,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: @@ -129311,7 +129311,7 @@ self: { description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome2) pango;}; "pango" = callPackage ({ mkDerivation, array, base, Cabal, cairo, containers, directory @@ -135322,7 +135322,7 @@ self: { license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; - inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; + inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -158346,7 +158346,7 @@ self: { description = "Experimental web browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "spine" = callPackage ({ mkDerivation, base }: @@ -178020,7 +178020,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome2) vte;}; "vtegtk3" = callPackage ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango @@ -178037,7 +178037,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome2) vte;}; "vty_5_5_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers From 0a518618a2760ec1c7635f62603172194df81577 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 10 Sep 2016 12:45:01 +0200 Subject: [PATCH 127/234] docker: 1.10.3 -> 1.12.1 --- .../virtualization/docker/default.nix | 66 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3d69de9c15b..801b93a02de 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, go, sqlite, iproute, bridge-utils, devicemapper -, btrfs-progs, iptables, e2fsprogs, xz, utillinux -, systemd, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man +, go, containerd, runc +, sqlite, iproute, bridge-utils, devicemapper, systemd +, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs +, procps }: # https://github.com/docker/docker/blob/master/project/PACKAGERS.md -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.10.3"; + version = "1.12.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0bmrafi0p3fm681y165ps97jki0a8ihl9f0bmpvi22nmc1v0sv6l"; + sha256 = "079786dyydjfc8vb6djxh140pc7v16fjl5x2h2q420qc3mrfz5zd"; }; buildInputs = [ - makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs - iptables e2fsprogs systemd pkgconfig stdenv.glibc stdenv.glibc.static + makeWrapper pkgconfig go-md2man go + sqlite devicemapper btrfs-progs systemd ]; dontStrip = true; - DOCKER_BUILDTAGS = [ "journald" ] + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; @@ -39,15 +41,27 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="20f81dde" + export DOCKER_GITCOMMIT="23cf638" ./hack/make.sh dynbinary ''; + outputs = ["out" "man"]; + + extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; + installPhase = '' - install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker - install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit + install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker + install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + install -Dm755 ./bundles/${version}/dynbinary-daemon/docker-proxy-${version} $out/libexec/docker/docker-proxy makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${stdenv.lib.makeBinPath [ iproute iptables e2fsprogs xz utillinux ]}" + --prefix PATH : "$out/libexec/docker:$extraPath" + makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ + --prefix PATH : "$out/libexec/docker:$extraPath" + + # docker uses containerd now + ln -s ${containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${runc}/bin/runc $out/libexec/docker/docker-runc # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service @@ -56,9 +70,31 @@ stdenv.mkDerivation rec { install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + + # Include contributed man pages + man/md2man-all.sh -q + manRoot="$man/share/man" + mkdir -p "$manRoot" + for manDir in man/man?; do + manBase="$(basename "$manDir")" # "man1" + for manFile in "$manDir"/*; do + manName="$(basename "$manFile")" # "docker-build.1" + mkdir -p "$manRoot/$manBase" + gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + done + done ''; - meta = with stdenv.lib; { + preFixup = '' + # remove references to go compiler, gcc and glibc + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out -type f 2>/dev/null) + ''; + + meta = { homepage = http://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ad71b16a1e..3ed2813fbac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12770,9 +12770,7 @@ in dmtx-utils = callPackage ../tools/graphics/dmtx-utils { }; - docker = callPackage ../applications/virtualization/docker { - btrfs-progs = btrfs-progs_4_4_1; - }; + docker = callPackage ../applications/virtualization/docker { }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; From 5d9c62541a3524fd2c035b75058a0cb412b61f95 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 10 Sep 2016 12:55:46 +0200 Subject: [PATCH 128/234] docker module: updates - logDriver option, use journald for logging by default - keep storage driver intact by default, as docker has sane defaults - do not choose storage driver in tests, docker will choose by itself - use dockerd binary as "docker daemon" command is deprecated and will be removed - add overlay2 to list of storage drivers --- nixos/modules/virtualisation/docker.nix | 25 +++++++++++++++++++++---- nixos/tests/docker.nix | 3 --- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ebc2be087a5..92fe98f3f9c 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -40,13 +40,25 @@ in }; storageDriver = mkOption { - type = types.enum ["aufs" "btrfs" "devicemapper" "overlay" "zfs"]; - default = "devicemapper"; + type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); + default = null; description = '' - This option determines which Docker storage driver to use. + This option determines which Docker storage driver to use. By default + it let's docker automatically choose preferred storage driver. ''; }; + + logDriver = + mkOption { + type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs"]; + default = "journald"; + description = + '' + This option determines which Docker log driver to use. + ''; + }; + extraOptions = mkOption { type = types.separatedString " "; @@ -88,7 +100,12 @@ in after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ; requires = optional cfg.socketActivation "docker.socket"; serviceConfig = { - ExecStart = "${pkgs.docker}/bin/docker daemon --group=docker --storage-driver=${cfg.storageDriver} ${optionalString cfg.socketActivation "--host=fd://"} ${cfg.extraOptions}"; + ExecStart = ''${pkgs.docker}/bin/dockerd \ + --group=docker --log-driver=${cfg.logDriver} \ + ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ + ${optionalString cfg.socketActivation "--host=fd://"} \ + ${cfg.extraOptions} + ''; # I'm not sure if that limits aren't too high, but it's what # goes in config bundled with docker itself LimitNOFILE = 1048576; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 06e511d6e0b..1b57a94a05d 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,9 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { virtualisation.docker.enable = true; - # FIXME: The default "devicemapper" storageDriver fails in NixOS VM - # tests. - virtualisation.docker.storageDriver = "overlay"; }; }; From 40e47a95d71b9886932fdf7190d403f578f9e75e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 13 Sep 2016 18:50:30 +0800 Subject: [PATCH 129/234] freerdp: add missing libXrender dependency --- pkgs/applications/networking/remote/freerdp/unstable.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 033f867f99c..cba5488e1a4 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor -, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv +, libXdamage, libXext, libXrender, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , substituteAll , libpulseaudio ? null, cups ? null, pcsclite ? null , buildServer ? true, optimize ? true @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }); buildInputs = [ - cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib + cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext libXrender glib alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite ]; @@ -51,4 +51,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - From e19aa3819e21c79215db361b2913571f33b7d23f Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 14:07:56 +0200 Subject: [PATCH 130/234] virtualbox: 5.1.4 -> 5.1.6 Upstream changelog without bug numbers: * GUI: fixed issue with opening '.vbox' files and it's aliases * GUI: keyboard grabbing fixes * GUI: fix for passing through Ctrl + mouse-click * GUI: fixed automatic deletion of extension pack files * USB: fixed showing unknown device instead of the manufacturer or product description under certain circumstances * XHCI: another fix for a hanging guest under certain conditions, this time for Windows 7 guests * Serial: fixed high CPU usage with certain USB to serial converters on Linux hosts * Storage: fixed attaching stream optimized VMDK images * Storage: reject image variants which are unsupported by the backend * Storage: fixed loading saved states created with VirtualBox 5.0.10 and older when using a SCSI controller * Storage: fixed broken NVMe emulation if the host I/O cache setting is enabled * Storage: fixed using multiple NVMe controllers if ICH9 is used * NVMe: fixed a crash during reset which could happen under certain circumstances * Audio: fixed microphone input (5.1.2 regression) * Audio: fixed crashes under certain conditions (5.1.0 regression) * Audio: fixed recording with the ALSA backend (5.1 regression) * Audio: fixed stream access mode with OSS backend (5.1 regression, thanks to Jung-uk Kim) * E1000: do also return masked bits when reading the ICR register, this fixes booting from iPXE (5.1.2 regression) * BIOS: fixed 4bpp scanline calculation * API: relax the check for the version attribute in OVF/OVA appliances * Windows hosts: fixed crashes when terminating the VM selector or other VBox COM clients * Linux Installer: fixed path to the documentation in .rpm packages (5.1.0 regression) * Linux Installer: fixed the vboxdrv.sh script to prevent an SELinux complaint * Linux hosts: don't use 32-bit legacy capabilities * Linux Additions: Linux 4.8 fix for the kernel display driver * Linux Additions: don't load the kernel modules provided by the Linux distribution but load the kernel modules from the official Guest Additions package instead * Linux Additions: fix dynamic resizing problems in recent Linux guests * User Manual: fixed error in the VBoxManage chapter for the getextradata enumerate example The full upstream changelog with bug numbers can be found at: https://www.virtualbox.org/wiki/Changelog-5.1#v6 Signed-off-by: aszlig --- .../virtualization/virtualbox/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json index de0adf2e9db..3a386004a3f 100644 --- a/pkgs/applications/virtualization/virtualbox/upstream-info.json +++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json @@ -1,8 +1,8 @@ { "__NOTE": "Generated using update.py from the same directory.", - "extpack": "9462ff1b567c37ad9a33c0c7ca1925776615ec89b5a72563f29a8cc8514cf316", - "extpackRev": "110228", - "guest": "e385b698338003595f6cdeee7b631ec6713058ba1227d1f2a1da342bdf741982", - "main": "b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf", - "version": "5.1.4" + "extpack": "607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de", + "extpackRev": "110634", + "guest": "cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed", + "main": "2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911", + "version": "5.1.6" } From 8b6e522bf834354c2b44c84e11f764ab689a3335 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 13 Sep 2016 21:12:18 +0900 Subject: [PATCH 131/234] flashplayer: 11.2.202.632 -> 11.2.202.635 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 3b130caf03f..aa724c2d3c5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -70,11 +70,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.632"; + version = "11.2.202.635"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "0nf2d7jn8g6bp9vilkwwkkh6pm05fg3h73njsn4yvx3285k73lpn"; + sha256 = "0xlaf6152ksknigrv6fsasscyfnjkxml4nl22apiwzb34nrbzk3m"; }; nativeBuildInputs = [ unzip ]; From 562c7f56f0526c2353b99246370a3d17f40ec148 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 14:52:49 +0200 Subject: [PATCH 132/234] nixos/tests/vbox: Make shutdown less noisy Using waitUntilSucceeds for testing whether the shutdown signalling files have vanished is quite noisy because it prints two lines for every try. This is now fixed with a while loop on the guest VM which does the same check but with only one output for the command that's executed and another one when the conditions are met. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index ab4d46ab7e1..c1205ca0c8a 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -273,9 +273,12 @@ let sub shutdownVM_${name} { $machine->succeed(ru "touch ${sharePath}/shutdown"); - $machine->waitUntilSucceeds( - "test ! -e ${sharePath}/shutdown ". - " -a ! -e ${sharePath}/boot-done" + $machine->execute( + 'set -e; i=0; '. + 'while test -e ${sharePath}/shutdown '. + ' -o -e ${sharePath}/boot-done; do '. + 'sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; '. + 'done' ); waitForShutdown_${name}; } From e18f4a2cf92cf4fd43d0d4ad1adfb93cd011cbf1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 15:04:56 +0200 Subject: [PATCH 133/234] virtualbox: Build with PulseAudio by default If people want to disable support for PulseAudio they can still explicitly use pulseaudio = false in their nixpkgs config. But even with enabled PulseAudio support, it's still optional, enabled at runtime and can be turned off in VirtualBox settings as well. Signed-off-by: aszlig Issue: #15005 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff8f3dfca6c..a74c74e66e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15218,7 +15218,7 @@ in stdenv = stdenv_32bit; inherit (gnome) libIDL; enableExtensionPack = config.virtualbox.enableExtensionPack or false; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or true; }; virtualboxHardened = lowPrio (virtualbox.override { From de0737aed57529f82fcf5e3a0ac0bcccc3b88e51 Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Tue, 13 Sep 2016 23:15:56 +1000 Subject: [PATCH 134/234] sudo: Allow root to use sudo to switch groups --- nixos/modules/security/sudo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index bced2a6ed75..f5612e1b0c5 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -74,7 +74,7 @@ in Defaults env_keep+=SSH_AUTH_SOCK # "root" is allowed to do anything. - root ALL=(ALL) SETENV: ALL + root ALL=(ALL:ALL) SETENV: ALL # Users in the "wheel" group can do anything. %wheel ALL=(ALL:ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL From 15fa31d33ed9ef805bd35a612d96d0055f04cabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Sep 2016 16:03:37 +0200 Subject: [PATCH 135/234] gperftools: 2.4 -> 2.5 Also, maintain the package. --- pkgs/development/libraries/gperftools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 5fa14e64a22..8eb79b27fdc 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, unzip, libunwind }: +{ stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.4"; + name = "gperftools-2.5"; src = fetchurl { - url = "https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.4.tar.gz"; - sha256 = "0b8aqgch8dyapzw2zd9g89x6gsnm2ml0gf169rql0bxldqi3falq"; + url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; + sha256 = "0wsix3lhkpjv8lxmcbml549mfwifdv7n1qak09slvx6d3a7p98kg"; }; - buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isLinux libunwind; + buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ vcunat wkennington ]; }; } From 246bd302ece734cc0f7f26fa14b72fb9edfdc084 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 13 Sep 2016 03:18:07 +0300 Subject: [PATCH 136/234] kernel generate-config.pl: Be more verbose on errors --- pkgs/os-specific/linux/kernel/generate-config.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index e5fa780c6e7..3cf1dc34baa 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -91,17 +91,17 @@ sub runConfig { print STDERR "CHOICE: $1, ANSWER: $answer\n" if $debug; print OUT "$answer\n" if $1 =~ /-/; } - + # Some questions lack the option name ("bla bla [Y/n/m/...] "). elsif ($line =~ /(.*) \[(.*)\] ###$/) { print OUT "\n"; } - + else { warn "don't know how to answer this question: $line\n"; print OUT "\n"; } - + $line = ""; %choices = (); } @@ -136,6 +136,6 @@ foreach my $name (sort (keys %answers)) { my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1" ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; }; &$f("unused option: $name\n") unless defined $config{$name}; - &$f("option not set correctly: $name\n") + &$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n") if $config{$name} && $config{$name} ne $answers{$name}; } From b4a4a63cc4ed8ebd8c1fbbfb3b89a408e907045a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 13 Sep 2016 13:52:07 +0300 Subject: [PATCH 137/234] kernel generate-config.pl: Properly support string options Or we get something like: option not set correctly: NLS_DEFAULT (wanted 'utf8', got '"utf8"') --- pkgs/os-specific/linux/kernel/generate-config.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 3cf1dc34baa..5574cc937af 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -124,7 +124,10 @@ my %config; open CONFIG, "<.config" or die; while () { chomp; - if (/^CONFIG_([A-Za-z0-9_]+)=(.*)$/) { + if (/^CONFIG_([A-Za-z0-9_]+)="(.*)"$/) { + # String options have double quotes, e.g. 'CONFIG_NLS_DEFAULT="utf8"' and allow escaping. + ($config{$1} = $2) =~ s/\\([\\"])/$1/g; + } elsif (/^CONFIG_([A-Za-z0-9_]+)=(.*)$/) { $config{$1} = $2; } elsif (/^# CONFIG_([A-Za-z0-9_]+) is not set$/) { $config{$1} = "n"; From 0c0188c5d258881b16da49a129ffa406e17f7e89 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 13 Sep 2016 13:51:14 +0300 Subject: [PATCH 138/234] kernel config: Explicitly enable some NLS-related things Doesn't affect x86, but ARM can't mount VFAT filesystems without this on a 3.18 kernel. --- pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 54e6b7822f9..107c87434de 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -270,6 +270,13 @@ with stdenv.lib; SQUASHFS_LZ4 y ''} + # Native Language Support modules, needed by some filesystems + NLS y + NLS_DEFAULT utf8 + NLS_UTF8 m + NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option + NLS_ISO8859_1 m # VFAT default for the iocharset= mount option + # Runtime security tests DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages From 01895ff5eabfc95e17c3ff6b650194cbe44ef9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Sep 2016 16:11:37 +0200 Subject: [PATCH 139/234] fstar: disable tests https://github.com/FStarLang/FStar/issues/676 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit feef017564c292e088de69e97db4071bf08c2853) Signed-off-by: Domen Kožar --- pkgs/development/compilers/fstar/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 3f16667d155..24a4135bde1 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation rec { -C src/ocaml-output ''; - doCheck = !stdenv.isDarwin; + # https://github.com/FStarLang/FStar/issues/676 + doCheck = false; preCheck = "ulimit -s unlimited"; From fef171ee76b6555c3691a40ec5ef8ee4d597d24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Sep 2016 16:08:43 +0200 Subject: [PATCH 140/234] nova: more transient errored test cases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit eb25ce7fbfd92070d75b06060c98b221ac8da290) Signed-off-by: Domen Kožar --- pkgs/applications/virtualization/openstack/nova.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index 618eb766692..a4e0779d3f9 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -15,6 +15,9 @@ pythonPackages.buildPythonApplication rec { # otherwise migrate.cfg is not installed patchPhase = '' echo "graft nova" >> MANIFEST.in + + # remove transient error test, see http://hydra.nixos.org/build/40203534 + rm nova/tests/unit/compute/test_{shelve,compute_utils}.py ''; # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt From 9a1056948092ed90e394b674a3ba37b8bd34c689 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 9 Sep 2016 00:32:34 +0200 Subject: [PATCH 141/234] wine: 1.8.3 -> 1.8.4; 1.9.16 -> 1.9.18 - update mono and gecko versions - update winetricks - replace sourceforge download urls --- pkgs/misc/emulators/wine/sources.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index ed766e54bac..72fd3c82a51 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -7,42 +7,42 @@ in rec { stable = fetchurl rec { version = "1.8.4"; - url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; + url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2"; sha256 = "0yahh1n3s3y0bp1a1sr3zpna56749jdgr85hwmpq393pjx1i0pai"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { version = "2.40"; - url = "mirror://sourceforge/wine/wine_gecko-${version}-x86.msi"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s"; }; gecko64 = fetchurl rec { version = "2.40"; - url = "mirror://sourceforge/wine/wine_gecko-${version}-x86_64.msi"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3"; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.5.6"; - url = "mirror://sourceforge/wine/wine-mono-${version}.msi"; - sha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; + version = "4.6.3"; + url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; + sha256 = "1f98xwgv665zb9cwc5zphcdbffyh3sm26h62hzca6zlcwy5fi0zq"; }; }; unstable = fetchurl rec { version = "1.9.18"; - url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; + url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; sha256 = "1n38697v707j489ljd6b2k1yvrarflc0yn847jas1ida1nm4nq96"; inherit (stable) mono; gecko32 = fetchurl rec { - version = "2.44"; + version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; - sha256 = "0fbd8pxkihhfxs5mcx8n0rcygdx43qdrp2x8hq1s1cvifp8lm9kp"; + sha256 = "0fk4fwb4ym8xn0i5jv5r5y198jbpka24xmxgr8hjv5b3blgkd2iv"; }; gecko64 = fetchurl rec { - version = "2.44"; + version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; - sha256 = "0qb6zx4ycj37q26y2zn73w49bxifdvh9n4riy39cn1kl7c6mm3k2"; + sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5"; }; }; @@ -55,8 +55,8 @@ in rec { }; winetricks = fetchFromGitHub rec { - version = "20160622"; - sha256 = "0xh7mc5xby0zxx2g3q1ky18s20y6s7wp3vzvgxydwzhhwf32189q"; + version = "20160724"; + sha256 = "0nl8gnmsqwwrc8773q8py64kv3r5836xjxsnxjv91n4hhmvgyrzs"; owner = "Winetricks"; repo = "winetricks"; rev = version; From b1372e414c4ee522e3fb52a1e00dde8e41ac7818 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Sep 2016 16:09:06 +0200 Subject: [PATCH 142/234] libtorrentRasterbar: 1.1 -> 1.1.1 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 1950f94aca2..b6aace0de2d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.1"; - sha256 = "06dzzr9g2qhy48yy50xgac9jadjmqjykl52fq2kfl2l7xxzykkkz"; + version = "1.1.1"; + sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j"; }) From ed9541cd544d8f1ba4bf29eb5c2d14a26cf98500 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Sep 2016 16:10:51 +0200 Subject: [PATCH 143/234] libtorrentRasterbar_0_16: remove old, insecure version --- pkgs/development/libraries/libtorrent-rasterbar/0.16.nix | 6 ------ pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/libtorrent-rasterbar/0.16.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix deleted file mode 100644 index 985c570a34e..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "0.16.19"; - sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486950c65bc..0603844fbb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8596,13 +8596,6 @@ in libtorrentRasterbar_1_09 = callPackage ../development/libraries/libtorrent-rasterbar/1.09.nix { }; - libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { - # fix "unrecognized option -arch" error - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; - libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { }; From 1d82947742d362817000100c24ed72862b63e2f5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Sep 2016 16:12:33 +0200 Subject: [PATCH 144/234] libtorrentRasterbar_1_0: 1.0.9 -> 1.0.10 --- pkgs/development/libraries/libtorrent-rasterbar/1.0.nix | 6 ++++++ pkgs/development/libraries/libtorrent-rasterbar/1.09.nix | 6 ------ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.0.nix delete mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.09.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix new file mode 100644 index 00000000000..97aa0145956 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.0.10"; + sha256 = "1x5gvajplmwx869avlpx8p3c12pzi6wkgqaxmj5049nvw57l00kl"; +}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix deleted file mode 100644 index e2809e9d483..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.0.9"; - sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0603844fbb2..172eedaed56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8594,7 +8594,7 @@ in libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; - libtorrentRasterbar_1_09 = callPackage ../development/libraries/libtorrent-rasterbar/1.09.nix { }; + libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; @@ -14525,7 +14525,7 @@ in qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent { boost = boost; - libtorrentRasterbar = libtorrentRasterbar_1_09; + libtorrentRasterbar = libtorrentRasterbar_1_0; }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; From 2628ea4446a8abceb6576fa89f82621dfcca482a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Sep 2016 18:02:45 +0200 Subject: [PATCH 145/234] qbittorrent: 3.3.5 -> 3.3.7 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index f3c94e8577f..620b8601d7d 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.5"; + version = "3.3.7"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1nh4lr4kbgh6rrsjax2a4lg82vn1ld0rnqjpp7sb6vpz8ikavk9q"; + sha256 = "0h2ccqmjnm0x0qjvd0vz5hk7dy9qbqhiqvxywqjhip7sj1585p3j"; }; nativeBuildInputs = [ pkgconfig which ]; From b7fabd39b3f0ec30aead28af17a726e44ba9bb22 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 13 Sep 2016 18:02:20 +0200 Subject: [PATCH 146/234] mpd: fix on darwin --- pkgs/servers/mpd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index e273bd110e2..4b26b92cdb2 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd, boost +{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , flacSupport ? true, flac , vorbisSupport ? true, libvorbis @@ -42,6 +42,7 @@ in stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch; buildInputs = [ pkgconfig glib boost ] + ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib ++ opt flacSupport flac From 4b55b0358ad7c636b581bb8b665540f013ef68af Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Tue, 13 Sep 2016 20:47:32 +0400 Subject: [PATCH 147/234] deluge: fix libtorrentRasterbar_1_0 reference (#18564) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bb78df89c6..26e2867de81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9161,7 +9161,7 @@ in modules // { }; propagatedBuildInputs = with self; [ - pyGtkGlade pkgs.libtorrentRasterbar_1_09 twisted Mako chardet pyxdg self.pyopenssl modules.curses service-identity + pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl modules.curses service-identity ]; nativeBuildInputs = [ pkgs.intltool ]; From 0f37287df5c4ba0343c292ddfe827224efa87daf Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Tue, 13 Sep 2016 20:42:55 +0300 Subject: [PATCH 148/234] treewide: explicitly specify gtk version --- pkgs/applications/audio/aumix/default.nix | 6 +++--- .../applications/networking/browsers/chromium/default.nix | 4 ++-- .../networking/sniffers/wireshark/default.nix | 6 +++--- pkgs/desktops/gnome-2/platform/GConf/default.nix | 6 +++--- pkgs/development/compilers/gcc/4.5/default.nix | 8 ++++---- pkgs/development/compilers/gcc/4.6/default.nix | 8 ++++---- pkgs/development/compilers/gcc/4.8/default.nix | 6 +++--- pkgs/development/compilers/gcc/4.9/default.nix | 6 +++--- pkgs/development/compilers/gcc/5/default.nix | 6 +++--- pkgs/development/compilers/gcc/6/default.nix | 6 +++--- pkgs/development/libraries/libappindicator/default.nix | 4 ++-- pkgs/development/libraries/libinfinity/default.nix | 4 ++-- pkgs/development/tools/analysis/radare/default.nix | 6 +++--- pkgs/development/tools/analysis/radare2/default.nix | 6 +++--- pkgs/os-specific/linux/kernel/perf.nix | 6 +++--- pkgs/tools/networking/mtr/default.nix | 6 +++--- pkgs/tools/security/nmap/default.nix | 4 ++-- pkgs/tools/system/lshw/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 19 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index f5f0711ecac..db5f081c4ed 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, gettext, ncurses , gtkGUI ? false , pkgconfig ? null -, gtk ? null}: +, gtk2 ? null}: -assert gtkGUI -> pkgconfig != null && gtk != null; +assert gtkGUI -> pkgconfig != null && gtk2 != null; stdenv.mkDerivation rec { name = "aumix-2.9.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkgconfig gtk] else []); + ++ (if gtkGUI then [pkgconfig gtk2] else []); meta = { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 973669f87cd..7402a8bae29 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,7 +5,7 @@ , enableSELinux ? false , enableNaCl ? false , enableHotwording ? false -, gnomeSupport ? false +, gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false @@ -22,7 +22,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableSELinux enableNaCl enableHotwording gnomeSupport + inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport hiDPISupport; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bbd08f00577..99df01afa6a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , zlib -, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null +, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withQt ? false, qt4 ? null }: -assert withGtk -> !withQt && gtk != null; +assert withGtk -> !withQt && gtk2 != null; assert withQt -> !withGtk && qt4 != null; with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation { bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls geoip libnl c-ares python libcap glib zlib ] ++ optional withQt qt4 - ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]); + ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]); patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index b848296d5f0..d1f748c993d 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk ? null, withGtk ? false }: +, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: -assert withGtk -> (gtk != null); +assert withGtk -> (gtk2 != null); stdenv.mkDerivation { name = "gconf-2.32.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit - ++ stdenv.lib.optional withGtk gtk; + ++ stdenv.lib.optional withGtk gtk2; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b46ab8292bf..5d05410a7fd 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -12,7 +12,7 @@ , libelf # optional, for link-time optimizations (LTO) , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -62,7 +62,7 @@ let version = "4.5.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && gtk2 != null; /* Cross-gcc settings */ gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; @@ -122,7 +122,7 @@ let version = "4.5.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert gtk2 != null -> (filter (x: x == null) xlibs) == []; stdenv.mkDerivation ({ name = "${name}-${version}" + crossNameAddon; @@ -223,7 +223,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional langJava boehmgc) ++ (optionals langJava [zip unzip]) - ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) + ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index f98fde69fc4..991d4fc883f 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -13,7 +13,7 @@ , libelf # optional, for link-time optimizations (LTO) , ppl ? null, cloog ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -82,7 +82,7 @@ let version = "4.6.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && gtk2 != null; /* Platform flags */ platformFlags = let @@ -175,7 +175,7 @@ let version = "4.6.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert gtk2 != null -> (filter (x: x == null) xlibs) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -266,7 +266,7 @@ stdenv.mkDerivation ({ ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index d15a9a90b79..e4e38022a6b 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -16,7 +16,7 @@ , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -203,7 +203,7 @@ let version = "4.8.5"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -291,7 +291,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7bf3e3bb605..01755a74e1e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -16,7 +16,7 @@ , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -207,7 +207,7 @@ let version = "4.9.4"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -296,7 +296,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 74f7f37e7f3..f5c69d24d63 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -16,7 +16,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -207,7 +207,7 @@ let version = "5.4.0"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -295,7 +295,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 8064f42d498..129bde908fa 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -16,7 +16,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -206,7 +206,7 @@ let version = "6.2.0"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -293,7 +293,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 82f7930dd72..af5942fcd54 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -6,7 +6,7 @@ , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null , python, pygobject2, pygtk, gobjectIntrospection, vala_0_23 -, monoSupport ? false, mono ? null, gtk-sharp ? null +, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { glib dbus_glib python pygobject2 pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" - then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); postPatch = '' diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 3e88ed99b85..d13a9050dc9 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -3,7 +3,7 @@ , documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }: +, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] - ++ optional gtkWidgets gtk + ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index d42227198ce..6b7ba2a81cb 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl, -gtk ? null, vte ? null, gtkdialog ? null, +gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, useX11, rubyBindings, pythonBindings, luaBindings}: -assert useX11 -> (gtk != null && vte != null && gtkdialog != null); +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [pkgconfig readline libusb perl] - ++ optional useX11 [gtkdialog vte gtk] + ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] ++ optional luaBindings [lua]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 7e199c29aed..4b57e15d088 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, -gtk ? null, vte ? null, gtkdialog ? null, +gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, lua ? null, useX11, rubyBindings, pythonBindings, luaBindings}: -assert useX11 -> (gtk != null && vte != null && gtkdialog != null); +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig readline libusb libewf perl zlib openssl] - ++ optional useX11 [gtkdialog vte gtk] + ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] ++ optional luaBindings [lua]; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 4b1120afa4e..69a951875a5 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,11 +1,11 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , libiberty -, zlib, withGtk ? false, gtk ? null }: +, zlib, withGtk ? false, gtk2 ? null }: with lib; -assert withGtk -> gtk != null; +assert withGtk -> gtk2 != null; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { @@ -26,7 +26,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison libiberty ]; buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ - stdenv.lib.optional withGtk gtk; + stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index af5155695f4..c96e5cac367 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ncurses, autoconf -, withGtk ? false, gtk ? null}: +, withGtk ? false, gtk2 ? null}: -assert withGtk -> gtk != null; +assert withGtk -> gtk2 != null; with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = optionalString (!withGtk) "--without-gtk"; - buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk; + buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk2; meta = { homepage = http://www.bitwizard.nl/mtr/; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index e1a46cf2b82..3bc5d415834 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, pkgconfig, openssl , graphicalSupport ? false , libX11 ? null -, gtk ? null +, gtk2 ? null , pythonPackages , makeWrapper ? null }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpcap pkgconfig openssl makeWrapper python ] ++ optionals graphicalSupport [ - libX11 gtk pygtk pysqlite pygobject2 pycairo + libX11 gtk2 pygtk pysqlite pygobject2 pycairo ]; meta = { diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 02b331a36de..75ad15b7311 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, withGUI? false, gtk? null, pkgconfig? null, sqlite? null # compile GUI +, withGUI ? false, gtk2 ? null, pkgconfig? null, sqlite ? null # compile GUI }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b"; }; - buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ]; + buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk2 pkgconfig sqlite ]; postBuild = if withGUI then "make gui" else ""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 172eedaed56..c7dd8b76f06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4668,7 +4668,6 @@ in langC = false; profiledCompiler = false; inherit zip unzip zlib boehmgc gettext pkgconfig perl; - gtk = gtk2; inherit (gnome2) libart_lgpl; }); @@ -12621,6 +12620,7 @@ in enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; hiDPISupport = config.chromium.hiDPISupport or false; + gnome = gnome2; }; chronos = callPackage ../applications/networking/cluster/chronos { }; From 7fd8f158af23fc19cfe24fcc583467c461bbff34 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 13 Sep 2016 13:37:06 -0500 Subject: [PATCH 149/234] melpaPackages: update jade Fixes #18550. --- .../editors/emacs-modes/melpa-generated.nix | 10 +++++----- .../editors/emacs-modes/melpa-packages.nix | 3 --- .../editors/emacs-modes/melpa-stable-generated.nix | 10 +++++----- .../editors/emacs-modes/melpa-stable-packages.nix | 3 --- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index dea17a86b90..d5cbea30287 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -34414,22 +34414,22 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20160808.129"; + version = "20160913.816"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "e5204d18a9a9563af2ba5d5f985d6161a906d7d9"; - sha256 = "0l0q4c98jil0scr4spc3z3rgy4xy4w85zrsas1z8w142arvpiw70"; + rev = "5d9c5cc88a4601700adba558aab2818591fcf02c"; + sha256 = "1jfwns1jk0ixpxcf2rk49mr008bnnzq8g591vyd31lb5n10kwyc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; name = "jade"; }; - packageRequires = [ company emacs js2-mode map seq websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/jade"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index eaddf4ed61e..6081c96006a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -98,9 +98,6 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; - # upstream issue: missing dependency - jade = null; - # upstream issue: missing file header jsfmt = markBroken super.jsfmt; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 993b9b4e50e..5667e54fb4e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -16683,22 +16683,22 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.17"; + version = "0.19"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "11769bf8419202819a25047f57dd9aa0c98f5ebb"; - sha256 = "09zfvcirz7hcp255yhsf7d04vrc078kk69qhwy1j31ar0rb4fy1b"; + rev = "94f53bbd8aa8719b3d83ce038f68e74695b86ed4"; + sha256 = "0c40pg9f9w90fb1gwpl4z5wxhi0ng8j2fr6kf60yhbwg65x92w2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; name = "jade"; }; - packageRequires = [ company emacs js2-mode map seq websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/jade"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 7cf85d3cdab..03121edada0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -91,9 +91,6 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; - # upstream issue: missing dependency - jade = null; - # upstream issue: missing file header jsfmt = markBroken super.jsfmt; From a5de1cd8b5bec009eb556a37fb4cdd6d33d63d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Sep 2016 20:41:03 +0200 Subject: [PATCH 150/234] Disable nixos.tests.panamax https://github.com/NixOS/nixpkgs/issues/18209#issuecomment-246763699 --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 87e10b49731..d66ebd7cb15 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -274,7 +274,7 @@ in rec { tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; - tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); + #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callTest tests/postgresql.nix {}; tests.printing = callTest tests/printing.nix {}; From 2edb28ffc53b343ebed5838856afb2249615c287 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2016 19:41:54 +0000 Subject: [PATCH 151/234] dysnomia: bump to version 0.6.1 --- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 25df812254c..08f58f668ec 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.6"; + name = "dysnomia-0.6.1"; src = fetchurl { - url = http://hydra.nixos.org/build/36895408/download/1/dysnomia-0.6.tar.gz; - sha256 = "1gg2avj57amxf2qi5zjk0rjyakvy5bqaar2r2151cvjlas1z1alw"; + url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz; + sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 77b9abf78c01d79320353d5f9c1d6d6ed3ef000b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2016 19:46:58 +0000 Subject: [PATCH 152/234] disnix: 0.6 -> 0.6.1 --- pkgs/tools/package-management/disnix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 5ace2ad618f..45bd2abe8ec 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.6"; + name = "disnix-0.6.1"; src = fetchurl { - url = http://hydra.nixos.org/build/36897417/download/4/disnix-0.6.tar.gz; - sha256 = "1i3wxp7zn765gg0sri2jsdabkj0l7aqi8cxp46pyybdf4852d6gd"; + url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz; + sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj"; }; buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; From 14e9972e497a07f83e97d91bb18d126d63e68ee5 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Mon, 12 Sep 2016 18:26:28 +0300 Subject: [PATCH 153/234] groff: add missing depedencies for optional postscript and html outputs --- pkgs/tools/text/groff/default.nix | 27 ++++++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 728e9de8b48..df6a1119800 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, ghostscript, perl, groff }: +{ stdenv, fetchurl, perl, groff +, ghostscript #for postscript and html output +, psutils, netpbm #for html output +}: stdenv.mkDerivation rec { name = "groff-1.22.3"; @@ -12,7 +15,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - buildInputs = [ ghostscript ]; + postPatch = stdenv.lib.optionalString (psutils != null) '' + substituteInPlace src/preproc/html/pre-html.cpp \ + --replace "psselect" "${psutils}/bin/psselect" + '' + stdenv.lib.optionalString (netpbm != null) '' + substituteInPlace src/preproc/html/pre-html.cpp \ + --replace "pnmcut" "${netpbm}/bin/pnmcut" \ + --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ + --replace "pnmtopng" "${netpbm}/bin/pnmtopng" + substituteInPlace tmac/www.tmac \ + --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ + --replace "pngtopnm" "${netpbm}/bin/pngtopnm" \ + --replace "@PNMTOPS_NOSETPAGE@" "${netpbm}/bin/pnmtops -nosetpage" + ''; + + buildInputs = [ ghostscript psutils netpbm ]; nativeBuildInputs = [ perl ]; # Builds running without a chroot environment may detect the presence @@ -20,7 +37,11 @@ stdenv.mkDerivation rec { # package. To avoid this issue, X11 support is explicitly disabled. # Note: If we ever want to *enable* X11 support, then we'll probably # have to pass "--with-appresdir", too. - configureFlags = "--without-x"; + configureFlags = [ + "--without-x" + ] ++ stdenv.lib.optionals (ghostscript != null) [ + "--with-gs=${ghostscript}/bin/gs" + ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 172eedaed56..a725c8c912b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1907,6 +1907,8 @@ in groff = callPackage ../tools/text/groff { ghostscript = null; + psutils = null; + netpbm = null; }; groonga = callPackage ../servers/search/groonga { }; From 8ea8659f2962b955d6bb56bf5d2e76d7249a94a3 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Tue, 13 Sep 2016 22:56:27 +0300 Subject: [PATCH 154/234] Remove tomcat vm test timing issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 090f1f0722b79cbba5f0abccac61496398789762) Signed-off-by: Domen Kožar --- nixos/tests/tomcat.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index 92680d82ba8..475c947e72d 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -23,9 +23,8 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $server->waitForUnit("tomcat"); - $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly $client->waitForUnit("network.target"); - $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); - $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); + $client->waitUntilSucceeds("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); + $client->waitUntilSucceeds("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); ''; }) From 2b144fcfb0df0540b2189d27f5d42819a2813eeb Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2016 20:56:05 +0000 Subject: [PATCH 155/234] nodePackages: regenerate with node2nix-1.1.0. The new node2nix supports postInstall hooks that have been used to fix npm2nix --- .../node-packages/composition-v4.nix | 2 +- .../node-packages/composition-v5.nix | 2 +- pkgs/development/node-packages/default-v4.nix | 4 +- pkgs/development/node-packages/node-env.nix | 3 + .../node-packages/node-packages-v4.nix | 2531 +++++++++-------- .../node-packages/node-packages-v5.nix | 1945 +++++++------ 6 files changed, 2451 insertions(+), 2036 deletions(-) diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index 05c18f861a0..1c0f5f0626e 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v5.nix index a1567025c7d..be9201677ce 100644 --- a/pkgs/development/node-packages/composition-v5.nix +++ b/pkgs/development/node-packages/composition-v5.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index 5d724034201..be5a0abc4fc 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -35,5 +35,7 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0"; + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { + postInstall = "npm run-script prepublish"; + }; } diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 29995f22e26..c5c69c7d05d 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -227,6 +227,9 @@ let done done fi + + # Run post install hook, if provided + runHook postInstall ''; }); diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index b506ea1d269..55ab1b898cc 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.10" = { + "which-1.2.11" = { name = "which"; packageName = "which"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.10.tgz"; - sha1 = "91cd9bd0751322411b659b40f054b21de957ab2d"; + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; "os-homedir-1.0.1" = { @@ -463,6 +463,15 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; + "azure-arm-iothub-0.1.1" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; + sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + }; + }; "azure-arm-servermanagement-0.1.2" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; @@ -472,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.13.2" = { + "azure-arm-network-0.16.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.13.2"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.13.2.tgz"; - sha1 = "c1f798e5de97295aa0def2cb7f49c53f258d12b0"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.16.0.tgz"; + sha1 = "df1bd296fb52742af7596db025cbdd1491391f3d"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -499,22 +508,22 @@ let sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; }; }; - "azure-arm-dns-0.10.1" = { + "azure-arm-dns-0.11.1" = { name = "azure-arm-dns"; packageName = "azure-arm-dns"; - version = "0.10.1"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz"; - sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; + sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; }; }; - "azure-arm-website-0.10.0" = { + "azure-arm-website-0.11.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz"; - sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz"; + sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79"; }; }; "azure-arm-rediscache-0.2.1" = { @@ -571,13 +580,13 @@ let sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "azure-keyvault-0.10.1" = { + "azure-keyvault-0.10.2" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz"; - sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz"; + sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5"; }; }; "azure-asm-compute-0.17.0" = { @@ -625,13 +634,13 @@ let sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; }; }; - "azure-asm-network-0.12.0" = { + "azure-asm-network-0.13.0" = { name = "azure-asm-network"; packageName = "azure-asm-network"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.12.0.tgz"; - sha1 = "f407498dcf4a41e2a674fba23597157370a6ac05"; + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; "azure-arm-resource-1.4.5-preview" = { @@ -715,13 +724,13 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.4.0" = { + "azure-batch-0.5.0" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.4.0.tgz"; - sha1 = "065e3fb7ab3e7bb33a254e5cd2d15a23edc7cf40"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.0.tgz"; + sha1 = "1fbc1ab0f976ad3f16c5879ba95d4751e9d5bf56"; }; }; "applicationinsights-0.15.12" = { @@ -841,13 +850,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.14.1" = { + "moment-2.15.0" = { name = "moment"; packageName = "moment"; - version = "2.14.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; + sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; }; }; "ms-rest-1.15.0" = { @@ -931,13 +940,13 @@ let sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; - "request-2.69.0" = { + "request-2.74.0" = { name = "request"; packageName = "request"; - version = "2.69.0"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; "ssh-key-to-pem-0.11.0" = { @@ -1003,6 +1012,15 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1138,13 +1156,13 @@ let sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; }; }; - "inherits-2.0.1" = { + "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; "typedarray-0.0.6" = { @@ -1813,13 +1831,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.0" = { + "jsprim-1.3.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"; - sha1 = "ce2e1bef835204b4f3099928c602f8b6ae615650"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; "sshpk-1.10.0" = { @@ -1840,13 +1858,13 @@ let sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }; }; - "json-schema-0.2.2" = { + "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; "verror-1.3.6" = { @@ -1957,15 +1975,6 @@ let sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; }; }; - "azure-common-0.9.12" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.12"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz"; - sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6"; - }; - }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -1975,220 +1984,13 @@ let sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; }; }; - "request-2.45.0" = { - name = "request"; - packageName = "request"; - version = "2.45.0"; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.45.0.tgz"; - sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; - }; - }; - "validator-3.1.0" = { - name = "validator"; - packageName = "validator"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.1.0.tgz"; - sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b"; - }; - }; - "bl-0.9.5" = { - name = "bl"; - packageName = "bl"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; - }; - }; - "caseless-0.6.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "qs-1.2.2" = { - name = "qs"; - packageName = "qs"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "tough-cookie-2.3.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.4.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; - }; - }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; }; }; "extend-1.2.1" = { @@ -2218,6 +2020,15 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; + "request-2.69.0" = { + name = "request"; + packageName = "request"; + version = "2.69.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + }; + }; "jsonparse-1.2.0" = { name = "jsonparse"; packageName = "jsonparse"; @@ -2227,6 +2038,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; + "qs-6.0.2" = { + name = "qs"; + packageName = "qs"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + }; + }; "stack-trace-0.0.9" = { name = "stack-trace"; packageName = "stack-trace"; @@ -2308,24 +2137,6 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; - }; - }; - "qs-6.2.1" = { - name = "qs"; - packageName = "qs"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; - }; - }; "async-0.2.7" = { name = "async"; packageName = "async"; @@ -2497,13 +2308,13 @@ let sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; }; }; - "once-1.3.3" = { + "once-1.4.0" = { name = "once"; packageName = "once"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; "path-is-absolute-1.0.0" = { @@ -2578,22 +2389,31 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; - }; - }; - "qs-6.0.2" = { + "qs-6.2.1" = { name = "qs"; packageName = "qs"; - version = "6.0.2"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + }; + }; + "tough-cookie-2.3.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + }; + }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; "ctype-0.5.2" = { @@ -3028,6 +2848,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "buffer-shims-1.0.0" = { name = "buffer-shims"; packageName = "buffer-shims"; @@ -3127,13 +2956,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.0" = { + "signal-exit-3.0.1" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"; - sha1 = "3c0543b65d7b4fbc60b6cd94593d9bf436739be8"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; "array-find-index-1.0.1" = { @@ -3703,13 +3532,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.3.1" = { + "stream-http-2.4.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; - sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz"; + sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e"; }; }; "subarg-1.0.0" = { @@ -3937,13 +3766,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.4" = { + "pbkdf2-3.0.5" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; - sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.5.tgz"; + sha1 = "10d907817f11d1191c11499bd067f04330a0aec3"; }; }; "public-encrypt-4.0.0" = { @@ -4000,13 +3829,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.2" = { + "cipher-base-1.0.3" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; - sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; }; }; "des.js-1.0.0" = { @@ -4063,13 +3892,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.5" = { + "brorand-1.0.6" = { name = "brorand"; packageName = "brorand"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; - sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; }; }; "hash.js-1.0.3" = { @@ -4288,6 +4117,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "indexof-0.0.1" = { name = "indexof"; packageName = "indexof"; @@ -4981,13 +4819,13 @@ let sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; }; }; - "unzip-response-1.0.0" = { + "unzip-response-1.0.1" = { name = "unzip-response"; packageName = "unzip-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.0.tgz"; - sha1 = "bfda54eeec658f00c2df4d4494b9dca0ca00f3e4"; + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; + sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; }; }; "once-1.2.0" = { @@ -5575,6 +5413,15 @@ let sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }; }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; "hawk-0.10.2" = { name = "hawk"; packageName = "hawk"; @@ -5647,6 +5494,24 @@ let sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; "hoek-0.7.6" = { name = "hoek"; packageName = "hoek"; @@ -5881,13 +5746,13 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "npm-2.15.10" = { + "npm-2.15.11" = { name = "npm"; packageName = "npm"; - version = "2.15.10"; + version = "2.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.10.tgz"; - sha1 = "de5a3dab6dcc0494784c8b8e37bf52ee851f842c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; + sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; }; }; "opener-1.4.1" = { @@ -7042,13 +6907,13 @@ let sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a"; }; }; - "npm-registry-client-7.1.2" = { + "npm-registry-client-7.2.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; - sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz"; + sha1 = "c792266b088cc313f8525e7e35248626c723db75"; }; }; "npm-user-validate-0.1.5" = { @@ -7069,13 +6934,13 @@ let sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; }; }; - "path-is-inside-1.0.1" = { + "path-is-inside-1.0.2" = { name = "path-is-inside"; packageName = "path-is-inside"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; - sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; "read-installed-4.0.3" = { @@ -7096,13 +6961,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.9.0" = { + "retry-0.10.0" = { name = "retry"; packageName = "retry"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; + sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; }; }; "sha-2.0.1" = { @@ -7123,13 +6988,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "sorted-object-2.0.0" = { + "sorted-object-2.0.1" = { name = "sorted-object"; packageName = "sorted-object"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz"; - sha1 = "1cfea981609047d8043807a490a9d99b317faf7f"; + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; }; }; "tar-2.2.1" = { @@ -7312,15 +7177,6 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "retry-0.8.0" = { - name = "retry"; - packageName = "retry"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; - sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; - }; - }; "are-we-there-yet-1.1.2" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -7420,6 +7276,51 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; + "bl-0.9.5" = { + name = "bl"; + packageName = "bl"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + }; + "caseless-0.6.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -7429,6 +7330,105 @@ let sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.4.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; "pegjs-0.9.0" = { name = "pegjs"; packageName = "pegjs"; @@ -7510,13 +7510,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.15" = { + "big-integer-1.6.16" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"; - sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; + sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; }; }; "configstore-1.4.0" = { @@ -8477,13 +8477,13 @@ let sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "cors-2.8.0" = { + "cors-2.8.1" = { name = "cors"; packageName = "cors"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.0.tgz"; - sha1 = "6262888a49f9ce4c5d189d29e1d5710ab73e6a85"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; }; }; "docker-parse-image-3.0.1" = { @@ -8873,13 +8873,13 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "doctrine-1.3.0" = { + "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz"; - sha1 = "13e75682b55518424276f7c173783456ef913d26"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz"; + sha1 = "e2db32defa752407b935b381e89f3740e469e599"; }; }; "escope-3.6.0" = { @@ -8927,13 +8927,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.9.0" = { + "globals-9.10.0" = { name = "globals"; packageName = "globals"; - version = "9.9.0"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.9.0.tgz"; - sha1 = "4c5ffc359fb21edc83fedb87b1c0b414dc24d552"; + url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz"; + sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7"; }; }; "ignore-3.1.5" = { @@ -9053,15 +9053,6 @@ let sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; }; }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; - }; - }; "es6-map-0.1.4" = { name = "es6-map"; packageName = "es6-map"; @@ -11124,13 +11115,13 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-1.2.0" = { + "eventemitter3-2.0.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.0.tgz"; + sha1 = "605f34e75ea702681fcd06b2f4ee2e7b4e019006"; }; }; "escodegen-1.8.1" = { @@ -11304,22 +11295,22 @@ let sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; - "combine-lists-1.0.0" = { + "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.0.tgz"; - sha1 = "e55dee53e5584f232eb59aeb16a7e66c338b5d06"; + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.4.1" = { + "connect-3.5.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; + sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; }; }; "core-js-2.4.1" = { @@ -11448,15 +11439,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "finalhandler-0.4.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; - }; - }; "custom-event-1.0.0" = { name = "custom-event"; packageName = "custom-event"; @@ -11520,6 +11502,15 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -12339,13 +12330,13 @@ let sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07"; }; }; - "glob-stream-5.3.4" = { + "glob-stream-5.3.5" = { name = "glob-stream"; packageName = "glob-stream"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.4.tgz"; - sha1 = "2da166001578c4ee17fd92e4ee15083462ae72fc"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; "gulp-sourcemaps-1.6.0" = { @@ -12420,6 +12411,15 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; + "glob-parent-3.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz"; + sha1 = "c7bdeb5260732196c740de9274c08814056014bb"; + }; + }; "ordered-read-streams-0.3.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -12447,6 +12447,24 @@ let sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; }; }; + "is-glob-3.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz"; + sha1 = "e433c222db9d77844084d72db1eff047845985c1"; + }; + }; + "is-extglob-2.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz"; + sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13"; + }; + }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -12609,6 +12627,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "npm-registry-client-7.1.2" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; + sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + }; + }; "npmconf-2.0.9" = { name = "npmconf"; packageName = "npmconf"; @@ -12654,6 +12681,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "retry-0.8.0" = { + name = "retry"; + packageName = "retry"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; + sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + }; + }; "npmlog-3.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -12915,13 +12951,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.2.1" = { + "es6-promise-3.3.0" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.0.tgz"; + sha1 = "c0859acb27b6804895a6067c981d410e68d2b116"; }; }; "ignore-by-default-1.0.1" = { @@ -14256,13 +14292,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.10.0" = { + "mailcomposer-3.12.0" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.10.0.tgz"; - sha1 = "ce55c7b488ae84520a38f221aa12c4ce526d5168"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; + sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; }; }; "simplesmtp-0.3.35" = { @@ -14274,22 +14310,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.8.0" = { + "buildmail-3.10.0" = { name = "buildmail"; packageName = "buildmail"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.8.0.tgz"; - sha1 = "191b6369710b2bd35a7819edf2cb0b642efd65bf"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; + sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; }; }; - "libmime-2.0.3" = { + "libmime-2.1.0" = { name = "libmime"; packageName = "libmime"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.0.3.tgz"; - sha1 = "55751aa832d31492363df3dd810580dfd59d080c"; + url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; + sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; }; }; "addressparser-1.0.1" = { @@ -14301,22 +14337,22 @@ let sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; }; }; - "nodemailer-fetch-1.4.0" = { + "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.4.0.tgz"; - sha1 = "08a6174f755aba6ad9d88133355a70c1dee4e698"; + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; }; }; - "nodemailer-shared-1.0.5" = { + "nodemailer-shared-1.1.0" = { name = "nodemailer-shared"; packageName = "nodemailer-shared"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.5.tgz"; - sha1 = "6de64484d47944422bb5f0886fffd908ada4ce5e"; + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; "rai-0.1.12" = { @@ -14382,40 +14418,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.3.2" = { + "lodash.clonedeep-4.4.1" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.3.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; + sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; }; }; - "lodash.union-4.4.0" = { + "lodash.union-4.5.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; + sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; }; }; - "lodash.uniq-4.3.0" = { + "lodash.uniq-4.4.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; + sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; }; }; - "lodash.without-4.2.0" = { + "lodash.without-4.3.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; + sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; }; }; "npm-install-checks-3.0.0" = { @@ -14427,6 +14463,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -14445,6 +14490,15 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -14490,33 +14544,6 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; "unique-slug-2.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -14742,13 +14769,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.7" = { + "npm-3.10.8" = { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; }; "npmi-2.0.1" = { @@ -14787,40 +14814,49 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "lodash.clonedeep-4.4.1" = { + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; - }; - }; - "lodash.union-4.5.0" = { - name = "lodash.union"; - packageName = "lodash.union"; version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.uniq-4.4.0" = { + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + }; + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.3.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "airplayer-2.0.0" = { @@ -14940,13 +14976,13 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "single-line-log-1.1.1" = { + "single-line-log-1.1.2" = { name = "single-line-log"; packageName = "single-line-log"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.1.tgz"; - sha1 = "f87743dfdb5519b5fe1dda36edd68f35e3cb5de6"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; "array-flatten-2.1.0" = { @@ -14976,13 +15012,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.0.1" = { + "multicast-dns-6.1.0" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.0.1.tgz"; - sha1 = "069da64a0b695e156ef47c86a94e69e1a17ff2c2"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; + sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -15886,13 +15922,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.2" = { + "openid-2.0.4" = { name = "openid"; packageName = "openid"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.2.tgz"; - sha1 = "10105d793ef59fad19501c51da942f63920875a1"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.4.tgz"; + sha1 = "73486f2862b080cc1a582cfd5d4df61d0274ef60"; }; }; "node-swt-0.1.1" = { @@ -16552,6 +16588,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; "verror-1.3.3" = { name = "verror"; packageName = "verror"; @@ -16795,13 +16840,13 @@ let sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; }; }; - "blueimp-md5-2.3.0" = { + "blueimp-md5-2.3.1" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.0.tgz"; - sha1 = "a0a2207c53c3311fcd44c0ad95c019bf0ef53951"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; + sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; "color-0.11.3" = { @@ -16993,13 +17038,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.4.0" = { + "color-convert-1.5.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.4.0.tgz"; - sha1 = "4ad8f531c31af5d8cbc5a4af2bb6000891d398e1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; + sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; }; }; "color-string-0.3.0" = { @@ -17038,6 +17083,15 @@ let sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; }; }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; "send-0.13.1" = { name = "send"; packageName = "send"; @@ -17191,6 +17245,42 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "lodash.clonedeep-4.3.2" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; + sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + }; + }; + "lodash.union-4.4.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; + sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + }; + }; + "lodash.uniq-4.3.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; + sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + }; + }; + "lodash.without-4.2.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; + sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + }; + }; "node-gyp-3.3.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -17200,6 +17290,33 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "lodash._baseflatten-4.2.1" = { + name = "lodash._baseflatten"; + packageName = "lodash._baseflatten"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; + sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; + }; + }; + "lodash._basedifference-4.5.0" = { + name = "lodash._basedifference"; + packageName = "lodash._basedifference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; + sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17557,10 +17674,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.1.tgz"; - sha1 = "f45de3859d1c84d539e247a98bb1b5356119338c"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz"; + sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d"; }; dependencies = [ sources."colors-0.6.0-1" @@ -17617,7 +17734,7 @@ in sources."os-tmpdir-1.0.1" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -17651,6 +17768,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium MVC Framework"; homepage = "https://github.com/appcelerator/alloy#readme"; @@ -17661,10 +17779,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.3.tgz"; - sha1 = "be426d6bd3b940e0e82e85e13381fd3f6372e8a6"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.4.tgz"; + sha1 = "0f5e9a8a529ac30f0fc8e754513ace91df6b5dae"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17676,7 +17794,7 @@ in dependencies = [ (sources."concat-stream-1.4.10" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-1.1.14" // { dependencies = [ @@ -17750,7 +17868,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -17830,10 +17948,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -17884,82 +18002,20 @@ in sources."azure-arm-hdinsight-0.2.0" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" + sources."azure-arm-iothub-0.1.1" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.13.2" + sources."azure-arm-network-0.16.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" - sources."azure-arm-dns-0.10.1" - (sources."azure-arm-website-0.10.0" // { - dependencies = [ - (sources."azure-common-0.9.12" // { - dependencies = [ - (sources."xml2js-0.2.7" // { - dependencies = [ - sources."sax-0.5.2" - ]; - }) - sources."dateformat-1.0.2-1.2.3" - (sources."request-2.45.0" // { - dependencies = [ - sources."bl-0.9.5" - sources."caseless-0.6.0" - sources."forever-agent-0.5.2" - sources."qs-1.2.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-1.0.2" - sources."node-uuid-1.4.7" - sources."tunnel-agent-0.4.3" - (sources."form-data-0.1.4" // { - dependencies = [ - (sources."combined-stream-0.0.7" // { - dependencies = [ - sources."delayed-stream-0.0.5" - ]; - }) - sources."mime-1.2.11" - sources."async-0.9.2" - ]; - }) - sources."tough-cookie-2.3.1" - (sources."http-signature-0.10.1" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.4.0" - (sources."hawk-1.1.1" // { - dependencies = [ - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" - ]; - }) - sources."validator-3.1.0" - sources."envconf-0.0.4" - sources."duplexer-0.1.1" - ]; - }) - sources."moment-2.6.0" - ]; - }) + sources."azure-arm-dns-0.11.1" + sources."azure-arm-website-0.11.0" sources."azure-arm-rediscache-0.2.1" sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.0.1" sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.10.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -17969,14 +18025,18 @@ in sources."moment-2.6.0" ]; }) - sources."azure-asm-network-0.12.0" + sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.4.5-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" sources."azure-asm-subscription-0.10.1" - sources."azure-asm-website-0.10.4" + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) (sources."azure-storage-1.1.0" // { dependencies = [ sources."extend-1.2.1" @@ -17990,13 +18050,130 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" ]; }) + (sources."request-2.69.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.4.1" + sources."bl-1.0.3" + sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + (sources."async-2.0.1" // { + dependencies = [ + sources."lodash-4.15.0" + ]; + }) + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."is-my-json-valid-2.13.1" // { + dependencies = [ + sources."generate-function-2.0.0" + (sources."generate-object-property-1.2.0" // { + dependencies = [ + sources."is-property-1.0.2" + ]; + }) + sources."jsonpointer-2.0.0" + sources."xtend-4.0.1" + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.0" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.13.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + (sources."bcrypt-pbkdf-1.0.0" // { + dependencies = [ + sources."tweetnacl-0.14.3" + ]; + }) + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."oauth-sign-0.8.2" + sources."qs-6.0.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.2.2" + sources."tunnel-agent-0.4.3" + ]; + }) sources."validator-3.22.2" (sources."xml2js-0.2.7" // { dependencies = [ @@ -18006,7 +18183,7 @@ in ]; }) sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.4.0" + sources."azure-batch-0.5.0" sources."applicationinsights-0.15.12" (sources."caller-id-0.1.0" // { dependencies = [ @@ -18062,140 +18239,9 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.14.1" + sources."moment-2.15.0" (sources."ms-rest-1.15.0" // { dependencies = [ - (sources."request-2.74.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.1" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.13.1" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-2.0.0" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { - dependencies = [ - sources."mime-db-1.23.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."oauth-sign-0.8.2" - sources."qs-6.2.1" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.1" - sources."tunnel-agent-0.4.3" - ]; - }) sources."duplexer-0.1.1" ]; }) @@ -18241,7 +18287,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18252,7 +18298,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -18281,19 +18327,19 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) - (sources."request-2.69.0" // { + (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" - (sources."bl-1.0.3" // { + (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18373,10 +18419,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -18409,9 +18455,9 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.0.2" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" ]; }) @@ -18437,7 +18483,7 @@ in dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -18468,6 +18514,11 @@ in sources."through-2.3.4" sources."tunnel-0.0.2" sources."underscore-1.4.4" + (sources."user-home-2.0.0" // { + dependencies = [ + sources."os-homedir-1.0.1" + ]; + }) sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -18492,6 +18543,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Cross Platform Command Line tool"; homepage = https://github.com/Azure/azure-xplat-cli; @@ -18507,6 +18559,7 @@ in url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; }; + buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; homepage = http://bower.io/; @@ -18517,10 +18570,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; + sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; }; dependencies = [ (sources."argparse-1.0.4" // { @@ -18551,7 +18604,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -18570,7 +18623,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-2.1.1" @@ -18581,7 +18634,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18611,7 +18664,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -18752,7 +18805,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18763,7 +18816,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -18804,7 +18857,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18815,7 +18868,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -18824,6 +18877,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; homepage = https://github.com/rvl/bower2nix; @@ -18899,12 +18953,12 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) (sources."browserify-des-1.0.0" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" (sources."des.js-1.0.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" @@ -18921,7 +18975,7 @@ in sources."browserify-rsa-4.0.1" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -18935,7 +18989,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -18948,7 +19002,7 @@ in sources."bn.js-4.11.6" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -18956,7 +19010,7 @@ in }) (sources."create-hash-1.1.2" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" ]; @@ -18967,12 +19021,12 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" ]; }) ]; }) - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.5" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -18987,7 +19041,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -19020,7 +19074,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19035,7 +19089,7 @@ in }) sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."insert-module-globals-7.0.1" // { dependencies = [ (sources."combine-source-map-0.7.2" // { @@ -19114,7 +19168,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.3.1" // { + (sources."stream-http-2.4.0" // { dependencies = [ sources."builtin-status-codes-2.0.0" sources."to-arraybuffer-1.0.1" @@ -19151,7 +19205,11 @@ in sources."querystring-0.2.0" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) (sources."vm-browserify-0.0.4" // { dependencies = [ sources."indexof-0.0.1" @@ -19159,6 +19217,7 @@ in }) sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; homepage = "https://github.com/substack/node-browserify#readme"; @@ -19273,7 +19332,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -19460,12 +19519,12 @@ in }) (sources."simple-get-2.2.2" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) ]; @@ -19514,7 +19573,7 @@ in }) (sources."random-access-file-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" @@ -19553,7 +19612,7 @@ in (sources."peer-wire-swarm-0.12.1" // { dependencies = [ sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19565,7 +19624,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" @@ -19589,7 +19648,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -19600,7 +19659,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19649,7 +19708,7 @@ in ]; }) sources."ip-1.1.3" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19658,7 +19717,7 @@ in sources."run-series-1.1.4" (sources."simple-get-2.2.2" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) (sources."simple-peer-6.0.7" // { @@ -19706,7 +19765,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."re-emitter-1.1.3" sources."run-parallel-1.1.6" ]; @@ -19810,7 +19869,7 @@ in sources."voc-0.5.0" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -19847,6 +19906,7 @@ in }) sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "commandline chromecast player"; homepage = "https://github.com/xat/castnow#readme"; @@ -19862,6 +19922,7 @@ in url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; }; + buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; homepage = http://coffeescript.org/; @@ -19913,7 +19974,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -19924,7 +19985,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20020,12 +20081,12 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) (sources."browserify-des-1.0.0" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" (sources."des.js-1.0.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" @@ -20042,7 +20103,7 @@ in sources."browserify-rsa-4.0.1" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -20056,7 +20117,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -20069,7 +20130,7 @@ in sources."bn.js-4.11.6" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -20077,7 +20138,7 @@ in }) (sources."create-hash-1.1.2" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" ]; @@ -20088,12 +20149,12 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" ]; }) ]; }) - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.5" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -20108,7 +20169,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -20142,7 +20203,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20161,7 +20222,7 @@ in ]; }) sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."insert-module-globals-6.6.3" // { dependencies = [ (sources."combine-source-map-0.6.1" // { @@ -20276,7 +20337,11 @@ in sources."querystring-0.2.0" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) (sources."vm-browserify-0.0.4" // { dependencies = [ sources."indexof-0.0.1" @@ -20433,7 +20498,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -20444,7 +20509,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20461,7 +20526,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -20472,7 +20537,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20534,7 +20599,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npm-2.15.10" // { + (sources."npm-2.15.11" // { dependencies = [ sources."abbrev-1.0.9" sources."ansi-0.3.1" @@ -20594,7 +20659,7 @@ in sources."graceful-fs-4.1.6" sources."hosted-git-info-2.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" sources."lockfile-1.0.1" (sources."lru-cache-4.0.1" // { @@ -20658,7 +20723,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-1.0.7" sources."npm-package-arg-4.1.1" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -20674,7 +20739,6 @@ in }) ]; }) - sources."retry-0.8.0" ]; }) sources."npm-user-validate-0.1.5" @@ -20695,14 +20759,14 @@ in }) ]; }) - sources."once-1.3.3" + sources."once-1.4.0" (sources."osenv-0.1.3" // { dependencies = [ sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -20819,10 +20883,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -20861,12 +20925,12 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."spdx-license-ids-1.2.2" sources."strip-ansi-3.0.1" sources."tar-2.2.1" @@ -20884,7 +20948,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -20918,7 +20982,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -20995,7 +21059,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21007,7 +21071,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."unorm-1.3.3" @@ -21035,7 +21099,7 @@ in sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -21051,8 +21115,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21168,7 +21232,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -21188,7 +21252,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -21204,7 +21268,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21343,7 +21407,7 @@ in }) (sources."run-async-0.1.0" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21385,7 +21449,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21448,10 +21512,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -21492,6 +21556,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; license = "Apache-2.0"; @@ -21732,12 +21797,13 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; homepage = https://github.com/okTurtles/dnschain; @@ -21762,7 +21828,7 @@ in }) sources."basic-auth-1.0.4" sources."cookie-signature-1.0.6" - (sources."cors-2.8.0" // { + (sources."cors-2.8.1" // { dependencies = [ sources."vary-1.1.0" ]; @@ -21779,7 +21845,7 @@ in }) (sources."from2-1.3.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-1.1.14" // { dependencies = [ sources."core-util-is-1.0.2" @@ -21802,7 +21868,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -21847,7 +21913,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-5.1.1" @@ -21892,7 +21958,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-2.3.2" @@ -21907,7 +21973,7 @@ in sources."xtend-3.0.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ltgt-1.0.2" ]; }) @@ -21924,7 +21990,7 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21957,7 +22023,7 @@ in sources."stream-shift-1.0.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."relative-date-1.1.3" @@ -21975,7 +22041,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -21983,7 +22049,7 @@ in sources."split2-0.2.1" (sources."stream-collector-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21997,7 +22063,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22010,7 +22076,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22026,7 +22092,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -22034,6 +22100,7 @@ in sources."thunky-0.1.0" sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "docker registry server implemented in node"; homepage = https://github.com/mafintosh/docker-registry-server; @@ -22076,7 +22143,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22148,10 +22215,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -22191,6 +22258,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "import and export tools for elasticsearch"; homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; @@ -22201,10 +22269,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.4.0.tgz"; - sha1 = "af5984007bd3f1fb1b3b6b01a0a22eda0ec7a9f4"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.5.0.tgz"; + sha1 = "22fc9f780ea5bca1306fab2b6d3336b0fa62c754"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -22226,7 +22294,7 @@ in }) (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -22244,7 +22312,7 @@ in sources."ms-0.7.1" ]; }) - (sources."doctrine-1.3.0" // { + (sources."doctrine-1.4.0" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -22332,7 +22400,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -22343,7 +22411,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -22351,7 +22419,7 @@ in sources."path-is-absolute-1.0.0" ]; }) - sources."globals-9.9.0" + sources."globals-9.10.0" sources."ignore-3.1.5" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { @@ -22392,7 +22460,7 @@ in }) (sources."run-async-0.1.0" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -22472,7 +22540,7 @@ in sources."fast-levenshtein-1.1.4" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" (sources."require-uncached-1.0.2" // { @@ -22522,6 +22590,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; homepage = http://eslint.org/; @@ -22543,7 +22612,7 @@ in sources."bower-1.7.9" (sources."glob-3.2.11" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-0.3.0" // { dependencies = [ sources."lru-cache-2.7.3" @@ -22553,6 +22622,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; homepage = https://bitbucket.org/shlevy/fetch-bower; @@ -22715,7 +22785,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -22791,7 +22861,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -22913,10 +22983,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -22975,7 +23045,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23114,7 +23184,7 @@ in sources."defined-0.0.0" sources."through-2.3.8" sources."resumer-0.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -23143,7 +23213,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -23154,7 +23224,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23176,6 +23246,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; homepage = "https://github.com/foreverjs/forever#readme"; @@ -23199,6 +23270,7 @@ in }) sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; + buildInputs = globalBuildInputs; meta = { description = "A tool for managing multiple git repositories"; homepage = "https://github.com/mixu/gr#readme"; @@ -23224,7 +23296,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -23235,7 +23307,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23253,6 +23325,7 @@ in }) sources."resolve-1.1.7" ]; + buildInputs = globalBuildInputs; meta = { description = "The grunt command line interface"; homepage = "https://github.com/gruntjs/grunt-cli#readme"; @@ -23424,6 +23497,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "See a representation of the Guifi.net network in Google Earth."; homepage = https://github.com/jmendeth/guifi-earth; @@ -23481,7 +23555,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -23636,7 +23710,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -23650,7 +23724,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -23774,7 +23848,7 @@ in sources."os-tmpdir-1.0.1" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -23877,8 +23951,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23952,7 +24026,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."xtend-4.0.1" @@ -23967,6 +24041,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "The streaming build system"; homepage = http://gulpjs.com/; @@ -23985,13 +24060,14 @@ in dependencies = [ (sources."http-proxy-1.0.2" // { dependencies = [ - sources."eventemitter3-1.2.0" + sources."eventemitter3-2.0.0" ]; }) sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Complete high-scaled reverse-proxy solution"; homepage = https://github.com/dotcloud/hipache; @@ -24038,7 +24114,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -24132,7 +24208,7 @@ in ]; }) sources."nopt-3.0.6" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -24143,13 +24219,14 @@ in sources."has-flag-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) sources."wordwrap-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; homepage = "https://github.com/gotwarlost/istanbul#readme"; @@ -24168,6 +24245,7 @@ in dependencies = [ sources."when-3.4.6" ]; + buildInputs = globalBuildInputs; meta = { description = "A comprehensive JSON Schema validator for Node.js"; homepage = https://github.com/natesilva/jayschema; @@ -24194,8 +24272,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -24230,7 +24308,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."entities-1.0.0" @@ -24250,6 +24328,7 @@ in sources."strip-json-comments-1.0.4" sources."lodash-3.7.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; @@ -24265,6 +24344,7 @@ in url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; homepage = https://github.com/trentm/json; @@ -24279,6 +24359,7 @@ in url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging JSON on the command line"; homepage = https://github.com/trentm/json; @@ -24301,6 +24382,7 @@ in }) sources."esprima-2.7.3" ]; + buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; homepage = https://github.com/nodeca/js-yaml; @@ -24311,10 +24393,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.2.0.tgz"; - sha1 = "6dca89ec25f4753f120f834c89398098040fd63e"; + url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; + sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; }; dependencies = [ sources."bluebird-3.4.6" @@ -24436,7 +24518,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -24502,7 +24584,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -24624,10 +24706,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -24707,19 +24789,19 @@ in ]; }) sources."colors-1.1.2" - (sources."combine-lists-1.0.0" // { + (sources."combine-lists-1.0.1" // { dependencies = [ sources."lodash-4.15.0" ]; }) - (sources."connect-3.4.1" // { + (sources."connect-3.5.0" // { dependencies = [ (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" ]; }) - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-0.5.0" // { dependencies = [ sources."escape-html-1.0.3" (sources."on-finished-2.3.0" // { @@ -24727,6 +24809,7 @@ in sources."ee-first-1.1.1" ]; }) + sources."statuses-1.3.0" sources."unpipe-1.0.0" ]; }) @@ -24768,8 +24851,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -24793,7 +24876,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-4.3.6" @@ -24817,6 +24900,7 @@ in ]; }) sources."qjobs-1.1.5" + sources."range-parser-1.2.0" sources."rimraf-2.5.4" (sources."socket.io-1.4.7" // { dependencies = [ @@ -24966,6 +25050,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; homepage = http://karma-runner.github.io/; @@ -25085,7 +25170,7 @@ in }) (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."statuses-1.3.0" ]; }) @@ -25110,7 +25195,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -25207,7 +25292,7 @@ in sources."destroy-1.0.3" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -25268,6 +25353,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; license = "MIT"; @@ -25288,7 +25374,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25318,11 +25404,11 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."stream-shift-1.0.0" ]; }) - (sources."glob-stream-5.3.4" // { + (sources."glob-stream-5.3.5" // { dependencies = [ sources."extend-3.0.0" (sources."glob-5.0.15" // { @@ -25332,7 +25418,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -25343,7 +25429,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -25351,11 +25437,11 @@ in sources."path-is-absolute-1.0.0" ]; }) - (sources."glob-parent-2.0.0" // { + (sources."glob-parent-3.0.0" // { dependencies = [ - (sources."is-glob-2.0.1" // { + (sources."is-glob-3.0.0" // { dependencies = [ - sources."is-extglob-1.0.0" + sources."is-extglob-2.0.0" ]; }) ]; @@ -25417,7 +25503,11 @@ in }) (sources."parse-glob-3.0.4" // { dependencies = [ - sources."glob-base-0.3.0" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + ]; + }) sources."is-dotfile-1.0.2" ]; }) @@ -25441,7 +25531,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."xtend-4.0.1" @@ -25487,7 +25577,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25513,6 +25603,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; homepage = https://github.com/mweibel/lcov-result-merger; @@ -25560,6 +25651,7 @@ in sources."mkdirp-0.3.0" sources."node.extend-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; homepage = https://bitbucket.org/aahmed/meat; @@ -25578,6 +25670,7 @@ in sources."optparse-1.0.5" sources."slasp-0.0.4" ]; + buildInputs = globalBuildInputs; meta = { description = "An internal DSL for the Nix package manager in JavaScript"; homepage = https://github.com/svanderburg/nijs; @@ -25588,10 +25681,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.0.1.tgz"; - sha1 = "de96ccbd0228983e788d68b9792836964614548c"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; + sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; }; dependencies = [ sources."optparse-1.0.5" @@ -25601,7 +25694,7 @@ in sources."chownr-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -25646,7 +25739,7 @@ in sources."semver-5.3.0" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -25660,7 +25753,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25740,10 +25833,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -25793,7 +25886,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -25819,7 +25912,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25835,7 +25928,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -25870,7 +25963,7 @@ in sources."proto-list-1.2.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -25928,7 +26021,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -25940,7 +26033,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."temp-0.8.3" // { @@ -25974,6 +26067,7 @@ in sources."slasp-0.0.4" sources."nijs-0.0.23" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; @@ -25991,7 +26085,7 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."glob-7.0.6" // { @@ -26002,8 +26096,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -26041,7 +26135,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26057,7 +26151,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -26121,7 +26215,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26201,10 +26295,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -26248,15 +26342,16 @@ in (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; homepage = "https://github.com/nodejs/node-gyp#readme"; @@ -26321,7 +26416,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) (sources."meow-3.7.0" // { @@ -26339,7 +26434,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -26540,7 +26635,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26551,7 +26646,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -26605,7 +26700,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26621,7 +26716,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -26656,7 +26751,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26736,10 +26831,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -26788,7 +26883,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26799,7 +26894,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -26817,7 +26912,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -26825,12 +26920,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26852,7 +26947,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26890,7 +26985,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26906,7 +27001,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -26941,7 +27036,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27021,10 +27116,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -27073,7 +27168,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27084,7 +27179,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27102,7 +27197,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -27110,12 +27205,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27137,7 +27232,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27151,7 +27246,7 @@ in }) ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -27209,6 +27304,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; homepage = http://github.com/node-inspector/node-inspector; @@ -27243,7 +27339,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27259,7 +27355,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -27302,7 +27398,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27382,10 +27478,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -27434,7 +27530,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27445,7 +27541,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27464,7 +27560,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -27477,12 +27573,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27504,7 +27600,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27515,6 +27611,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon binary install tool"; homepage = "https://github.com/mapbox/node-pre-gyp#readme"; @@ -27608,7 +27705,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -27675,7 +27772,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -27797,10 +27894,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -27849,7 +27946,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27906,7 +28003,7 @@ in sources."ms-0.7.1" ]; }) - sources."es6-promise-3.2.1" + sources."es6-promise-3.3.0" sources."ignore-by-default-1.0.1" (sources."lodash.defaults-3.1.2" // { dependencies = [ @@ -28036,7 +28133,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -28056,7 +28153,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -28072,7 +28169,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28126,6 +28223,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; homepage = http://nodemon.io/; @@ -28204,7 +28302,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."entities-1.0.0" @@ -28234,7 +28332,7 @@ in dependencies = [ (sources."moment-timezone-0.3.1" // { dependencies = [ - sources."moment-2.14.1" + sources."moment-2.15.0" ]; }) ]; @@ -28343,7 +28441,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -28354,7 +28452,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -28416,7 +28514,7 @@ in ]; }) sources."help-me-0.1.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimist-1.2.0" (sources."mqtt-connection-2.1.1" // { dependencies = [ @@ -28431,7 +28529,7 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -28656,7 +28754,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -28668,7 +28766,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28863,7 +28961,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -28881,7 +28979,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28915,10 +29013,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -29035,7 +29133,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29051,7 +29149,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -29094,7 +29192,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29174,10 +29272,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -29226,7 +29324,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -29237,7 +29335,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -29255,7 +29353,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -29263,12 +29361,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -29290,7 +29388,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29345,6 +29443,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A visual tool for wiring the Internet of Things"; homepage = http://nodered.org/; @@ -29431,14 +29530,14 @@ in sources."natives-1.1.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-1.0.0" // { dependencies = [ sources."lru-cache-2.7.3" sources."sigmund-1.0.1" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -29480,18 +29579,18 @@ in sources."moment-2.1.0" (sources."nodemailer-0.3.35" // { dependencies = [ - (sources."mailcomposer-3.10.0" // { + (sources."mailcomposer-3.12.0" // { dependencies = [ - (sources."buildmail-3.8.0" // { + (sources."buildmail-3.10.0" // { dependencies = [ sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" - sources."nodemailer-fetch-1.4.0" - sources."nodemailer-shared-1.0.5" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" ]; }) - (sources."libmime-2.0.3" // { + (sources."libmime-2.1.0" // { dependencies = [ sources."iconv-lite-0.4.13" sources."libbase64-0.1.0" @@ -29535,6 +29634,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Remote monitoring for HTTP applications"; license = "MIT"; @@ -29544,10 +29644,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.6"; + version = "3.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.6.tgz"; - sha1 = "a2a3d39b9e93c2afb7ca1328e39ef72ba451dd1e"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; + sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; }; dependencies = [ sources."abbrev-1.0.9" @@ -29620,7 +29720,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -29649,28 +29749,10 @@ in sources."lodash._root-3.0.1" ]; }) - (sources."lodash.clonedeep-4.3.2" // { - dependencies = [ - sources."lodash._baseclone-4.5.7" - ]; - }) - (sources."lodash.union-4.4.0" // { - dependencies = [ - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - ]; - }) - sources."lodash.uniq-4.3.0" - (sources."lodash.without-4.2.0" // { - dependencies = [ - (sources."lodash._basedifference-4.5.0" // { - dependencies = [ - sources."lodash._root-3.0.1" - ]; - }) - sources."lodash.rest-4.0.5" - ]; - }) + sources."lodash.clonedeep-4.4.1" + sources."lodash.union-4.5.0" + sources."lodash.uniq-4.4.0" + sources."lodash.without-4.3.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -29759,7 +29841,7 @@ in dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -29781,14 +29863,14 @@ in ]; }) sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -29836,7 +29918,7 @@ in ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.72.0" // { + (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -29915,10 +29997,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -29951,9 +30033,9 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" ]; }) @@ -29962,7 +30044,7 @@ in sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -29983,7 +30065,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -30011,6 +30093,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; homepage = https://docs.npmjs.com/; @@ -30046,7 +30129,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -30126,10 +30209,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -30183,7 +30266,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -30194,7 +30277,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -30215,7 +30298,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -30231,7 +30314,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -30285,7 +30368,7 @@ in sources."inherits-1.0.2" (sources."block-stream-0.0.9" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-0.1.31" // { @@ -30295,7 +30378,7 @@ in sources."natives-1.1.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30321,7 +30404,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -30365,6 +30448,7 @@ in sources."findit-1.2.0" sources."coffee-script-1.10.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; homepage = https://github.com/NixOS/npm2nix; @@ -30432,7 +30516,7 @@ in sources."lodash-4.15.0" ]; }) - (sources."npm-3.10.7" // { + (sources."npm-3.10.8" // { dependencies = [ sources."abbrev-1.0.9" sources."ansicolors-0.3.2" @@ -30465,7 +30549,7 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - (sources."fstream-npm-1.1.1" // { + (sources."fstream-npm-1.2.0" // { dependencies = [ (sources."fstream-ignore-1.0.5" // { dependencies = [ @@ -30504,7 +30588,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -30533,10 +30617,10 @@ in sources."lodash._root-3.0.1" ]; }) - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30554,6 +30638,39 @@ in }) ]; }) + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) (sources."path-array-1.0.1" // { dependencies = [ (sources."array-index-1.0.0" // { @@ -30593,7 +30710,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -30609,11 +30726,43 @@ in }) ]; }) - sources."retry-0.8.0" + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.0" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -30625,7 +30774,7 @@ in dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -30646,15 +30795,15 @@ in sources."set-blocking-2.0.0" ]; }) - sources."once-1.3.3" - sources."opener-1.4.1" + sources."once-1.4.0" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -30763,10 +30912,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -30805,12 +30954,11 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" - sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -30831,13 +30979,13 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -30918,7 +31066,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -30938,7 +31086,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -30954,7 +31102,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -31004,6 +31152,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; @@ -31031,12 +31180,12 @@ in }) (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -31077,7 +31226,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31105,7 +31254,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."single-line-log-1.1.1" // { + (sources."single-line-log-1.1.2" // { dependencies = [ (sources."string-width-1.0.2" // { dependencies = [ @@ -31140,7 +31289,7 @@ in sources."buffer-indexof-1.0.2" ]; }) - (sources."multicast-dns-6.0.1" // { + (sources."multicast-dns-6.1.0" // { dependencies = [ (sources."dns-packet-1.1.0" // { dependencies = [ @@ -31170,7 +31319,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -31354,12 +31503,12 @@ in }) (sources."simple-get-2.2.2" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) ]; @@ -31409,7 +31558,7 @@ in }) (sources."random-access-file-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" @@ -31448,7 +31597,7 @@ in (sources."peer-wire-swarm-0.12.1" // { dependencies = [ sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31460,7 +31609,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" @@ -31484,7 +31633,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -31495,7 +31644,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31545,7 +31694,7 @@ in }) sources."ip-1.1.3" sources."minimist-1.2.0" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31554,7 +31703,7 @@ in sources."run-series-1.1.4" (sources."simple-get-2.2.2" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) (sources."simple-peer-6.0.7" // { @@ -31607,7 +31756,7 @@ in sources."ms-0.7.1" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."re-emitter-1.1.3" sources."run-parallel-1.1.6" ]; @@ -31618,6 +31767,7 @@ in sources."windows-no-runnable-0.0.6" sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; homepage = https://github.com/mafintosh/peerflix; @@ -31643,7 +31793,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -31732,7 +31882,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -31770,8 +31920,16 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - sources."end-of-stream-1.1.0" - (sources."once-1.3.3" // { + (sources."end-of-stream-1.1.0" // { + dependencies = [ + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31879,7 +32037,7 @@ in sources."ms-0.7.1" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-ip-1.0.0" // { dependencies = [ sources."ip-regex-1.0.3" @@ -31887,7 +32045,7 @@ in }) sources."k-bucket-0.5.0" sources."network-address-1.1.0" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31895,7 +32053,7 @@ in sources."run-parallel-1.1.6" (sources."simple-get-1.4.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."xtend-4.0.1" ]; }) @@ -31917,8 +32075,8 @@ in ]; }) sources."extend.js-0.0.2" - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31931,7 +32089,7 @@ in sources."run-series-1.1.4" (sources."simple-get-1.4.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."xtend-4.0.1" ]; }) @@ -32001,14 +32159,14 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" ]; }) sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32027,7 +32185,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32038,7 +32196,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32058,7 +32216,7 @@ in sources."lodash-4.15.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -32066,6 +32224,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for node.js with web ui."; homepage = "https://github.com/asapach/peerflix-server#readme"; @@ -32086,7 +32245,7 @@ in dependencies = [ (sources."concat-stream-1.5.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -32132,7 +32291,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32143,7 +32302,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32173,7 +32332,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32207,10 +32366,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -32301,12 +32460,13 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Headless WebKit with JS API"; homepage = https://github.com/Medium/phantomjs; @@ -32343,7 +32503,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32354,7 +32514,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32392,6 +32552,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; homepage = https://facebook.github.io/react; @@ -32443,7 +32604,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -32495,7 +32656,7 @@ in sources."fresh-0.1.0" ]; }) - (sources."openid-2.0.2" // { + (sources."openid-2.0.4" // { dependencies = [ (sources."request-2.74.0" // { dependencies = [ @@ -32506,7 +32667,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32586,10 +32747,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -32653,6 +32814,7 @@ in }) sources."crypto-0.0.3" ]; + buildInputs = globalBuildInputs; meta = { }; production = true; @@ -32665,6 +32827,7 @@ in url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; + buildInputs = globalBuildInputs; meta = { description = "The semantic version parser used by npm."; homepage = "https://github.com/npm/node-semver#readme"; @@ -32742,7 +32905,7 @@ in sources."destroy-1.0.3" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -32759,7 +32922,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -32884,7 +33047,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32959,10 +33122,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -33029,7 +33192,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33040,7 +33203,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33053,7 +33216,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.14.1" + sources."moment-2.15.0" ]; }) (sources."handlebars-2.0.0" // { @@ -33108,7 +33271,7 @@ in ]; }) sources."entities-1.1.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -33152,7 +33315,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fs-ext-0.5.0" // { @@ -33166,6 +33329,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Private npm repository server"; homepage = https://github.com/rlidwka/sinopia; @@ -33213,7 +33377,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33224,6 +33388,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "sloc is a simple tool to count SLOC (source lines of code)"; homepage = "https://github.com/flosse/sloc#readme"; @@ -33275,7 +33440,7 @@ in sources."mime-1.3.4" sources."negotiator-0.5.3" sources."node-uuid-1.4.7" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33331,7 +33496,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33342,7 +33507,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33366,10 +33531,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -33383,7 +33548,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33442,6 +33607,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Client SDK and CLI for the Joyent SmartDataCenter API"; homepage = "https://github.com/joyent/node-smartdc#readme"; @@ -33477,7 +33643,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33488,7 +33654,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33502,6 +33668,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Robust, expressive, and feature-rich CSS superset"; homepage = https://github.com/stylus/stylus; @@ -33568,6 +33735,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; homepage = https://github.com/svg/svgo; @@ -33625,7 +33793,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33750,7 +33918,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33867,6 +34035,7 @@ in }) sources."wrench-1.5.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium Command line"; homepage = "https://github.com/appcelerator/titanium#readme"; @@ -33882,6 +34051,7 @@ in url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; }; + buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; homepage = http://typescriptlang.org/; @@ -33945,6 +34115,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; homepage = http://lisperator.net/uglifyjs; @@ -33963,7 +34134,7 @@ in dependencies = [ sources."async-2.0.1" sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.0" + sources."blueimp-md5-2.3.1" (sources."body-parser-1.15.2" // { dependencies = [ sources."bytes-2.4.0" @@ -34008,7 +34179,7 @@ in (sources."color-0.11.3" // { dependencies = [ sources."clone-1.0.2" - sources."color-convert-1.4.0" + sources."color-convert-1.5.0" (sources."color-string-0.3.0" // { dependencies = [ sources."color-name-1.1.1" @@ -34081,7 +34252,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -34337,7 +34508,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -34468,13 +34639,13 @@ in ]; }) sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -34593,10 +34764,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -34638,7 +34809,7 @@ in sources."retry-0.9.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -34659,7 +34830,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -34693,7 +34864,7 @@ in sources."chownr-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -34732,7 +34903,7 @@ in sources."hosted-git-info-2.1.5" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -34746,7 +34917,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -34818,10 +34989,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -34871,7 +35042,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -34887,7 +35058,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -34955,7 +35126,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -34966,7 +35137,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -34990,7 +35161,7 @@ in sources."fresh-0.3.0" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -35178,7 +35349,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -35366,6 +35537,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; @@ -35393,7 +35565,7 @@ in sources."ini-1.3.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."once-1.3.3" // { dependencies = [ sources."wrappy-1.0.2" @@ -35415,7 +35587,7 @@ in dependencies = [ (sources."concat-stream-1.5.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -35461,7 +35633,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -35472,7 +35644,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -35502,7 +35674,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -35536,10 +35708,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -35630,7 +35802,7 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -35648,6 +35820,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; homepage = https://github.com/uxebu/webdrvr; @@ -35693,7 +35866,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -35740,7 +35913,7 @@ in (sources."http-browserify-1.7.0" // { dependencies = [ sources."Base64-0.2.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."https-browserify-0.0.0" @@ -35753,12 +35926,12 @@ in dependencies = [ sources."core-util-is-1.0.2" sources."isarray-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."stream-browserify-1.0.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."string_decoder-0.10.31" @@ -35924,7 +36097,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -35995,7 +36168,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -36117,10 +36290,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -36179,7 +36352,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -36255,6 +36428,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; @@ -36270,6 +36444,7 @@ in url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; }; + buildInputs = globalBuildInputs; meta = { description = "Extract content from websites using CSS Selectors and XPath"; homepage = "https://github.com/osener/wring#readme"; diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index 8527dbf02e1..9e8bf6f9935 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.10" = { + "which-1.2.11" = { name = "which"; packageName = "which"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.10.tgz"; - sha1 = "91cd9bd0751322411b659b40f054b21de957ab2d"; + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; "os-homedir-1.0.1" = { @@ -463,6 +463,15 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; + "azure-arm-iothub-0.1.1" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; + sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + }; + }; "azure-arm-servermanagement-0.1.2" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; @@ -472,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.13.2" = { + "azure-arm-network-0.16.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.13.2"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.13.2.tgz"; - sha1 = "c1f798e5de97295aa0def2cb7f49c53f258d12b0"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.16.0.tgz"; + sha1 = "df1bd296fb52742af7596db025cbdd1491391f3d"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -499,22 +508,22 @@ let sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; }; }; - "azure-arm-dns-0.10.1" = { + "azure-arm-dns-0.11.1" = { name = "azure-arm-dns"; packageName = "azure-arm-dns"; - version = "0.10.1"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz"; - sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; + sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; }; }; - "azure-arm-website-0.10.0" = { + "azure-arm-website-0.11.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz"; - sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz"; + sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79"; }; }; "azure-arm-rediscache-0.2.1" = { @@ -571,13 +580,13 @@ let sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "azure-keyvault-0.10.1" = { + "azure-keyvault-0.10.2" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz"; - sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz"; + sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5"; }; }; "azure-asm-compute-0.17.0" = { @@ -625,13 +634,13 @@ let sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; }; }; - "azure-asm-network-0.12.0" = { + "azure-asm-network-0.13.0" = { name = "azure-asm-network"; packageName = "azure-asm-network"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.12.0.tgz"; - sha1 = "f407498dcf4a41e2a674fba23597157370a6ac05"; + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; "azure-arm-resource-1.4.5-preview" = { @@ -715,13 +724,13 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.4.0" = { + "azure-batch-0.5.0" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.4.0.tgz"; - sha1 = "065e3fb7ab3e7bb33a254e5cd2d15a23edc7cf40"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.0.tgz"; + sha1 = "1fbc1ab0f976ad3f16c5879ba95d4751e9d5bf56"; }; }; "applicationinsights-0.15.12" = { @@ -841,13 +850,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.14.1" = { + "moment-2.15.0" = { name = "moment"; packageName = "moment"; - version = "2.14.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; + sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; }; }; "ms-rest-1.15.0" = { @@ -931,13 +940,13 @@ let sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; - "request-2.69.0" = { + "request-2.74.0" = { name = "request"; packageName = "request"; - version = "2.69.0"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; "ssh-key-to-pem-0.11.0" = { @@ -1003,6 +1012,15 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1138,13 +1156,13 @@ let sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; }; }; - "inherits-2.0.1" = { + "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; "typedarray-0.0.6" = { @@ -1813,13 +1831,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.0" = { + "jsprim-1.3.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"; - sha1 = "ce2e1bef835204b4f3099928c602f8b6ae615650"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; "sshpk-1.10.0" = { @@ -1840,13 +1858,13 @@ let sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }; }; - "json-schema-0.2.2" = { + "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; "verror-1.3.6" = { @@ -1957,15 +1975,6 @@ let sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; }; }; - "azure-common-0.9.12" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.12"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz"; - sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6"; - }; - }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -1975,211 +1984,13 @@ let sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; }; }; - "request-2.45.0" = { - name = "request"; - packageName = "request"; - version = "2.45.0"; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.45.0.tgz"; - sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; - }; - }; - "validator-3.1.0" = { - name = "validator"; - packageName = "validator"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.1.0.tgz"; - sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b"; - }; - }; - "bl-0.9.5" = { - name = "bl"; - packageName = "bl"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; - }; - }; - "caseless-0.6.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "qs-1.2.2" = { - name = "qs"; - packageName = "qs"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.4.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; - }; - }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; }; }; "extend-1.2.1" = { @@ -2209,6 +2020,15 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; + "request-2.69.0" = { + name = "request"; + packageName = "request"; + version = "2.69.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + }; + }; "jsonparse-1.2.0" = { name = "jsonparse"; packageName = "jsonparse"; @@ -2218,6 +2038,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; + "qs-6.0.2" = { + name = "qs"; + packageName = "qs"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + }; + }; "stack-trace-0.0.9" = { name = "stack-trace"; packageName = "stack-trace"; @@ -2299,33 +2137,6 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; - }; - }; - "qs-6.2.1" = { - name = "qs"; - packageName = "qs"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; - }; - }; - "tough-cookie-2.3.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; - }; - }; "async-0.2.7" = { name = "async"; packageName = "async"; @@ -2497,13 +2308,13 @@ let sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; }; }; - "once-1.3.3" = { + "once-1.4.0" = { name = "once"; packageName = "once"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; "path-is-absolute-1.0.0" = { @@ -2578,22 +2389,31 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; - }; - }; - "qs-6.0.2" = { + "qs-6.2.1" = { name = "qs"; packageName = "qs"; - version = "6.0.2"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + }; + }; + "tough-cookie-2.3.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + }; + }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; "ctype-0.5.2" = { @@ -3010,6 +2830,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "buffer-shims-1.0.0" = { name = "buffer-shims"; packageName = "buffer-shims"; @@ -3109,13 +2938,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.0" = { + "signal-exit-3.0.1" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"; - sha1 = "3c0543b65d7b4fbc60b6cd94593d9bf436739be8"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; "array-find-index-1.0.1" = { @@ -3694,13 +3523,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.3.1" = { + "stream-http-2.4.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; - sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz"; + sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e"; }; }; "subarg-1.0.0" = { @@ -3928,13 +3757,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.4" = { + "pbkdf2-3.0.5" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; - sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.5.tgz"; + sha1 = "10d907817f11d1191c11499bd067f04330a0aec3"; }; }; "public-encrypt-4.0.0" = { @@ -3991,13 +3820,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.2" = { + "cipher-base-1.0.3" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; - sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; }; }; "des.js-1.0.0" = { @@ -4054,13 +3883,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.5" = { + "brorand-1.0.6" = { name = "brorand"; packageName = "brorand"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; - sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; }; }; "hash.js-1.0.3" = { @@ -4279,6 +4108,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "indexof-0.0.1" = { name = "indexof"; packageName = "indexof"; @@ -4972,13 +4810,13 @@ let sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; }; }; - "unzip-response-1.0.0" = { + "unzip-response-1.0.1" = { name = "unzip-response"; packageName = "unzip-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.0.tgz"; - sha1 = "bfda54eeec658f00c2df4d4494b9dca0ca00f3e4"; + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; + sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; }; }; "once-1.2.0" = { @@ -5566,6 +5404,15 @@ let sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }; }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; "hawk-0.10.2" = { name = "hawk"; packageName = "hawk"; @@ -5638,6 +5485,24 @@ let sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; "hoek-0.7.6" = { name = "hoek"; packageName = "hoek"; @@ -5881,13 +5746,13 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "npm-2.15.10" = { + "npm-2.15.11" = { name = "npm"; packageName = "npm"; - version = "2.15.10"; + version = "2.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.10.tgz"; - sha1 = "de5a3dab6dcc0494784c8b8e37bf52ee851f842c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; + sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; }; }; "opener-1.4.1" = { @@ -7042,13 +6907,13 @@ let sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a"; }; }; - "npm-registry-client-7.1.2" = { + "npm-registry-client-7.2.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; - sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz"; + sha1 = "c792266b088cc313f8525e7e35248626c723db75"; }; }; "npm-user-validate-0.1.5" = { @@ -7069,13 +6934,13 @@ let sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; }; }; - "path-is-inside-1.0.1" = { + "path-is-inside-1.0.2" = { name = "path-is-inside"; packageName = "path-is-inside"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; - sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; "read-installed-4.0.3" = { @@ -7096,13 +6961,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.9.0" = { + "retry-0.10.0" = { name = "retry"; packageName = "retry"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; + sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; }; }; "sha-2.0.1" = { @@ -7123,13 +6988,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "sorted-object-2.0.0" = { + "sorted-object-2.0.1" = { name = "sorted-object"; packageName = "sorted-object"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz"; - sha1 = "1cfea981609047d8043807a490a9d99b317faf7f"; + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; }; }; "tar-2.2.1" = { @@ -7312,15 +7177,6 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "retry-0.8.0" = { - name = "retry"; - packageName = "retry"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; - sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; - }; - }; "are-we-there-yet-1.1.2" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -7420,6 +7276,51 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; + "bl-0.9.5" = { + name = "bl"; + packageName = "bl"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + }; + "caseless-0.6.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -7429,6 +7330,105 @@ let sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.4.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; "pegjs-0.9.0" = { name = "pegjs"; packageName = "pegjs"; @@ -7501,13 +7501,13 @@ let sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; - "big-integer-1.6.15" = { + "big-integer-1.6.16" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"; - sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; + sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; }; }; "configstore-1.4.0" = { @@ -8459,13 +8459,13 @@ let sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "cors-2.8.0" = { + "cors-2.8.1" = { name = "cors"; packageName = "cors"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.0.tgz"; - sha1 = "6262888a49f9ce4c5d189d29e1d5710ab73e6a85"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; }; }; "docker-parse-image-3.0.1" = { @@ -8855,13 +8855,13 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "doctrine-1.3.0" = { + "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz"; - sha1 = "13e75682b55518424276f7c173783456ef913d26"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz"; + sha1 = "e2db32defa752407b935b381e89f3740e469e599"; }; }; "escope-3.6.0" = { @@ -8909,13 +8909,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.9.0" = { + "globals-9.10.0" = { name = "globals"; packageName = "globals"; - version = "9.9.0"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.9.0.tgz"; - sha1 = "4c5ffc359fb21edc83fedb87b1c0b414dc24d552"; + url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz"; + sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7"; }; }; "ignore-3.1.5" = { @@ -9035,15 +9035,6 @@ let sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; }; }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; - }; - }; "es6-map-0.1.4" = { name = "es6-map"; packageName = "es6-map"; @@ -11106,13 +11097,13 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-1.2.0" = { + "eventemitter3-2.0.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.0.tgz"; + sha1 = "605f34e75ea702681fcd06b2f4ee2e7b4e019006"; }; }; "escodegen-1.8.1" = { @@ -11286,22 +11277,22 @@ let sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; - "combine-lists-1.0.0" = { + "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.0.tgz"; - sha1 = "e55dee53e5584f232eb59aeb16a7e66c338b5d06"; + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.4.1" = { + "connect-3.5.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; + sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; }; }; "core-js-2.4.1" = { @@ -11430,15 +11421,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "finalhandler-0.4.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; - }; - }; "custom-event-1.0.0" = { name = "custom-event"; packageName = "custom-event"; @@ -11502,6 +11484,15 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -12321,13 +12312,13 @@ let sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07"; }; }; - "glob-stream-5.3.4" = { + "glob-stream-5.3.5" = { name = "glob-stream"; packageName = "glob-stream"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.4.tgz"; - sha1 = "2da166001578c4ee17fd92e4ee15083462ae72fc"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; "gulp-sourcemaps-1.6.0" = { @@ -12402,6 +12393,15 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; + "glob-parent-3.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz"; + sha1 = "c7bdeb5260732196c740de9274c08814056014bb"; + }; + }; "ordered-read-streams-0.3.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -12429,6 +12429,24 @@ let sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; }; }; + "is-glob-3.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz"; + sha1 = "e433c222db9d77844084d72db1eff047845985c1"; + }; + }; + "is-extglob-2.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz"; + sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13"; + }; + }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -12591,6 +12609,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "npm-registry-client-7.1.2" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; + sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + }; + }; "npmconf-2.0.9" = { name = "npmconf"; packageName = "npmconf"; @@ -12636,6 +12663,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "retry-0.8.0" = { + name = "retry"; + packageName = "retry"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; + sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + }; + }; "npmlog-3.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -12897,13 +12933,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.2.1" = { + "es6-promise-3.3.0" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.0.tgz"; + sha1 = "c0859acb27b6804895a6067c981d410e68d2b116"; }; }; "ignore-by-default-1.0.1" = { @@ -14247,13 +14283,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.10.0" = { + "mailcomposer-3.12.0" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.10.0.tgz"; - sha1 = "ce55c7b488ae84520a38f221aa12c4ce526d5168"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; + sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; }; }; "simplesmtp-0.3.35" = { @@ -14265,22 +14301,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.8.0" = { + "buildmail-3.10.0" = { name = "buildmail"; packageName = "buildmail"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.8.0.tgz"; - sha1 = "191b6369710b2bd35a7819edf2cb0b642efd65bf"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; + sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; }; }; - "libmime-2.0.3" = { + "libmime-2.1.0" = { name = "libmime"; packageName = "libmime"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.0.3.tgz"; - sha1 = "55751aa832d31492363df3dd810580dfd59d080c"; + url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; + sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; }; }; "addressparser-1.0.1" = { @@ -14292,22 +14328,22 @@ let sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; }; }; - "nodemailer-fetch-1.4.0" = { + "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.4.0.tgz"; - sha1 = "08a6174f755aba6ad9d88133355a70c1dee4e698"; + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; }; }; - "nodemailer-shared-1.0.5" = { + "nodemailer-shared-1.1.0" = { name = "nodemailer-shared"; packageName = "nodemailer-shared"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.5.tgz"; - sha1 = "6de64484d47944422bb5f0886fffd908ada4ce5e"; + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; "rai-0.1.12" = { @@ -14373,40 +14409,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.3.2" = { + "lodash.clonedeep-4.4.1" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.3.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; + sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; }; }; - "lodash.union-4.4.0" = { + "lodash.union-4.5.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; + sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; }; }; - "lodash.uniq-4.3.0" = { + "lodash.uniq-4.4.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; + sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; }; }; - "lodash.without-4.2.0" = { + "lodash.without-4.3.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; + sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; }; }; "npm-install-checks-3.0.0" = { @@ -14418,6 +14454,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -14436,6 +14481,15 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -14481,33 +14535,6 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; "unique-slug-2.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -14733,13 +14760,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.7" = { + "npm-3.10.8" = { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; }; "npmi-2.0.1" = { @@ -14778,40 +14805,49 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "lodash.clonedeep-4.4.1" = { + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; - }; - }; - "lodash.union-4.5.0" = { - name = "lodash.union"; - packageName = "lodash.union"; version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.uniq-4.4.0" = { + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + }; + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.3.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "airplayer-2.0.0" = { @@ -14931,13 +14967,13 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "single-line-log-1.1.1" = { + "single-line-log-1.1.2" = { name = "single-line-log"; packageName = "single-line-log"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.1.tgz"; - sha1 = "f87743dfdb5519b5fe1dda36edd68f35e3cb5de6"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; "array-flatten-2.1.0" = { @@ -14967,13 +15003,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.0.1" = { + "multicast-dns-6.1.0" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.0.1.tgz"; - sha1 = "069da64a0b695e156ef47c86a94e69e1a17ff2c2"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; + sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -15877,13 +15913,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.2" = { + "openid-2.0.4" = { name = "openid"; packageName = "openid"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.2.tgz"; - sha1 = "10105d793ef59fad19501c51da942f63920875a1"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.4.tgz"; + sha1 = "73486f2862b080cc1a582cfd5d4df61d0274ef60"; }; }; "node-swt-0.1.1" = { @@ -16543,6 +16579,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; "verror-1.3.3" = { name = "verror"; packageName = "verror"; @@ -16786,13 +16831,13 @@ let sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; }; }; - "blueimp-md5-2.3.0" = { + "blueimp-md5-2.3.1" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.0.tgz"; - sha1 = "a0a2207c53c3311fcd44c0ad95c019bf0ef53951"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; + sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; "color-0.11.3" = { @@ -16984,13 +17029,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.4.0" = { + "color-convert-1.5.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.4.0.tgz"; - sha1 = "4ad8f531c31af5d8cbc5a4af2bb6000891d398e1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; + sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; }; }; "color-string-0.3.0" = { @@ -17029,6 +17074,15 @@ let sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; }; }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; "send-0.13.1" = { name = "send"; packageName = "send"; @@ -17182,6 +17236,42 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "lodash.clonedeep-4.3.2" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; + sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + }; + }; + "lodash.union-4.4.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; + sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + }; + }; + "lodash.uniq-4.3.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; + sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + }; + }; + "lodash.without-4.2.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; + sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + }; + }; "node-gyp-3.3.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -17191,6 +17281,33 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "lodash._baseflatten-4.2.1" = { + name = "lodash._baseflatten"; + packageName = "lodash._baseflatten"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; + sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; + }; + }; + "lodash._basedifference-4.5.0" = { + name = "lodash._basedifference"; + packageName = "lodash._basedifference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; + sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17548,10 +17665,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.1.tgz"; - sha1 = "f45de3859d1c84d539e247a98bb1b5356119338c"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz"; + sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d"; }; dependencies = [ sources."colors-0.6.0-1" @@ -17598,7 +17715,7 @@ in }) sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.10" + sources."which-1.2.11" sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" sources."isexe-1.1.2" @@ -17606,6 +17723,7 @@ in sources."sax-0.5.8" sources."is-0.3.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium MVC Framework"; homepage = "https://github.com/appcelerator/alloy#readme"; @@ -17616,10 +17734,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.3.tgz"; - sha1 = "be426d6bd3b940e0e82e85e13381fd3f6372e8a6"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.4.tgz"; + sha1 = "0f5e9a8a529ac30f0fc8e754513ace91df6b5dae"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17643,51 +17761,20 @@ in sources."azure-arm-hdinsight-0.2.0" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" + sources."azure-arm-iothub-0.1.1" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.13.2" + sources."azure-arm-network-0.16.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" - sources."azure-arm-dns-0.10.1" - (sources."azure-arm-website-0.10.0" // { - dependencies = [ - sources."azure-common-0.9.12" - sources."moment-2.6.0" - sources."xml2js-0.2.7" - sources."request-2.45.0" - sources."validator-3.1.0" - sources."bl-0.9.5" - sources."caseless-0.6.0" - sources."forever-agent-0.5.2" - sources."qs-1.2.2" - sources."mime-types-1.0.2" - sources."node-uuid-1.4.7" - sources."form-data-0.1.4" - sources."http-signature-0.10.1" - sources."oauth-sign-0.4.0" - sources."hawk-1.1.1" - sources."aws-sign2-0.5.0" - sources."combined-stream-0.0.7" - sources."async-0.9.2" - sources."delayed-stream-0.0.5" - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) + sources."azure-arm-dns-0.11.1" + sources."azure-arm-website-0.11.0" sources."azure-arm-rediscache-0.2.1" sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.0.1" sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.10.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -17697,26 +17784,37 @@ in sources."moment-2.6.0" ]; }) - sources."azure-asm-network-0.12.0" + sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.4.5-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" sources."azure-asm-subscription-0.10.1" - sources."azure-asm-website-0.10.4" + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) (sources."azure-storage-1.1.0" // { dependencies = [ sources."extend-1.2.1" sources."node-uuid-1.4.7" sources."readable-stream-2.0.6" + (sources."request-2.69.0" // { + dependencies = [ + sources."extend-3.0.0" + ]; + }) sources."validator-3.22.2" sources."xml2js-0.2.7" sources."isarray-1.0.0" + sources."bl-1.0.3" + sources."qs-6.0.2" ]; }) sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.4.0" + sources."azure-batch-0.5.0" sources."applicationinsights-0.15.12" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -17735,15 +17833,8 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.14.1" - (sources."ms-rest-1.15.0" // { - dependencies = [ - sources."request-2.74.0" - sources."node-uuid-1.4.7" - sources."qs-6.2.1" - sources."tough-cookie-2.3.1" - ]; - }) + sources."moment-2.15.0" + sources."ms-rest-1.15.0" (sources."ms-rest-azure-1.15.0" // { dependencies = [ sources."async-0.2.7" @@ -17767,19 +17858,16 @@ in ]; }) sources."readable-stream-1.0.34" - (sources."request-2.69.0" // { + (sources."request-2.74.0" // { dependencies = [ - sources."bl-1.0.3" sources."node-uuid-1.4.7" - sources."qs-6.0.2" - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" + sources."qs-6.2.1" + sources."tough-cookie-2.3.1" ]; }) (sources."ssh-key-to-pem-0.11.0" // { dependencies = [ sources."asn1-0.1.11" - sources."ctype-0.5.2" ]; }) sources."streamline-0.10.17" @@ -17788,6 +17876,7 @@ in sources."through-2.3.4" sources."tunnel-0.0.2" sources."underscore-1.4.4" + sources."user-home-2.0.0" sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -17812,7 +17901,7 @@ in ]; }) sources."meow-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."core-util-is-1.0.2" sources."isarray-0.0.1" @@ -17892,14 +17981,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -17922,8 +18011,6 @@ in ]; }) sources."mime-db-1.23.0" - sources."mime-1.2.11" - sources."ctype-0.5.3" sources."browserify-mime-1.2.9" sources."json-edm-parser-0.1.2" sources."jsonparse-1.2.0" @@ -17967,13 +18054,14 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" + sources."ctype-0.5.2" sources."source-map-0.1.43" sources."fibers-1.0.14" sources."galaxy-0.1.12" @@ -17983,8 +18071,10 @@ in sources."http-basic-2.5.1" sources."promise-7.1.1" sources."asap-2.0.4" + sources."os-homedir-1.0.1" sources."mute-stream-0.0.6" ]; + buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Cross Platform Command Line tool"; homepage = https://github.com/Azure/azure-xplat-cli; @@ -18000,6 +18090,7 @@ in url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; }; + buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; homepage = http://bower.io/; @@ -18010,10 +18101,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; + sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; }; dependencies = [ sources."argparse-1.0.4" @@ -18060,7 +18151,7 @@ in sources."statuses-1.3.0" sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."readable-stream-2.1.5" sources."stream-shift-1.0.0" sources."once-1.3.3" @@ -18082,7 +18173,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -18145,6 +18236,7 @@ in sources."ms-0.7.1" sources."os-tmpdir-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; homepage = https://github.com/rvl/bower2nix; @@ -18184,7 +18276,7 @@ in sources."has-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."insert-module-globals-7.0.1" (sources."labeled-stream-splicer-2.0.0" // { dependencies = [ @@ -18204,7 +18296,7 @@ in sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.3.1" + sources."stream-http-2.4.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -18224,7 +18316,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" sources."jsonparse-1.2.0" @@ -18250,21 +18346,21 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.5" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" sources."elliptic-6.3.1" sources."parse-asn1-5.0.0" - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" sources."asn1.js-4.8.0" sources."ripemd160-1.0.1" @@ -18272,7 +18368,7 @@ in sources."miller-rabin-4.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -18299,6 +18395,7 @@ in sources."querystring-0.2.0" sources."indexof-0.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; homepage = "https://github.com/substack/node-browserify#readme"; @@ -18405,7 +18502,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -18464,6 +18561,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."parse-torrent-4.1.0" + sources."once-1.3.3" sources."magnet-uri-4.2.3" sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" @@ -18503,10 +18601,14 @@ in sources."bencode-0.10.0" sources."simple-sha1-2.0.8" sources."rusha-0.8.3" - sources."once-1.3.3" - sources."unzip-response-1.0.0" + sources."once-1.4.0" + sources."unzip-response-1.0.1" sources."wrappy-1.0.2" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."deep-extend-0.2.11" sources."strip-json-comments-0.1.3" sources."ini-1.1.0" @@ -18536,7 +18638,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ip-1.1.3" sources."flatten-0.0.1" sources."fifo-0.1.4" @@ -18650,6 +18752,7 @@ in sources."graceful-readlink-1.0.1" sources."sax-1.2.1" ]; + buildInputs = globalBuildInputs; meta = { description = "commandline chromecast player"; homepage = "https://github.com/xat/castnow#readme"; @@ -18665,6 +18768,7 @@ in url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; }; + buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; homepage = http://coffeescript.org/; @@ -18733,7 +18837,7 @@ in sources."glob-6.0.4" ]; }) - (sources."npm-2.15.10" // { + (sources."npm-2.15.11" // { dependencies = [ sources."glob-7.0.6" sources."nopt-3.0.6" @@ -18796,9 +18900,9 @@ in sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -18880,7 +18984,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" sources."jsonparse-1.2.0" @@ -18906,21 +19014,21 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.5" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" sources."elliptic-6.3.1" sources."parse-asn1-5.0.0" - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" sources."asn1.js-4.8.0" sources."ripemd160-1.0.1" @@ -18996,7 +19104,11 @@ in sources."forwarded-0.1.0" sources."ipaddr.js-1.1.1" sources."destroy-1.0.4" - sources."http-errors-1.5.0" + (sources."http-errors-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."mime-1.3.4" sources."setprototypeof-1.0.1" sources."media-typer-0.3.0" @@ -19064,18 +19176,21 @@ in sources."normalize-git-url-3.0.2" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-1.0.7" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."concat-stream-1.5.2" + sources."request-2.74.0" + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" ]; }) sources."npm-user-validate-0.1.5" sources."npmlog-2.0.4" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-installed-4.0.3" sources."realize-package-specifier-3.0.3" - sources."retry-0.9.0" + sources."retry-0.10.0" (sources."rimraf-2.5.4" // { dependencies = [ sources."glob-7.0.6" @@ -19088,11 +19203,11 @@ in ]; }) sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" - sources."which-1.2.10" + sources."which-1.2.11" sources."write-file-atomic-1.1.4" sources."imurmurhash-0.1.4" sources."wcwidth-1.0.1" @@ -19110,19 +19225,6 @@ in sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" - sources."are-we-there-yet-1.1.2" - sources."gauge-1.2.7" - sources."delegates-1.0.0" - sources."has-unicode-2.0.1" - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" - sources."debuglog-1.0.1" - sources."readdir-scoped-modules-1.0.2" - sources."util-extend-1.0.3" - sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" @@ -19166,14 +19268,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -19195,6 +19297,19 @@ in sources."tweetnacl-0.14.3" ]; }) + sources."are-we-there-yet-1.1.2" + sources."gauge-1.2.7" + sources."delegates-1.0.0" + sources."has-unicode-2.0.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."os-homedir-1.0.1" + sources."os-tmpdir-1.0.1" + sources."debuglog-1.0.1" + sources."readdir-scoped-modules-1.0.2" + sources."util-extend-1.0.3" + sources."buffer-shims-1.0.0" sources."isexe-1.1.2" (sources."xmlbuilder-4.0.0" // { dependencies = [ @@ -19208,7 +19323,7 @@ in sources."bplist-parser-0.0.6" sources."bplist-creator-0.0.4" sources."stream-buffers-0.2.6" - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" sources."configstore-1.4.0" sources."is-npm-1.0.0" sources."latest-version-1.0.1" @@ -19248,7 +19363,11 @@ in ]; }) sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" sources."rc-1.1.6" sources."deep-extend-0.4.1" @@ -19286,6 +19405,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; license = "Apache-2.0"; @@ -19422,8 +19542,9 @@ in sources."delayed-stream-0.0.5" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; + buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; homepage = https://github.com/okTurtles/dnschain; @@ -19443,7 +19564,7 @@ in sources."JSONStream-0.8.4" sources."basic-auth-1.0.4" sources."cookie-signature-1.0.6" - sources."cors-2.8.0" + sources."cors-2.8.1" sources."docker-parse-image-3.0.1" sources."end-of-stream-1.1.0" sources."from2-1.3.0" @@ -19514,7 +19635,7 @@ in sources."vary-1.1.0" sources."once-1.3.3" sources."wrappy-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."readable-stream-1.1.14" sources."core-util-is-1.0.2" sources."isarray-0.0.1" @@ -19560,6 +19681,7 @@ in sources."protein-0.5.0" sources."network-address-0.0.5" ]; + buildInputs = globalBuildInputs; meta = { description = "docker registry server implemented in node"; homepage = https://github.com/mafintosh/docker-registry-server; @@ -19608,7 +19730,7 @@ in sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -19636,14 +19758,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -19667,6 +19789,7 @@ in }) sources."mime-db-1.23.0" ]; + buildInputs = globalBuildInputs; meta = { description = "import and export tools for elasticsearch"; homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; @@ -19677,23 +19800,23 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.4.0.tgz"; - sha1 = "af5984007bd3f1fb1b3b6b01a0a22eda0ec7a9f4"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.5.0.tgz"; + sha1 = "22fc9f780ea5bca1306fab2b6d3336b0fa62c754"; }; dependencies = [ sources."chalk-1.1.3" sources."concat-stream-1.5.2" sources."debug-2.2.0" - sources."doctrine-1.3.0" + sources."doctrine-1.4.0" sources."escope-3.6.0" sources."espree-3.1.7" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.0.6" - sources."globals-9.9.0" + sources."globals-9.10.0" sources."ignore-3.1.5" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" @@ -19706,7 +19829,7 @@ in sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."optionator-0.8.1" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" sources."require-uncached-1.0.2" @@ -19722,7 +19845,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -19766,7 +19889,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -19813,6 +19936,7 @@ in sources."xregexp-3.1.1" sources."os-homedir-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; homepage = http://eslint.org/; @@ -19833,11 +19957,12 @@ in sources."bower-logger-0.2.1" sources."bower-1.7.9" sources."glob-3.2.11" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-0.3.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; homepage = https://bitbucket.org/shlevy/fetch-bower; @@ -19915,7 +20040,7 @@ in sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" (sources."readdirp-2.1.0" // { @@ -19987,7 +20112,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" @@ -20001,7 +20130,7 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -20063,14 +20192,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -20100,7 +20229,7 @@ in }) sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -20128,6 +20257,7 @@ in sources."i-0.3.5" sources."ncp-0.4.2" ]; + buildInputs = globalBuildInputs; meta = { description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; homepage = "https://github.com/foreverjs/forever#readme"; @@ -20148,6 +20278,7 @@ in sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."microee-0.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "A tool for managing multiple git repositories"; homepage = "https://github.com/mixu/gr#readme"; @@ -20170,9 +20301,9 @@ in sources."resolve-1.1.7" sources."glob-5.0.15" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -20180,6 +20311,7 @@ in sources."concat-map-0.0.1" sources."abbrev-1.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "The grunt command line interface"; homepage = "https://github.com/gruntjs/grunt-cli#readme"; @@ -20275,6 +20407,7 @@ in sources."lodash-4.15.0" sources."nan-2.4.0" ]; + buildInputs = globalBuildInputs; meta = { description = "See a representation of the Guifi.net network in Google Earth."; homepage = https://github.com/jmendeth/guifi-earth; @@ -20355,7 +20488,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -20403,7 +20536,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."xtend-4.0.1" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" @@ -20469,7 +20602,7 @@ in sources."is-windows-0.2.0" sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.10" + sources."which-1.2.11" sources."os-tmpdir-1.0.1" sources."isexe-1.1.2" sources."lodash.assignwith-4.2.0" @@ -20531,6 +20664,7 @@ in sources."natives-1.1.0" sources."first-chunk-stream-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "The streaming build system"; homepage = http://gulpjs.com/; @@ -20551,8 +20685,9 @@ in sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-1.2.0" + sources."eventemitter3-2.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Complete high-scaled reverse-proxy solution"; homepage = https://github.com/dotcloud/hipache; @@ -20586,10 +20721,10 @@ in ]; }) sources."nopt-3.0.6" - sources."once-1.3.3" + sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.1.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -20602,7 +20737,7 @@ in sources."fast-levenshtein-1.1.4" sources."amdefine-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" @@ -20644,6 +20779,7 @@ in sources."has-flag-1.0.0" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; homepage = "https://github.com/gotwarlost/istanbul#readme"; @@ -20662,6 +20798,7 @@ in dependencies = [ sources."when-3.4.6" ]; + buildInputs = globalBuildInputs; meta = { description = "A comprehensive JSON Schema validator for Node.js"; homepage = https://github.com/natesilva/jayschema; @@ -20689,8 +20826,8 @@ in sources."glob-7.0.6" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" - sources."once-1.3.3" + sources."inherits-2.0.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."date-now-0.1.4" @@ -20712,6 +20849,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; @@ -20727,6 +20865,7 @@ in url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; homepage = https://github.com/trentm/json; @@ -20741,6 +20880,7 @@ in url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging JSON on the command line"; homepage = https://github.com/trentm/json; @@ -20760,6 +20900,7 @@ in sources."esprima-2.7.3" sources."sprintf-js-1.0.3" ]; + buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; homepage = https://github.com/nodeca/js-yaml; @@ -20770,22 +20911,22 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.2.0.tgz"; - sha1 = "6dca89ec25f4753f120f834c89398098040fd63e"; + url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; + sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; }; dependencies = [ sources."bluebird-3.4.6" sources."body-parser-1.15.2" sources."chokidar-1.6.0" sources."colors-1.1.2" - (sources."combine-lists-1.0.0" // { + (sources."combine-lists-1.0.1" // { dependencies = [ sources."lodash-4.15.0" ]; }) - sources."connect-3.4.1" + sources."connect-3.5.0" sources."core-js-2.4.1" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -20813,6 +20954,7 @@ in sources."minimatch-3.0.3" sources."optimist-0.6.1" sources."qjobs-1.1.5" + sources."range-parser-1.2.0" sources."rimraf-2.5.4" sources."socket.io-1.4.7" sources."source-map-0.5.6" @@ -20911,7 +21053,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -20971,14 +21113,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21006,7 +21148,7 @@ in sources."once-1.3.3" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-0.4.1" + sources."finalhandler-0.5.0" sources."parseurl-1.3.1" sources."utils-merge-1.0.0" sources."escape-html-1.0.3" @@ -21092,6 +21234,7 @@ in sources."os-tmpdir-1.0.1" sources."lru-cache-2.2.4" ]; + buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; homepage = http://karma-runner.github.io/; @@ -21216,7 +21359,7 @@ in sources."uid-safe-2.1.1" sources."random-bytes-1.0.0" sources."crc-3.3.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."statuses-1.3.0" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" @@ -21241,6 +21384,7 @@ in sources."xmlbuilder-4.2.1" sources."lodash-4.15.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; license = "MIT"; @@ -21262,7 +21406,7 @@ in sources."readable-stream-2.0.6" sources."xtend-4.0.1" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21271,7 +21415,7 @@ in sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" sources."duplexify-3.4.5" - (sources."glob-stream-5.3.4" // { + (sources."glob-stream-5.3.5" // { dependencies = [ sources."through2-0.6.5" sources."readable-stream-1.0.34" @@ -21296,8 +21440,13 @@ in sources."wrappy-1.0.2" sources."extend-3.0.0" sources."glob-5.0.15" - sources."glob-parent-2.0.0" - sources."micromatch-2.3.11" + sources."glob-parent-3.0.0" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."ordered-read-streams-0.3.0" sources."to-absolute-glob-0.1.1" sources."unique-stream-2.2.1" @@ -21307,18 +21456,27 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."is-glob-2.0.1" - sources."is-extglob-1.0.0" + sources."is-glob-3.0.0" + sources."is-extglob-2.0.0" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" + (sources."extglob-0.3.2" // { + dependencies = [ + sources."is-extglob-1.0.0" + ]; + }) sources."filename-regex-2.0.0" sources."kind-of-3.0.4" sources."normalize-path-2.0.1" sources."object.omit-2.0.0" - sources."parse-glob-3.0.4" + (sources."parse-glob-3.0.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."regex-cache-0.4.3" sources."arr-flatten-1.0.1" sources."expand-range-1.8.2" @@ -21334,7 +21492,13 @@ in sources."for-own-0.1.4" sources."is-extendable-0.1.1" sources."for-in-0.1.5" - sources."glob-base-0.3.0" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-glob-2.0.1" + sources."is-extglob-1.0.0" + ]; + }) sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" @@ -21347,6 +21511,7 @@ in sources."is-utf8-0.2.1" sources."first-chunk-stream-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; homepage = https://github.com/mweibel/lcov-result-merger; @@ -21382,6 +21547,7 @@ in sources."request-2.9.203" sources."stack-trace-0.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; homepage = https://bitbucket.org/aahmed/meat; @@ -21400,6 +21566,7 @@ in sources."optparse-1.0.5" sources."slasp-0.0.4" ]; + buildInputs = globalBuildInputs; meta = { description = "An internal DSL for the Nix package manager in JavaScript"; homepage = https://github.com/svanderburg/nijs; @@ -21410,10 +21577,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.0.1.tgz"; - sha1 = "de96ccbd0228983e788d68b9792836964614548c"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; + sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; }; dependencies = [ sources."optparse-1.0.5" @@ -21421,6 +21588,7 @@ in sources."npm-registry-client-7.1.2" (sources."npmconf-2.0.9" // { dependencies = [ + sources."once-1.3.3" sources."semver-4.3.6" ]; }) @@ -21448,13 +21616,13 @@ in sources."semver-5.3.0" ]; }) - sources."once-1.3.3" + sources."once-1.4.0" sources."request-2.74.0" sources."retry-0.8.0" sources."rimraf-2.5.4" sources."slide-1.1.6" sources."npmlog-3.1.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -21517,14 +21685,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21564,7 +21732,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -21593,6 +21761,7 @@ in sources."forEachAsync-2.2.1" sources."sequence-2.2.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; @@ -21621,11 +21790,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.10" - sources."inherits-2.0.1" + sources."which-1.2.11" + sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -21649,7 +21818,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -21714,14 +21883,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21747,6 +21916,7 @@ in sources."block-stream-0.0.9" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; homepage = "https://github.com/nodejs/node-gyp#readme"; @@ -21775,7 +21945,7 @@ in sources."strong-data-uri-1.0.4" sources."v8-debug-0.7.7" sources."v8-profiler-5.6.5" - sources."which-1.2.10" + sources."which-1.2.11" sources."ws-1.1.1" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" @@ -21813,7 +21983,7 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -21825,7 +21995,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -21896,7 +22066,7 @@ in sources."media-typer-0.3.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -21919,6 +22089,7 @@ in sources."tar-2.2.1" (sources."tar-pack-3.1.4" // { dependencies = [ + sources."once-1.3.3" sources."rimraf-2.5.4" sources."glob-7.0.6" ]; @@ -21990,14 +22161,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22035,6 +22206,7 @@ in sources."lcid-1.0.0" sources."invert-kv-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; homepage = http://github.com/node-inspector/node-inspector; @@ -22062,7 +22234,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" @@ -22073,7 +22249,7 @@ in sources."readable-stream-2.1.5" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22082,7 +22258,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -22141,14 +22317,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22175,7 +22351,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -22189,6 +22365,7 @@ in sources."uid-number-0.0.6" sources."ms-0.7.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon binary install tool"; homepage = "https://github.com/mapbox/node-pre-gyp#readme"; @@ -22207,7 +22384,7 @@ in dependencies = [ sources."chokidar-1.6.0" sources."debug-2.2.0" - sources."es6-promise-3.2.1" + sources."es6-promise-3.3.0" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" sources."minimatch-3.0.3" @@ -22222,7 +22399,7 @@ in sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" sources."path-is-absolute-1.0.0" @@ -22284,7 +22461,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" @@ -22296,7 +22477,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -22355,14 +22536,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22388,7 +22569,7 @@ in sources."glob-7.0.6" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -22447,10 +22628,15 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" sources."is-finite-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; homepage = http://nodemon.io/; @@ -22569,7 +22755,7 @@ in sources."cookie-signature-1.0.6" sources."vary-1.1.0" sources."moment-timezone-0.3.1" - sources."moment-2.14.1" + sources."moment-2.15.0" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -22603,7 +22789,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -22621,7 +22807,11 @@ in sources."isarray-1.0.0" ]; }) - sources."end-of-stream-1.1.0" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."help-me-0.1.0" sources."minimist-1.2.0" sources."mqtt-connection-2.1.1" @@ -22667,6 +22857,7 @@ in dependencies = [ sources."end-of-stream-1.0.0" sources."readable-stream-2.1.5" + sources."once-1.3.3" sources."isarray-1.0.0" ]; }) @@ -22803,7 +22994,7 @@ in sources."twitter-ng-0.6.2" sources."oauth-0.9.14" sources."is-typedarray-1.0.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."asn1-0.2.3" @@ -22811,7 +23002,7 @@ in ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" (sources."dashdash-1.14.0" // { dependencies = [ @@ -22852,6 +23043,7 @@ in sources."tar-2.2.1" (sources."tar-pack-3.1.4" // { dependencies = [ + sources."once-1.3.3" sources."readable-stream-2.1.5" sources."isarray-1.0.0" ]; @@ -22865,7 +23057,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -22884,6 +23076,7 @@ in sources."define-properties-1.1.2" sources."foreach-2.0.5" ]; + buildInputs = globalBuildInputs; meta = { description = "A visual tool for wiring the Internet of Things"; homepage = http://nodered.org/; @@ -22961,9 +23154,9 @@ in sources."diff-1.0.8" sources."glob-4.0.6" sources."graceful-fs-3.0.11" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."natives-1.1.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" @@ -22984,16 +23177,16 @@ in sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" - sources."mailcomposer-3.10.0" + sources."mailcomposer-3.12.0" sources."simplesmtp-0.3.35" sources."optimist-0.6.1" - sources."buildmail-3.8.0" - sources."libmime-2.0.3" + sources."buildmail-3.10.0" + sources."libmime-2.1.0" sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" - sources."nodemailer-fetch-1.4.0" - sources."nodemailer-shared-1.0.5" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" sources."iconv-lite-0.4.13" sources."rai-0.1.12" sources."xoauth2-0.1.8" @@ -23009,6 +23202,7 @@ in sources."underscore-1.7.0" sources."underscore.string-2.4.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Remote monitoring for HTTP applications"; license = "MIT"; @@ -23018,10 +23212,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.6"; + version = "3.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.6.tgz"; - sha1 = "a2a3d39b9e93c2afb7ca1328e39ef72ba451dd1e"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; + sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; }; dependencies = [ sources."abbrev-1.0.9" @@ -23046,7 +23240,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -23055,10 +23249,10 @@ in }) sources."lockfile-1.0.1" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.3.2" - sources."lodash.union-4.4.0" - sources."lodash.uniq-4.3.0" - sources."lodash.without-4.2.0" + sources."lodash.clonedeep-4.4.1" + sources."lodash.union-4.5.0" + sources."lodash.uniq-4.4.0" + sources."lodash.without-4.3.0" sources."mkdirp-0.5.1" sources."node-gyp-3.4.0" sources."nopt-3.0.6" @@ -23075,9 +23269,9 @@ in sources."npm-user-validate-0.1.5" sources."npmlog-3.1.2" sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -23089,13 +23283,13 @@ in sources."read-package-tree-5.1.5" sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" - sources."request-2.72.0" + sources."request-2.74.0" sources."retry-0.9.0" sources."rimraf-2.5.4" sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -23104,7 +23298,7 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" sources."ansi-regex-2.0.0" @@ -23132,10 +23326,6 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" - sources."lodash._baseclone-4.5.7" - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - sources."lodash._basedifference-4.5.0" sources."minimist-0.0.8" sources."path-array-1.0.1" sources."array-index-1.0.0" @@ -23165,7 +23355,7 @@ in sources."delegates-1.0.0" sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -23199,9 +23389,9 @@ in sources."mime-types-2.1.11" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."async-2.0.1" @@ -23226,14 +23416,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23264,6 +23454,7 @@ in sources."spdx-expression-parse-1.0.3" sources."spdx-license-ids-1.2.2" ]; + buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; homepage = https://docs.npmjs.com/; @@ -23343,7 +23534,7 @@ in sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -23373,14 +23564,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23407,7 +23598,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -23422,7 +23613,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -23457,6 +23648,7 @@ in sources."jsonfile-1.0.1" sources."foreachasync-3.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; homepage = https://github.com/NixOS/npm2nix; @@ -23487,11 +23679,7 @@ in sources."lodash-4.15.0" ]; }) - (sources."npm-3.10.7" // { - dependencies = [ - sources."semver-5.1.1" - ]; - }) + sources."npm-3.10.8" (sources."npmi-2.0.1" // { dependencies = [ sources."semver-4.3.6" @@ -23529,14 +23717,14 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - sources."fstream-npm-1.1.1" + sources."fstream-npm-1.2.0" sources."glob-7.0.6" sources."graceful-fs-4.1.6" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -23545,29 +23733,33 @@ in }) sources."lockfile-1.0.1" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" sources."mkdirp-0.5.1" - sources."node-gyp-3.4.0" + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" sources."normalize-package-data-2.3.5" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."npmlog-3.1.2" ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-3.1.2" - sources."once-1.3.3" - sources."opener-1.4.1" + sources."npmlog-4.0.0" + sources."once-1.4.0" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -23580,11 +23772,11 @@ in sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" sources."request-2.74.0" - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" @@ -23592,9 +23784,9 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -23621,6 +23813,19 @@ in sources."lodash._root-3.0.1" sources."minimist-0.0.8" sources."path-array-1.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.0" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -23641,19 +23846,6 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."are-we-there-yet-1.1.2" - sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" - sources."string-width-1.0.2" - sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" sources."mute-stream-0.0.6" @@ -23701,14 +23893,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23762,7 +23954,11 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" (sources."rc-1.1.6" // { dependencies = [ @@ -23773,6 +23969,7 @@ in sources."strip-json-comments-1.0.4" sources."is-finite-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; @@ -23826,6 +24023,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."parse-torrent-4.1.0" + sources."once-1.3.3" sources."magnet-uri-4.2.3" sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" @@ -23846,8 +24044,8 @@ in sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.15" - sources."inherits-2.0.1" + sources."big-integer-1.6.16" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -23860,14 +24058,14 @@ in sources."xmldom-0.1.22" sources."lodash-3.10.1" sources."consume-http-header-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."consume-until-1.0.0" sources."http-headers-3.0.1" sources."buffer-indexof-1.0.2" sources."next-line-1.1.0" sources."wrappy-1.0.2" sources."chalk-1.1.3" - sources."single-line-log-1.1.1" + sources."single-line-log-1.1.2" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -23882,7 +24080,7 @@ in sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" sources."dns-txt-2.0.2" - sources."multicast-dns-6.0.1" + sources."multicast-dns-6.1.0" sources."multicast-dns-service-types-1.1.0" sources."dns-packet-1.1.0" sources."thunky-0.1.0" @@ -23899,7 +24097,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -23949,8 +24147,12 @@ in sources."bencode-0.10.0" sources."simple-sha1-2.0.8" sources."rusha-0.8.3" - sources."unzip-response-1.0.0" - sources."end-of-stream-1.0.0" + sources."unzip-response-1.0.1" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."deep-extend-0.2.11" sources."strip-json-comments-0.1.3" sources."ini-1.1.0" @@ -24037,6 +24239,7 @@ in sources."ultron-1.0.2" sources."ms-0.7.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; homepage = https://github.com/mafintosh/peerflix; @@ -24070,6 +24273,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."mkdirp-0.3.5" + sources."once-1.3.3" ]; }) sources."fluent-ffmpeg-2.1.0" @@ -24082,7 +24286,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ee-first-1.1.0" sources."media-typer-0.3.0" sources."mime-types-2.0.14" @@ -24156,8 +24360,12 @@ in sources."keypress-0.1.0" sources."mime-1.2.11" sources."minimist-0.0.8" - sources."end-of-stream-1.1.0" - sources."once-1.3.3" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."once-1.4.0" sources."wrappy-1.0.2" sources."magnet-uri-2.0.1" (sources."parse-torrent-4.1.0" // { @@ -24244,7 +24452,7 @@ in sources."string2compact-1.2.2" sources."ms-0.7.1" sources."ip-regex-1.0.3" - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."ipaddr.js-1.2.0" sources."bn.js-1.3.0" sources."extend.js-0.0.2" @@ -24269,9 +24477,10 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for node.js with web ui."; homepage = "https://github.com/asapach/peerflix-server#readme"; @@ -24295,12 +24504,12 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."mkdirp-0.5.0" sources."yauzl-2.4.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -24320,7 +24529,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24352,14 +24561,14 @@ in sources."lodash-4.15.0" sources."mime-db-1.23.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24404,6 +24613,7 @@ in sources."throttleit-1.0.0" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Headless WebKit with JS API"; homepage = https://github.com/Medium/phantomjs; @@ -24440,9 +24650,9 @@ in sources."acorn-1.2.2" sources."defined-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -24455,6 +24665,7 @@ in sources."base62-0.1.1" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; homepage = https://facebook.github.io/react; @@ -24525,13 +24736,13 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."keypress-0.1.0" sources."mime-1.2.11" sources."ms-0.7.1" sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" sources."request-2.9.203" - (sources."openid-2.0.2" // { + (sources."openid-2.0.4" // { dependencies = [ sources."request-2.74.0" sources."node-uuid-1.4.7" @@ -24596,14 +24807,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24628,6 +24839,7 @@ in sources."mime-db-1.23.0" sources."events.node-0.4.9" ]; + buildInputs = globalBuildInputs; meta = { }; production = true; @@ -24640,6 +24852,7 @@ in url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; + buildInputs = globalBuildInputs; meta = { description = "The semantic version parser used by npm."; homepage = "https://github.com/npm/node-semver#readme"; @@ -24702,6 +24915,7 @@ in sources."sinopia-htpasswd-0.4.5" (sources."http-errors-1.5.0" // { dependencies = [ + sources."inherits-2.0.1" sources."setprototypeof-1.0.1" sources."statuses-1.3.0" ]; @@ -24769,7 +24983,7 @@ in sources."destroy-1.0.3" sources."mime-1.3.4" sources."statuses-1.2.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" @@ -24835,14 +25049,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24869,7 +25083,7 @@ in sources."dtrace-provider-0.6.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.14.1" + sources."moment-2.15.0" sources."nan-2.4.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -24879,7 +25093,7 @@ in ]; }) sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24918,6 +25132,7 @@ in sources."through-2.3.8" sources."minimist-0.0.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Private npm repository server"; homepage = https://github.com/rlidwka/sinopia; @@ -24952,12 +25167,13 @@ in sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "sloc is a simple tool to count SLOC (source lines of code)"; homepage = "https://github.com/flosse/sloc#readme"; @@ -25011,6 +25227,7 @@ in }) sources."verror-1.1.0" sources."extsprintf-1.0.0" + sources."json-schema-0.2.2" ]; }) sources."cmdln-3.2.1" @@ -25031,7 +25248,7 @@ in sources."mime-1.3.4" sources."negotiator-0.5.3" sources."node-uuid-1.4.7" - sources."once-1.3.3" + sources."once-1.4.0" sources."qs-3.1.0" sources."semver-4.3.6" sources."spdy-1.32.5" @@ -25061,7 +25278,7 @@ in sources."minimist-0.0.8" sources."glob-6.0.4" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.0" sources."brace-expansion-1.1.6" @@ -25079,13 +25296,13 @@ in }) ]; }) - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" sources."verror-1.3.6" ]; }) - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."readable-stream-2.1.5" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" @@ -25097,6 +25314,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Client SDK and CLI for the Joyent SmartDataCenter API"; homepage = "https://github.com/joyent/node-smartdc#readme"; @@ -25122,9 +25340,9 @@ in sources."ms-0.7.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -25132,6 +25350,7 @@ in sources."concat-map-0.0.1" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Robust, expressive, and feature-rich CSS superset"; homepage = https://github.com/stylus/stylus; @@ -25170,6 +25389,7 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; homepage = https://github.com/svg/svgo; @@ -25258,7 +25478,7 @@ in sources."har-validator-1.8.0" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25305,6 +25525,7 @@ in sources."pkginfo-0.3.1" sources."stack-trace-0.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium Command line"; homepage = "https://github.com/appcelerator/titanium#readme"; @@ -25320,6 +25541,7 @@ in url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; }; + buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; homepage = http://typescriptlang.org/; @@ -25354,6 +25576,7 @@ in sources."repeat-string-1.5.4" sources."is-buffer-1.1.4" ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; homepage = http://lisperator.net/uglifyjs; @@ -25372,7 +25595,7 @@ in dependencies = [ sources."async-2.0.1" sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.0" + sources."blueimp-md5-2.3.1" sources."body-parser-1.15.2" sources."color-0.11.3" sources."cookie-parser-1.4.3" @@ -25511,7 +25734,7 @@ in sources."mime-types-2.1.11" sources."mime-db-1.23.0" sources."clone-1.0.2" - sources."color-convert-1.4.0" + sources."color-convert-1.5.0" sources."color-string-0.3.0" sources."color-name-1.1.1" sources."cookie-0.3.1" @@ -25682,9 +25905,9 @@ in sources."npm-user-validate-0.1.5" sources."npmlog-2.0.4" sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -25700,7 +25923,7 @@ in sources."retry-0.9.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -25708,7 +25931,7 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" sources."ansi-regex-2.0.0" @@ -25801,14 +26024,14 @@ in sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -25956,6 +26179,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; @@ -25988,7 +26212,7 @@ in sources."ini-1.3.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."once-1.3.3" sources."osenv-0.0.3" sources."nopt-2.2.1" @@ -26007,7 +26231,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."yauzl-2.4.1" @@ -26060,14 +26284,14 @@ in sources."lodash-4.15.0" sources."mime-db-1.23.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -26114,6 +26338,7 @@ in sources."os-tmpdir-1.0.1" sources."underscore-1.8.3" ]; + buildInputs = globalBuildInputs; meta = { description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; homepage = https://github.com/uxebu/webdrvr; @@ -26176,7 +26401,7 @@ in sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26210,7 +26435,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."pako-0.2.9" sources."base64-js-1.1.2" @@ -26300,7 +26529,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" @@ -26310,7 +26543,7 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -26375,14 +26608,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -26408,7 +26641,7 @@ in sources."glob-7.0.6" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -26419,6 +26652,7 @@ in sources."source-list-map-0.1.6" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; @@ -26434,6 +26668,7 @@ in url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; }; + buildInputs = globalBuildInputs; meta = { description = "Extract content from websites using CSS Selectors and XPath"; homepage = "https://github.com/osener/wring#readme"; From 80c2cc350cd51fbfa9ccd49aeff08a78ab38fbd0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 13 Sep 2016 23:17:47 +0200 Subject: [PATCH 156/234] nixos/tests/vbox: Disable audio for VBox guests We don't have (simulated) sound hardware within the qemu VM, neither do we have it available within VirtualBox that's running within the qemu VMs. With sound hardware the VirtualBox UI displays an error dialog, which in turn causes the VM process to hang on unregister. This in turn has caused the tests to fail because of the following error: Cannot unregister the machine '...' while it is locked Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index c1205ca0c8a..cafdf10ef51 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -144,6 +144,7 @@ let "--uart1 0x3F8 4" "--uartmode1 client /run/virtualbox-log-${name}.sock" "--memory 768" + "--audio none" ] ++ (attrs.vmFlags or [])); controllerFlags = mkFlags [ From 3efebb16807f9335d0a15d55a806a2eaccff0190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 14 Sep 2016 00:04:48 +0200 Subject: [PATCH 157/234] xorg.xf86-input-libinput: 0.19.0 -> 0.19.1 It fixes a typo in API (!). https://lists.x.org/archives/xorg-announce/2016-September/002705.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6d09116a867..23c39a1a7a2 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1615,11 +1615,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.19.0"; + name = "xf86-input-libinput-0.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2; - sha256 = "0xzl3aiah9vma3pvi170g1847vxqrg4is3ilc51f72lbgkf30pbc"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; + sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8a512144fdc..c0943e54a01 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -122,7 +122,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 From f7563efa6e01c3dbc883a1c0047d4beeddc4fc86 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Sep 2016 02:12:16 +0200 Subject: [PATCH 158/234] nixos/tests/vbox: Add destroyVM for all subtests One reason why it took me so long for debugging the test failure with systemd-detect-virt was that simple-cli has succeeded while the former has not. This now makes sure we have consistency accross all the subtests and if problems like the one in the previos commit ever show up again, we will have just the headless test succeeding and it's more obvious where the actual problem resides. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index cafdf10ef51..66f16ed8bcc 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -390,6 +390,7 @@ in mapAttrs mkVBoxTest { $machine->sendKeys("ctrl-q"); $machine->sleep(5); $machine->screenshot("gui_manager_stopped"); + destroyVM_simple; ''; simple-cli = '' @@ -407,6 +408,7 @@ in mapAttrs mkVBoxTest { }); shutdownVM_simple; + destroyVM_simple; ''; headless = '' @@ -415,6 +417,7 @@ in mapAttrs mkVBoxTest { waitForStartup_headless; waitForVMBoot_headless; shutdownVM_headless; + destroyVM_headless; ''; host-usb-permissions = '' From 8fddcad3f9831d1961ffd8f6f35f14c759a99cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 8 Sep 2016 15:30:20 +0200 Subject: [PATCH 159/234] telegraf: init at 1.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Thalheim --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/monitoring/telegraf.nix | 71 +++ pkgs/servers/monitoring/telegraf/default.nix | 28 + .../monitoring/telegraf/deps-1.0.0.json | 587 ++++++++++++++++++ pkgs/servers/nosql/influxdb/gdm2nix.rb | 9 +- pkgs/top-level/all-packages.nix | 2 + 7 files changed, 698 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/services/monitoring/telegraf.nix create mode 100644 pkgs/servers/monitoring/telegraf/default.nix create mode 100644 pkgs/servers/monitoring/telegraf/deps-1.0.0.json diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e3134910594..70d84386411 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -275,6 +275,7 @@ terraria = 253; mattermost = 254; prometheus = 255; + telegraf = 256; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -520,6 +521,7 @@ terraria = 253; mattermost = 254; prometheus = 255; + #telegraf = 256; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 485138e1ff3..4776ab2518a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -297,6 +297,7 @@ ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix ./services/monitoring/teamviewer.nix + ./services/monitoring/telegraf.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix ./services/monitoring/zabbix-agent.nix diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix new file mode 100644 index 00000000000..49dc9d8143e --- /dev/null +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.telegraf; + + configFile = pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \ + > $out + ''; +in { + ###### interface + options = { + services.telegraf = { + enable = mkEnableOption "telegraf server"; + + package = mkOption { + default = pkgs.telegraf; + defaultText = "pkgs.telegraf"; + description = "Which telegraf derivation to use"; + type = types.package; + }; + + extraConfig = mkOption { + default = {}; + description = "Extra configuration options for telegraf"; + type = types.attrs; + example = { + outputs = { + influxdb = { + urls = ["http://localhost:8086"]; + database = "telegraf"; + }; + }; + inputs = { + statsd = { + service_address = ":8125"; + delete_timings = true; + }; + }; + }; + }; + }; + }; + + + ###### implementation + config = mkIf config.services.telegraf.enable { + systemd.services.telegraf = { + description = "Telegraf Agent"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + serviceConfig = { + ExecStart=''${cfg.package}/bin/telegraf -config "${configFile}"''; + ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = "telegraf"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = [{ + name = "telegraf"; + uid = config.ids.uids.telegraf; + description = "telegraf daemon user"; + }]; + }; +} diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix new file mode 100644 index 00000000000..5da60418080 --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "telegraf-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/influxdata/telegraf"; + + excludedPackages = "test"; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "telegraf"; + rev = "${version}"; + sha256 = "0kbh4gba4rrbykdl9wsyijh0xi5ksrch99fn4gj5gbbmd383pdzv"; + }; + + # Generated with the `gdm2nix.rb` script and the `Godeps` file from the influxdb repo root. + goDeps = ./. + builtins.toPath "/deps-${version}.json"; + + meta = with lib; { + description = "The plugin-driven server agent for collecting & reporting metrics."; + license = licenses.mit; + homepage = https://www.influxdata.com/time-series-platform/telegraf/; + maintainers = with maintainers; [ mic92 roblabla ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.0.json b/pkgs/servers/monitoring/telegraf/deps-1.0.0.json new file mode 100644 index 00000000000..b4ff616ad6b --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/deps-1.0.0.json @@ -0,0 +1,587 @@ +[ + { + "goPackagePath": "github.com/Shopify/sarama", + "fetch": { + "type": "git", + "url": "https://github.com/Shopify/sarama.git", + "rev": "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9", + "sha256": "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv" + } + }, + { + "goPackagePath": "github.com/Sirupsen/logrus", + "fetch": { + "type": "git", + "url": "https://github.com/Sirupsen/logrus.git", + "rev": "219c8cb75c258c552e999735be6df753ffc7afdc", + "sha256": "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6" + } + }, + { + "goPackagePath": "github.com/aerospike/aerospike-client-go", + "fetch": { + "type": "git", + "url": "https://github.com/aerospike/aerospike-client-go.git", + "rev": "45863b7fd8640dc12f7fdd397104d97e1986f25a", + "sha256": "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw" + } + }, + { + "goPackagePath": "github.com/amir/raidman", + "fetch": { + "type": "git", + "url": "https://github.com/amir/raidman.git", + "rev": "53c1b967405155bfc8758557863bf2e14f814687", + "sha256": "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4" + } + }, + { + "goPackagePath": "github.com/aws/aws-sdk-go", + "fetch": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-go.git", + "rev": "13a12060f716145019378a10e2806c174356b857", + "sha256": "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h" + } + }, + { + "goPackagePath": "github.com/beorn7/perks", + "fetch": { + "type": "git", + "url": "https://github.com/beorn7/perks.git", + "rev": "3ac7bf7a47d159a033b107610db8a1b6575507a4", + "sha256": "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r" + } + }, + { + "goPackagePath": "github.com/cenkalti/backoff", + "fetch": { + "type": "git", + "url": "https://github.com/cenkalti/backoff.git", + "rev": "4dc77674aceaabba2c7e3da25d4c823edfb73f99", + "sha256": "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w" + } + }, + { + "goPackagePath": "github.com/couchbase/go-couchbase", + "fetch": { + "type": "git", + "url": "https://github.com/couchbase/go-couchbase.git", + "rev": "cb664315a324d87d19c879d9cc67fda6be8c2ac1", + "sha256": "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr" + } + }, + { + "goPackagePath": "github.com/couchbase/gomemcached", + "fetch": { + "type": "git", + "url": "https://github.com/couchbase/gomemcached.git", + "rev": "a5ea6356f648fec6ab89add00edd09151455b4b2", + "sha256": "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi" + } + }, + { + "goPackagePath": "github.com/couchbase/goutils", + "fetch": { + "type": "git", + "url": "https://github.com/couchbase/goutils.git", + "rev": "5823a0cbaaa9008406021dc5daf80125ea30bba6", + "sha256": "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c" + } + }, + { + "goPackagePath": "github.com/dancannon/gorethink", + "fetch": { + "type": "git", + "url": "https://github.com/dancannon/gorethink.git", + "rev": "e7cac92ea2bc52638791a021f212145acfedb1fc", + "sha256": "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g" + } + }, + { + "goPackagePath": "github.com/davecgh/go-spew", + "fetch": { + "type": "git", + "url": "https://github.com/davecgh/go-spew.git", + "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d", + "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk" + } + }, + { + "goPackagePath": "github.com/docker/engine-api", + "fetch": { + "type": "git", + "url": "https://github.com/docker/engine-api.git", + "rev": "8924d6900370b4c7e7984be5adc61f50a80d7537", + "sha256": "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n" + } + }, + { + "goPackagePath": "github.com/docker/go-connections", + "fetch": { + "type": "git", + "url": "https://github.com/docker/go-connections.git", + "rev": "f549a9393d05688dff0992ef3efd8bbe6c628aeb", + "sha256": "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg" + } + }, + { + "goPackagePath": "github.com/docker/go-units", + "fetch": { + "type": "git", + "url": "https://github.com/docker/go-units.git", + "rev": "5d2041e26a699eaca682e2ea41c8f891e1060444", + "sha256": "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i" + } + }, + { + "goPackagePath": "github.com/eapache/go-resiliency", + "fetch": { + "type": "git", + "url": "https://github.com/eapache/go-resiliency.git", + "rev": "b86b1ec0dd4209a588dc1285cdd471e73525c0b3", + "sha256": "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21" + } + }, + { + "goPackagePath": "github.com/eapache/queue", + "fetch": { + "type": "git", + "url": "https://github.com/eapache/queue.git", + "rev": "ded5959c0d4e360646dc9e9908cff48666781367", + "sha256": "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n" + } + }, + { + "goPackagePath": "github.com/eclipse/paho.mqtt.golang", + "fetch": { + "type": "git", + "url": "https://github.com/eclipse/paho.mqtt.golang.git", + "rev": "0f7a459f04f13a41b7ed752d47944528d4bf9a86", + "sha256": "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh" + } + }, + { + "goPackagePath": "github.com/go-sql-driver/mysql", + "fetch": { + "type": "git", + "url": "https://github.com/go-sql-driver/mysql.git", + "rev": "1fca743146605a172a266e1654e01e5cd5669bee", + "sha256": "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38" + } + }, + { + "goPackagePath": "github.com/gobwas/glob", + "fetch": { + "type": "git", + "url": "https://github.com/gobwas/glob.git", + "rev": "49571a1557cd20e6a2410adc6421f85b66c730b5", + "sha256": "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk" + } + }, + { + "goPackagePath": "github.com/golang/protobuf", + "fetch": { + "type": "git", + "url": "https://github.com/golang/protobuf.git", + "rev": "552c7b9542c194800fd493123b3798ef0a832032", + "sha256": "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm" + } + }, + { + "goPackagePath": "github.com/golang/snappy", + "fetch": { + "type": "git", + "url": "https://github.com/golang/snappy.git", + "rev": "427fb6fc07997f43afa32f35e850833760e489a7", + "sha256": "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b" + } + }, + { + "goPackagePath": "github.com/gonuts/go-shellquote", + "fetch": { + "type": "git", + "url": "https://github.com/gonuts/go-shellquote.git", + "rev": "e842a11b24c6abfb3dd27af69a17f482e4b483c2", + "sha256": "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg" + } + }, + { + "goPackagePath": "github.com/gorilla/context", + "fetch": { + "type": "git", + "url": "https://github.com/gorilla/context.git", + "rev": "1ea25387ff6f684839d82767c1733ff4d4d15d0a", + "sha256": "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4" + } + }, + { + "goPackagePath": "github.com/gorilla/mux", + "fetch": { + "type": "git", + "url": "https://github.com/gorilla/mux.git", + "rev": "c9e326e2bdec29039a3761c07bece13133863e1e", + "sha256": "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6" + } + }, + { + "goPackagePath": "github.com/hailocab/go-hostpool", + "fetch": { + "type": "git", + "url": "https://github.com/hailocab/go-hostpool.git", + "rev": "e80d13ce29ede4452c43dea11e79b9bc8a15b478", + "sha256": "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny" + } + }, + { + "goPackagePath": "github.com/hashicorp/consul", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/consul.git", + "rev": "5aa90455ce78d4d41578bafc86305e6e6b28d7d2", + "sha256": "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw" + } + }, + { + "goPackagePath": "github.com/hpcloud/tail", + "fetch": { + "type": "git", + "url": "https://github.com/hpcloud/tail.git", + "rev": "b2940955ab8b26e19d43a43c4da0475dd81bdb56", + "sha256": "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s" + } + }, + { + "goPackagePath": "github.com/influxdata/config", + "fetch": { + "type": "git", + "url": "https://github.com/influxdata/config.git", + "rev": "b79f6829346b8d6e78ba73544b1e1038f1f1c9da", + "sha256": "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z" + } + }, + { + "goPackagePath": "github.com/influxdata/influxdb", + "fetch": { + "type": "git", + "url": "https://github.com/influxdata/influxdb.git", + "rev": "e094138084855d444195b252314dfee9eae34cab", + "sha256": "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla" + } + }, + { + "goPackagePath": "github.com/influxdata/toml", + "fetch": { + "type": "git", + "url": "https://github.com/influxdata/toml.git", + "rev": "af4df43894b16e3fd2b788d01bd27ad0776ef2d0", + "sha256": "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4" + } + }, + { + "goPackagePath": "github.com/kardianos/osext", + "fetch": { + "type": "git", + "url": "https://github.com/kardianos/osext.git", + "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", + "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" + } + }, + { + "goPackagePath": "github.com/kardianos/service", + "fetch": { + "type": "git", + "url": "https://github.com/kardianos/service.git", + "rev": "5e335590050d6d00f3aa270217d288dda1c94d0a", + "sha256": "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h" + } + }, + { + "goPackagePath": "github.com/klauspost/crc32", + "fetch": { + "type": "git", + "url": "https://github.com/klauspost/crc32.git", + "rev": "19b0b332c9e4516a6370a0456e6182c3b5036720", + "sha256": "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r" + } + }, + { + "goPackagePath": "github.com/lib/pq", + "fetch": { + "type": "git", + "url": "https://github.com/lib/pq.git", + "rev": "e182dc4027e2ded4b19396d638610f2653295f36", + "sha256": "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj" + } + }, + { + "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", + "fetch": { + "type": "git", + "url": "https://github.com/matttproud/golang_protobuf_extensions.git", + "rev": "d0c3fe89de86839aecf2e0579c40ba3bb336a453", + "sha256": "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r" + } + }, + { + "goPackagePath": "github.com/miekg/dns", + "fetch": { + "type": "git", + "url": "https://github.com/miekg/dns.git", + "rev": "cce6c130cdb92c752850880fd285bea1d64439dd", + "sha256": "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx" + } + }, + { + "goPackagePath": "github.com/mreiferson/go-snappystream", + "fetch": { + "type": "git", + "url": "https://github.com/mreiferson/go-snappystream.git", + "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504", + "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6" + } + }, + { + "goPackagePath": "github.com/naoina/go-stringutil", + "fetch": { + "type": "git", + "url": "https://github.com/naoina/go-stringutil.git", + "rev": "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b", + "sha256": "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6" + } + }, + { + "goPackagePath": "github.com/nats-io/nats", + "fetch": { + "type": "git", + "url": "https://github.com/nats-io/nats.git", + "rev": "b13fc9d12b0b123ebc374e6b808c6228ae4234a3", + "sha256": "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i" + } + }, + { + "goPackagePath": "github.com/nats-io/nuid", + "fetch": { + "type": "git", + "url": "https://github.com/nats-io/nuid.git", + "rev": "4f84f5f3b2786224e336af2e13dba0a0a80b76fa", + "sha256": "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y" + } + }, + { + "goPackagePath": "github.com/nsqio/go-nsq", + "fetch": { + "type": "git", + "url": "https://github.com/nsqio/go-nsq.git", + "rev": "0b80d6f05e15ca1930e0c5e1d540ed627e299980", + "sha256": "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr" + } + }, + { + "goPackagePath": "github.com/opencontainers/runc", + "fetch": { + "type": "git", + "url": "https://github.com/opencontainers/runc.git", + "rev": "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8", + "sha256": "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1" + } + }, + { + "goPackagePath": "github.com/prometheus/client_golang", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/client_golang.git", + "rev": "18acf9993a863f4c4b40612e19cdd243e7c86831", + "sha256": "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv" + } + }, + { + "goPackagePath": "github.com/prometheus/client_model", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/client_model.git", + "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", + "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" + } + }, + { + "goPackagePath": "github.com/prometheus/common", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/common.git", + "rev": "e8eabff8812b05acf522b45fdcd725a785188e37", + "sha256": "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq" + } + }, + { + "goPackagePath": "github.com/prometheus/procfs", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/procfs.git", + "rev": "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8", + "sha256": "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8" + } + }, + { + "goPackagePath": "github.com/samuel/go-zookeeper", + "fetch": { + "type": "git", + "url": "https://github.com/samuel/go-zookeeper.git", + "rev": "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f", + "sha256": "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2" + } + }, + { + "goPackagePath": "github.com/shirou/gopsutil", + "fetch": { + "type": "git", + "url": "https://github.com/shirou/gopsutil.git", + "rev": "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08", + "sha256": "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni" + } + }, + { + "goPackagePath": "github.com/soniah/gosnmp", + "fetch": { + "type": "git", + "url": "https://github.com/soniah/gosnmp.git", + "rev": "eb32571c2410868d85849ad67d1e51d01273eb84", + "sha256": "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6" + } + }, + { + "goPackagePath": "github.com/sparrc/aerospike-client-go", + "fetch": { + "type": "git", + "url": "https://github.com/sparrc/aerospike-client-go.git", + "rev": "d4bb42d2c2d39dae68e054116f4538af189e05d5", + "sha256": "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz" + } + }, + { + "goPackagePath": "github.com/streadway/amqp", + "fetch": { + "type": "git", + "url": "https://github.com/streadway/amqp.git", + "rev": "b4f3ceab0337f013208d31348b578d83c0064744", + "sha256": "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp" + } + }, + { + "goPackagePath": "github.com/stretchr/testify", + "fetch": { + "type": "git", + "url": "https://github.com/stretchr/testify.git", + "rev": "1f4a1643a57e798696635ea4c126e9127adb7d3c", + "sha256": "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl" + } + }, + { + "goPackagePath": "github.com/vjeantet/grok", + "fetch": { + "type": "git", + "url": "https://github.com/vjeantet/grok.git", + "rev": "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2", + "sha256": "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80" + } + }, + { + "goPackagePath": "github.com/wvanbergen/kafka", + "fetch": { + "type": "git", + "url": "https://github.com/wvanbergen/kafka.git", + "rev": "46f9a1cf3f670edec492029fadded9c2d9e18866", + "sha256": "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694" + } + }, + { + "goPackagePath": "github.com/wvanbergen/kazoo-go", + "fetch": { + "type": "git", + "url": "https://github.com/wvanbergen/kazoo-go.git", + "rev": "0f768712ae6f76454f987c3356177e138df258f8", + "sha256": "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16" + } + }, + { + "goPackagePath": "github.com/yuin/gopher-lua", + "fetch": { + "type": "git", + "url": "https://github.com/yuin/gopher-lua.git", + "rev": "bf3808abd44b1e55143a2d7f08571aaa80db1808", + "sha256": "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm" + } + }, + { + "goPackagePath": "github.com/zensqlmonitor/go-mssqldb", + "fetch": { + "type": "git", + "url": "https://github.com/zensqlmonitor/go-mssqldb.git", + "rev": "ffe5510c6fa5e15e6d983210ab501c815b56b363", + "sha256": "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl" + } + }, + { + "goPackagePath": "golang.org/x/crypto", + "fetch": { + "type": "git", + "url": "https://github.com/golang/crypto.git", + "rev": "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3", + "sha256": "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj" + } + }, + { + "goPackagePath": "golang.org/x/net", + "fetch": { + "type": "git", + "url": "https://github.com/golang/net.git", + "rev": "6acef71eb69611914f7a30939ea9f6e194c78172", + "sha256": "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc" + } + }, + { + "goPackagePath": "golang.org/x/text", + "fetch": { + "type": "git", + "url": "https://github.com/golang/text.git", + "rev": "a71fd10341b064c10f4a81ceac72bcf70f26ea34", + "sha256": "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1" + } + }, + { + "goPackagePath": "gopkg.in/dancannon/gorethink.v1", + "fetch": { + "type": "git", + "url": "https://gopkg.in/dancannon/gorethink.v1.git", + "rev": "7d1af5be49cb5ecc7b177bf387d232050299d6ef", + "sha256": "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi" + } + }, + { + "goPackagePath": "gopkg.in/fatih/pool.v2", + "fetch": { + "type": "git", + "url": "https://github.com/fatih/pool.git", + "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", + "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" + } + }, + { + "goPackagePath": "gopkg.in/mgo.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/mgo.v2.git", + "rev": "d90005c5262a3463800497ea5a89aed5fe22c886", + "sha256": "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7" + } + }, + { + "goPackagePath": "gopkg.in/yaml.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/yaml.v2.git", + "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", + "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" + } + } +] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb index 4c49c8a538f..d6ad6aa5eed 100755 --- a/pkgs/servers/nosql/influxdb/gdm2nix.rb +++ b/pkgs/servers/nosql/influxdb/gdm2nix.rb @@ -5,12 +5,17 @@ require "json" redirects = { "collectd.org" => "github.com/collectd/go-collectd", + "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git" => "github.com/eclipse/paho.mqtt.golang", + "golang.org/x/net" => "github.com/golang/net", "golang.org/x/crypto" => "github.com/golang/crypto", + "golang.org/x/text" => "github.com/golang/text", "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| +godeps = ARGV[0] || "Godeps" + +deps = File.read(godeps).lines.map do |line| (name, rev) = line.split(" ") host = redirects.fetch(name, name) @@ -18,7 +23,7 @@ deps = File.read("Godeps").lines.map do |line| url = "https://#{host}.git" xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`) - + { goPackagePath: name, fetch: { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5da1e0f9fb8..3300fd47511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3732,6 +3732,8 @@ in telnet = callPackage ../tools/networking/telnet { }; + telegraf = callPackage ../servers/monitoring/telegraf { }; + texmacs = callPackage ../applications/editors/texmacs { tex = texlive.combined.scheme-small; extraFonts = true; From 6ace28610f6bb00d5419739e8af51989779d178c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 Sep 2016 12:36:00 +0200 Subject: [PATCH 160/234] cheat: init at 2.1.26 --- pkgs/applications/misc/cheat/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/misc/cheat/default.nix diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix new file mode 100644 index 00000000000..09bc8f25b26 --- /dev/null +++ b/pkgs/applications/misc/cheat/default.nix @@ -0,0 +1,20 @@ +{ python3Packages, fetchurl, lib }: + +python3Packages.buildPythonApplication rec { + version = "2.1.26"; + name = "cheat-${version}"; + + propagatedBuildInputs = with python3Packages; [ docopt pygments ]; + + src = fetchurl { + url = "mirror://pypi/c/cheat/${name}.tar.gz"; + sha256 = "0yilm9ba6ll9wzh20gj3lg9mnc50q95m6sqmjp2vcghwgipdixpm"; + }; + + meta = { + description = "cheat allows you to create and view interactive cheatsheets on the command-line"; + maintainers = with lib.maintainers; [ mic92 ]; + license = with lib.licenses; [gpl3 mit]; + homepage = "https://github.com/chrisallenlane/cheat"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa610892a33..ba1f72c5ba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6281,6 +6281,8 @@ in cgdb = callPackage ../development/tools/misc/cgdb { }; + cheat = callPackage ../applications/misc/cheat { }; + chefdk = callPackage ../development/tools/chefdk { ruby = ruby_2_0; }; From 296c6714541c0da4e712834ff4ac255a49c22790 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Sep 2016 08:22:44 +0200 Subject: [PATCH 161/234] gsb: remove, depends on vulnerable curl3 --- pkgs/games/gsb/default.nix | 75 --------------------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 77 deletions(-) delete mode 100644 pkgs/games/gsb/default.nix diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix deleted file mode 100644 index 1c8f0334bf1..00000000000 --- a/pkgs/games/gsb/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv, config, requireFile -, curl3, SDL, SDL_image, libpng12, libjpeg62, libvorbis, libogg, openal, mesa -, libX11, libXext, libXft, fontconfig, zlib }: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - name = "gsb-1.56.0"; - - goBuyItNow = '' - We cannot download the full version automatically, as you require a license. - Once you bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://gsb1324679796.tar.gz" in the - directory where you saved it. - ''; - - src = requireFile { - message = goBuyItNow; - name = "gsb1324679796.tar.gz"; - sha256 = "12jsz9v55w9zxwiz4kbm6phkv60q3c2kyv5imsls13385pzwcs8i"; - }; - - arch = if stdenv.system == "i686-linux" then "x86" else "x86_64"; - - phases = "unpackPhase installPhase"; - - # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ] - + ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ] - + ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ] - + ":" + stdenv.cc.cc + "/lib64"; - - installPhase = '' - mkdir -p $out/libexec/positech/GSB/ - mkdir -p $out/bin - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - ./GSB.bin.$arch - - cp -r * $out/libexec/positech/GSB/ - rm -rf $out/libexec/positech/GSB/lib64/ - rm -rf $out/libexec/positech/GSB/lib/ - - #makeWrapper doesn't do cd. :( - - cat > $out/bin/GSB << EOF - #!/bin/sh - cd $out/libexec/positech/GSB - exec ./GSB.bin.$arch - EOF - chmod +x $out/bin/GSB - ''; - - meta = with stdenv.lib; { - description = "Gratuitous Space Battles"; - longDescription = '' - a strategy / management / simulation game that does away with all the - base building and delays and gets straight to the meat and potatoes of - science-fiction games : The big space battles fought by huge spaceships with - tons of laser beams and things going 'zap!', 'ka-boom!' and 'ka-pow!'. In GSB - you put your ships together from modular components, arrange them into fleets, - give your ships orders of engagement and then hope they emerge victorious from - battle (or at least blow to bits in aesthetically pleasing ways). - ''; - homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html; - license = licenses.unfree; - maintainers = with maintainers; [ jcumming ]; - platforms = [ "x86_64-linux" "i686-linux" ] ; - broken = true; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df44ab3e723..9d69a76696e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15871,8 +15871,6 @@ in gnugo = callPackage ../games/gnugo { }; - gsb = callPackage ../games/gsb { }; - gtypist = callPackage ../games/gtypist { }; gzdoom = callPackage ../games/gzdoom { }; From ee4c4768a43bc0761996405f30e6890b98212a0f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Sep 2016 08:23:37 +0200 Subject: [PATCH 162/234] curl3: remove vulnerable curl version --- pkgs/tools/networking/curl/7.15.nix | 79 ----------------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 84 deletions(-) delete mode 100644 pkgs/tools/networking/curl/7.15.nix diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix deleted file mode 100644 index c3c16cc08b4..00000000000 --- a/pkgs/tools/networking/curl/7.15.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl -, zlibSupport ? false, zlib ? null -, sslSupport ? false, openssl ? null -, scpSupport ? false, libssh2 ? null -, gssSupport ? false, gss ? null -, c-aresSupport ? false, c-ares ? null -, linkStatic ? false -}: - -assert zlibSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert scpSupport -> libssh2 != null; -assert c-aresSupport -> c-ares != null; - -stdenv.mkDerivation rec { - name = "curl-7.15.0"; - - src = fetchurl { - url = "http://curl.haxx.se/download/archeology/${name}.tar.gz"; - sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3"; - }; - - patches = [ ./disable-ca-install.patch ]; - - # Zlib and OpenSSL must be propagated because `libcurl.la' contains - # "-lz -lssl", which aren't necessary direct build inputs of - # applications that use Curl. - propagatedBuildInputs = with stdenv.lib; - optional zlibSupport zlib ++ - optional gssSupport gss ++ - optional c-aresSupport c-ares ++ - optional sslSupport openssl; - - preConfigure = '' - sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure - ''; - - configureFlags = [ - "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ] - ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; - - dontDisableStatic = linkStatic; - - LDFLAGS = if linkStatic then "-static" else ""; - CXX = "g++"; - CXXCPP = "g++ -E"; - - # libtool hack to get a static binary. Notice that to 'configure' I passed - # other LDFLAGS, because it doesn't use libtool for linking in the tests. - makeFlags = if linkStatic then "LDFLAGS=-all-static" else ""; - - crossAttrs = { - # We should refer to the cross built openssl - # For the 'urandom', maybe it should be a cross-system option - configureFlags = [ - ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) - "--with-random /dev/urandom" - ] - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; - }; - - passthru = { - inherit sslSupport openssl; - }; - - meta = { - homepage = "http://curl.haxx.se/"; - description = "A command line tool for transferring files with URL syntax"; - platforms = with stdenv.lib.platforms; allBut darwin; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d69a76696e..f8ba0c5099f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1268,11 +1268,6 @@ in scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; }; - curl3 = callPackage ../tools/networking/curl/7.15.nix rec { - zlibSupport = true; - sslSupport = zlibSupport; - }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; cunit = callPackage ../tools/misc/cunit { }; From 1010271c63f503113c0e8337977610ea783880ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 14 Sep 2016 12:56:07 +0200 Subject: [PATCH 163/234] nixos/pam: clean up generated files (no functional change) (#18580) The generated files in /etc/pam.d/ typically have a lot of empty lines in them, due to how the generated Nix strings are joined together; optional elements that are excluded still produce a newline. This patch changes how the files are generated to create more compact, human-friendly output files. The change is basically this, repeated: - '' - ${optionalString use_ldap - "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - '' + optionalString use_ldap '' + account sufficient ${pam_ldap}/lib/security/pam_ldap.so + '' --- nixos/modules/security/pam.nix | 189 +++++++++++++++++---------------- 1 file changed, 96 insertions(+), 93 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 814dd21b53d..6a4f6634c4b 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -229,104 +229,107 @@ let # module provides the right hooks. text = mkDefault ('' - # Account management. - account sufficient pam_unix.so - ${optionalString use_ldap - "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.krb5.enable - "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} + # Account management. + account sufficient pam_unix.so + '' + optionalString use_ldap '' + account sufficient ${pam_ldap}/lib/security/pam_ldap.so + '' + optionalString config.krb5.enable '' + account sufficient ${pam_krb5}/lib/security/pam_krb5.so + '' + '' - # Authentication management. - ${optionalString cfg.rootOK - "auth sufficient pam_rootok.so"} - ${optionalString cfg.requireWheel - "auth required pam_wheel.so use_uid"} - ${optionalString cfg.logFailures - "auth required pam_tally.so"} - ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) - "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"} - ${optionalString cfg.fprintAuth - "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} - ${optionalString cfg.u2fAuth - "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"} - ${optionalString cfg.usbAuth - "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} - '' + - # Modules in this block require having the password set in PAM_AUTHTOK. - # pam_unix is marked as 'sufficient' on NixOS which means nothing will run - # after it succeeds. Certain modules need to run after pam_unix - # prompts the user for password so we run it once with 'required' at an - # earlier point and it will run again with 'sufficient' further down. - # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount)) '' - auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth - ${optionalString config.security.pam.enableEcryptfs - "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} - ${optionalString cfg.pamMount - "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} - '') + '' - ${optionalString cfg.unixAuth - "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} - ${optionalString cfg.otpwAuth - "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth - "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} - ${optionalString use_ldap - "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} - ${optionalString config.krb5.enable '' - auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass - auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass - auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass - ''} - auth required pam_deny.so + # Authentication management. + '' + optionalString cfg.rootOK '' + auth sufficient pam_rootok.so + '' + optionalString cfg.requireWheel '' + auth required pam_wheel.so use_uid + '' + optionalString cfg.logFailures '' + auth required pam_tally.so + '' + optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) '' + auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u + '' + optionalString cfg.fprintAuth '' + auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so + '' + optionalString cfg.u2fAuth '' + auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so + '' + optionalString cfg.usbAuth '' + auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so + '' - # Password management. - password requisite pam_unix.so nullok sha512 - ${optionalString config.security.pam.enableEcryptfs - "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - ${optionalString cfg.pamMount - "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} - ${optionalString use_ldap - "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.krb5.enable - "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} - ${optionalString config.services.samba.syncPasswordsByPam - "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} + # Modules in this block require having the password set in PAM_AUTHTOK. + # pam_unix is marked as 'sufficient' on NixOS which means nothing will run + # after it succeeds. Certain modules need to run after pam_unix + # prompts the user for password so we run it once with 'required' at an + # earlier point and it will run again with 'sufficient' further down. + # We use try_first_pass the second time to avoid prompting password twice + + optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount)) ('' + auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok "}likeauth + '' + optionalString config.security.pam.enableEcryptfs '' + auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap + '' + optionalString cfg.pamMount '' + auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so + '') + + optionalString cfg.unixAuth '' + auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok "}likeauth try_first_pass + '' + optionalString cfg.otpwAuth '' + auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so + '' + (let oath = config.security.pam.oath; in optionalString cfg.oathAuth '' + auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits} + '') + optionalString use_ldap '' + auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass + '' + optionalString config.krb5.enable '' + auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass + auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass + auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass + '' + '' + auth required pam_deny.so - # Session management. - ${optionalString cfg.setEnvironment '' - session required pam_env.so envfile=${config.system.build.pamEnvironment} - ''} - session required pam_unix.so - ${optionalString cfg.setLoginUid + # Password management. + password requisite pam_unix.so nullok sha512 + '' + optionalString config.security.pam.enableEcryptfs '' + password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so + '' + optionalString cfg.pamMount '' + password optional ${pkgs.pam_mount}/lib/security/pam_mount.so + '' + optionalString use_ldap '' + password sufficient ${pam_ldap}/lib/security/pam_ldap.so + '' + optionalString config.krb5.enable '' + password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass + '' + optionalString config.services.samba.syncPasswordsByPam '' + password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass + '' + '' + + # Session management. + '' + optionalString cfg.setEnvironment '' + session required pam_env.so envfile=${config.system.build.pamEnvironment} + '' + '' + session required pam_unix.so + '' + optionalString cfg.setLoginUid "session ${ if config.boot.isContainer then "optional" else "required" - } pam_loginuid.so"} - ${optionalString cfg.makeHomeDir - "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"} - ${optionalString cfg.updateWtmp - "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} - ${optionalString config.security.pam.enableEcryptfs - "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - ${optionalString use_ldap - "session optional ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.krb5.enable - "session optional ${pam_krb5}/lib/security/pam_krb5.so"} - ${optionalString cfg.otpwAuth - "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${optionalString cfg.startSession - "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"} - ${optionalString cfg.forwardXAuth - "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"} - ${optionalString (cfg.limits != []) - "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"} - ${optionalString (cfg.showMotd && config.users.motd != null) - "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"} - ${optionalString cfg.pamMount - "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} - ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) - "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} - ''); + } pam_loginuid.so" + + optionalString cfg.makeHomeDir '' + session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022 + '' + optionalString cfg.updateWtmp '' + session required ${pkgs.pam}/lib/security/pam_lastlog.so silent + '' + optionalString config.security.pam.enableEcryptfs '' + session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so + '' + optionalString use_ldap '' + session optional ${pam_ldap}/lib/security/pam_ldap.so + '' + optionalString config.krb5.enable '' + session optional ${pam_krb5}/lib/security/pam_krb5.so + '' + optionalString cfg.otpwAuth '' + session optional ${pkgs.otpw}/lib/security/pam_otpw.so + '' + optionalString cfg.startSession '' + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + '' + optionalString cfg.forwardXAuth '' + session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99 + '' + optionalString (cfg.limits != []) '' + session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits} + '' + optionalString (cfg.showMotd && config.users.motd != null) '' + session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd} + '' + optionalString cfg.pamMount '' + session optional ${pkgs.pam_mount}/lib/security/pam_mount.so + '' + optionalString (cfg.enableAppArmor && config.security.apparmor.enable) '' + session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug + ''); }; }; From 1172c6be9bc083477b66929da30ee8fc248dad5d Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 9 Sep 2016 02:51:50 +0200 Subject: [PATCH 164/234] pypy: 5.4.0 -> 5.4.1 --- .../interpreters/python/pypy/2.7/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 213f5dabe79..c0bd10a0d43 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "5.4.0"; + majorVersion = "5.4.1"; version = "${majorVersion}"; libPrefix = "pypy${majorVersion}"; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "1jm4ak6rbqhdhm8gjbd5hanabskbyzhzvjcl93fj0i017yirw88i"; + sha256 = "1x8sa5x1nkrb8wrmicri94ji8kvyxihyryi8br5fk7gak0agcai0"; }; # http://bugs.python.org/issue27369 @@ -32,14 +32,6 @@ let patch lib-python/2.7/test/test_pyexpat.py < '${expatch}' ''; - # Increase recursion limit. This patch is not needed on pypy > 5.4.0 - patches = [ - (fetchurl { - url = "https://bitbucket.org/pypy/pypy/commits/a5db0f4359abb3f64b6d7ed83202e1cb0de37fb2/raw/"; - sha256 = "07nvqjhj0kl67f3kjwhmybaqg6089ps3q8r0si1lgk3gyb56ygn0"; - }) - ]; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; From 85fdf8665f8513b3da6706da2115c68222864c9d Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 13 Sep 2016 18:23:51 +0200 Subject: [PATCH 165/234] dropbox: 9.4.49 -> 10.4.25 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 4e6be596fba..ae01e3b121c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "9.4.49"; + version = "10.4.25"; sha256 = { - "x86_64-linux" = "0gkm4jhcn3pqaizmki98rbqb7mqyf6mjgmpslas1wr94q5msyrpd"; - "i686-linux" = "08h5jxan6l9h4zfmvc5q2652dyplih2avayy8f9h8mppirpg68px"; + "x86_64-linux" = "12kklhy5i3sj7hhlg0r0vvnv8vkd34swdjlby4sd3lcf012amc6q"; + "i686-linux" = "13i8ykxyc7scyaynfzgp2jhl9qd47lpdq62sx657abziclbybkh6"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From 685786b7d7c57a6d80b187f7b61164c36759eb79 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 13 Sep 2016 22:39:20 +0200 Subject: [PATCH 166/234] androidenv: update packages build-tools 25.1.7 -> 25.2.2 sdk-tools 23.0.1 -> 24.0.2 platform-tools 24 -> 24.0.2 --- pkgs/development/mobile/androidenv/addon.xml | 187 +++++------- pkgs/development/mobile/androidenv/addons.nix | 16 +- .../mobile/androidenv/androidsdk.nix | 6 +- .../mobile/androidenv/build-tools.nix | 68 ++--- .../development/mobile/androidenv/default.nix | 5 +- .../mobile/androidenv/platform-tools.nix | 6 +- .../mobile/androidenv/platforms-linux.nix | 4 +- .../mobile/androidenv/platforms-macosx.nix | 4 +- .../mobile/androidenv/repository-11.xml | 288 ++++++++++-------- .../development/mobile/androidenv/sys-img.xml | 61 ++-- .../mobile/androidenv/sysimages.nix | 20 +- 11 files changed, 349 insertions(+), 316 deletions(-) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 645795034cd..aef61bb2fc2 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -587,7 +587,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 3 - + 34908058 1f92abf3a76be66ae8032257fc7620acbd2b2e3a google_apis-3-r03.zip @@ -614,7 +614,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 42435735 9b6e86d8568558de4d606a7debc4f6049608dbd0 google_apis-4_r02.zip @@ -641,7 +641,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 49123776 46eaeb56b645ee7ffa24ede8fa17f3df70db0503 google_apis-5_r01.zip @@ -668,7 +668,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 53382941 5ff545d96e031e09580a6cf55713015c7d4936b2 google_apis-6_r01.zip @@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 53691339 2e7f91e0fe34fef7f58aeced973c6ae52361b5ac google_apis-7_r01.zip @@ -722,7 +722,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 59505020 3079958e7ec87222cac1e6b27bc471b27bf2c352 google_apis-8_r02.zip @@ -749,7 +749,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 63401546 78664645a1e9accea4430814f8694291a7f1ea5d google_apis-9_r02.zip @@ -776,7 +776,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 65781578 cc0711857c881fa7534f90cf8cc09b8fe985484d google_apis-10_r02.zip @@ -807,7 +807,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 83477179 5eab5e81addee9f3576d456d205208314b5146a5 google_apis-11_r01.zip @@ -834,7 +834,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 86099835 e9999f4fa978812174dfeceec0721c793a636e5d google_apis-12_r01.zip @@ -865,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 88615525 3b153edd211c27dc736c893c658418a4f9041417 google_apis-13_r01.zip @@ -896,7 +896,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 106533714 f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39 google_apis-14_r02.zip @@ -925,7 +925,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 3 - + 106624396 d0d2bf26805eb271693570a1aaec33e7dc3f45e9 google_apis-15_r03.zip @@ -958,7 +958,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 127341982 ee6acf1b01020bfa8a8e24725dbc4478bee5e792 google_apis-16_r04.zip @@ -991,7 +991,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 137231243 a076be0677f38df8ca5536b44dfb411a0c808c4f google_apis-17_r04.zip @@ -1024,7 +1024,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 143195183 6109603409debdd40854d4d4a92eaf8481462c8b google_apis-18_r04.zip @@ -1057,7 +1057,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 20 - + 147081 5b933abe830b2f25b4c0f171d45e9e0651e56311 google_apis-19_r20.zip @@ -1085,12 +1085,45 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& + + + 1 + + + + 154865 + 31361c2868f27343ee917fbd259c1463821b6145 + google_apis-24_r1.zip + + + + google + Google Inc. + google_apis + Google APIs + 24 + Android + Google APIs + + + com.google.android.maps + API for Google Maps + + + com.android.future.usb.accessory + API for USB Accessories + + + com.google.android.media.effects + Collection of video effects + + + 1 - + 179499 66a754efb24e9bb07cc51648426443c7586c9d4a google_apis-21_r01.zip @@ -1123,7 +1156,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 179259 5def0f42160cba8acff51b9c0c7e8be313de84f5 google_apis-22_r01.zip @@ -1156,7 +1189,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 179900 04c5cc1a7c88967250ebba9561d81e24104167db google_apis-23_r01.zip @@ -1190,7 +1223,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 78266751 92128a12e7e8b0fb5bac59153d7779b717e7b840 google_tv-12_r02.zip @@ -1212,7 +1245,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 87721879 b73f7c66011ac8180b44aa4e83b8d78c66ea9a09 google_tv-13_r01.zip @@ -1229,18 +1262,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + - 35 + 37 0 0 - - 251973915 - 7a201334775d78bf185ffcce686b1b168d152217 - android_m2repository_r35.zip + + 281268000 + 2f862a5d66d5526cd5b7655c3e9678f493e485f7 + android_m2repository_r37.zip @@ -1275,88 +1308,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& compatibility - + - 1 - 0 - 3 + 32 - - 12968916 - 7c9ef7544cf0aea030bcc29bd8e12c04fd53e653 - gapid_r01_linux.zip - linux - - - - 15824058 - 597eb271349d890566274861eba2770a84ee4c69 - gapid_r01_osx.zip - - - - 13220091 - 82c9b3eb1b281f27f58fe55025227148b3deb12e - gapid_r01_windows.zip - windows - - - - android - Android - Tools that support GPU debugging and profiling within an IDE. - GPU Debugging tools - gapid - - - - - 3 - 1 - 0 - - - - - 31528127 - a33fe37c87b095171d647385445abe164ae03514 - gapid_2994895_linux.zip - linux - - - - 31908588 - 81dec931c8b0a5fe7c68accd8b3f8c731a9474f3 - gapid_2994895_osx.zip - - - - 31656334 - ce00f4a7364d7fdd5d25d2429f04c4d50f56be1e - gapid_2994895_windows.zip - windows - - - - android - Android - Tools that support GPU debugging and profiling within an IDE. - GPU Debugging tools - gapid_3 - - - - - 31 - - - - - 106690833 - 20054f56e8e24c5f1aadd8cdf232d5dd54565aee - google_m2repository_r31.zip + + 113922721 + ae24bde9c8f732f4d13b72e70802be8c97dcfddf + google_m2repository_r32.zip @@ -1431,16 +1392,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& google_play_services_froyo - + - 31 + 32 - - 11746505 - 3f1b502d0f6361c036cb332b8c15249a1168e08b - google_play_services_9256000_r31.zip + + 11820632 + bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f + google_play_services_945200_r32.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 66d548d3304..f999f603b8f 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -256,6 +256,18 @@ in }; }; + google_apis_24 = buildGoogleApis { + name = "google_apis-24"; + src = fetchurl { + url = https://dl.google.com/android/repository/google_apis-24_r1.zip; + sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { @@ -271,8 +283,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_9256000_r31.zip; - sha1 = "3f1b502d0f6361c036cb332b8c15249a1168e08b"; + url = https://dl.google.com/android/repository/google_play_services_945200_r32.zip; + sha1 = "bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index b9db22f20c5..0126d6981e7 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -10,16 +10,16 @@ with { inherit (stdenv.lib) makeLibraryPath; }; stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.1.7"; + version = "25.2.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha1 = "p03br08zfq0j7aar5638z8fdh5n9x1in"; + sha256 = "0q53yq8fjc10kr4fz3rap5vsil3297w5nn4kw1z0ms7yz1d1im8h"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha1 = "7fzlfms37cfk25kk4f9zriy63djmbi8g"; + sha256 = "1wq7xm0rhy0h6qylv7fq9mhf8hqihrr1nzf7d322rc3g0jfrdrcl"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 255aa497e24..945cc0bedd5 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit}: +{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "23.0.1"; + version = "24.0.2"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; + sha256 = "15bxk03m1r1i74idydgqsrz1k7qczi8f9sj4kl8vvbw9l6w2jklj"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; + sha256 = "0h71bv8rdkssn7a17vj3r7jl5jwsxbwpg3sig0k9a7yfwyfc71s8"; } else throw "System ${stdenv.system} not supported!"; @@ -23,50 +23,34 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' cd ${version} - - # Patch the interpreter - for i in aidl bcc_compat dexdump llvm-rs-cc - do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - done - - # These binaries need to find libstdc++ and libgcc_s - for i in aidl lib/libLLVM.so - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i - done - - # These binaries need to find libstdc++, libgcc_s and libraries in the current folder - for i in lib/libbcc.so lib/libbcinfo.so lib/libclang.so aidl - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:`pwd`/lib $i - done - - # Create link to make libtinfo.so.5 work - ln -s ${ncurses_32bit.out}/lib/libncurses.so.5 `pwd`/lib/libtinfo.so.5 - - # These binaries need to find libstdc++, libgcc_s, ncurses, and libraries in the current folder - for i in bcc_compat llvm-rs-cc - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${ncurses_32bit.out}/lib:`pwd`/lib $i - done - # These binaries also need zlib in addition to libstdc++ - for i in arm-linux-androideabi-ld i686-linux-android-ld mipsel-linux-android-ld split-select aapt zipalign + ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 + + find . -type f -print0 | while IFS= read -r -d "" file do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i - done - - # These binaries need to find libstdc++, libgcc_s, and zlib - for i in aapt dexdump - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i + type=$(file "$file") + ## Patch 64-bit binaries + if grep -q "ELF 64-bit" <<< "$type" + then + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file" + fi + patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file" + ## Patch 32-bit binaries + elif grep -q "ELF 32-bit" <<< "$type" + then + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file" + fi + patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file" + fi done ''} patchShebangs . ''; - buildInputs = [ unzip ]; + buildInputs = [ unzip file ]; } diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index dfed411f0b3..a21edcc0696 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -6,10 +6,11 @@ rec { }; buildTools = import ./build-tools.nix { - inherit (pkgs) stdenv fetchurl unzip; + inherit (pkgs) stdenv fetchurl unzip zlib file; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; - ncurses_32bit = pkgs_i686.ncurses; + ncurses_32bit = pkgs_i686.ncurses5; + ncurses = pkgs.ncurses5; }; support = import ./support.nix { diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index bafdf75bef3..517167b0d55 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "24"; + version = "24.0.2"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha1 = "qabpsfhm7shvyjy6amdl7b3d41n64zsr"; + sha256 = "0y36mlwh4kb77d3vcpqxqwkxsadllap6g6jjylf3rb7blh5l4zw6"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha1 = "5s808wby36xxkfmrj4va9dnc0rwsz2gh"; + sha256 = "1whfhdwjir2sv2pfypagva813yn0fx8idi6c2mxhddv2mlws6zk4"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index b33d80f13e7..e0c77ad294e 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -283,8 +283,8 @@ in platform_24 = buildPlatform { name = "android-platform-7.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r01.zip; - sha1 = "27516dab4848f55896e16f7089038c62bbbffea7"; + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; meta = { description = "Android SDK Platform 24"; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index d39d6dab7ca..60fae208ae1 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -283,8 +283,8 @@ in platform_24 = buildPlatform { name = "android-platform-7.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r01.zip; - sha1 = "27516dab4848f55896e16f7089038c62bbbffea7"; + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; meta = { description = "Android SDK Platform 24"; diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index ead5dcad711..a0ef9bc4485 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -335,18 +335,58 @@ June 2014. + + + NDK + 13 + + + + 665405792 + 0cbdb271b103a7e4237b34b73f0e56381e4632aa + android-ndk-r13-beta2-darwin-x86_64.zip + macosx + 64 + + + + 686843165 + ea1a76d9ebdc82fe742d32798aaee7c980afd2f6 + android-ndk-r13-beta2-linux-x86_64.zip + linux + 64 + + + + 619981813 + a5f6edceb3afa4ecd47071822ea32ba6bd6ac002 + android-ndk-r13-beta2-windows-x86.zip + windows + 32 + + + + 680836961 + a0b6a0ed271b0a99cdca28ce8fd405f89defc539 + android-ndk-r13-beta2-windows-x86_64.zip + windows + 64 + + + + - + 7.0 24 Android SDK Platform 24 2 - - 82645675 - 27516dab4848f55896e16f7089038c62bbbffea7 - platform-24_r01.zip + + 82648154 + 8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee + platform-24_r02.zip @@ -952,6 +992,20 @@ June 2014. 4 + + + 24 + 1 + + + + 30270410 + 6b96115830a83d654479f32ce4b724ca9011148b + sources-24_r01.zip + + + + 23 @@ -1094,7 +1148,39 @@ June 2014. - + + + 24 + 0 + 2 + + + + + 48936295 + f199a7a788c3fefbed102eea34d6007737b803cf + build-tools_r24.0.2-linux.zip + linux + + + + 48726190 + 8bb8fc575477491d5957de743089df412de55cda + build-tools_r24.0.2-macosx.zip + macosx + + + + 49512513 + 09586a1f1c39bcfa7db5205c9a07837247deb67e + build-tools_r24.0.2-windows.zip + windows + + + + + + 24 0 @@ -1102,23 +1188,23 @@ June 2014. - - 48936213 - d3647db5c349247787d4e124dfb717e72b4304c7 + + 48936286 + 84f18c392919a074fcbb9b1d967984e6b2fef8b4 build-tools_r24.0.1-linux.zip linux - - 48725466 - 4fb942e52d05ded78719410fc8644e70a62f18d6 + + 48726085 + 5c6457fcdfa07724fb086d8ff4e8316fc0742848 build-tools_r24.0.1-macosx.zip macosx - - 49511433 - f73cc9028bff45689351ac8e093876bbeb80d1f1 + + 49511883 + ac4a7cea42c3ef74d7fbf1b992fad311c550034e build-tools_r24.0.1-windows.zip windows @@ -1134,21 +1220,21 @@ June 2014. - + 48960919 c6271c4d78a5612ea6c7150688bcd5b7313de8d1 build-tools_r24-linux.zip linux - + 48747930 97fc4ed442f23989cc488d02c1d1de9bdde241de build-tools_r24-macosx.zip macosx - + 49535326 dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7 build-tools_r24-windows.zip @@ -1166,21 +1252,21 @@ June 2014. - + 39071201 8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3 build-tools_r23.0.2-linux.zip linux - + 38060914 482c4cbceef8ff58aefd92d8155a38610158fdaf build-tools_r23.0.2-macosx.zip macosx - + 38217626 fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96 build-tools_r23.0.2-windows.zip @@ -1198,21 +1284,21 @@ June 2014. - + 40733174 368f2600feac7e9b511b82f53d1f2240ae4a91a3 build-tools_r23.0.3-linux.zip linux - + 39679533 fbc98cd303fd15a31d472de6c03bd707829f00b0 build-tools_r23.0.3-macosx.zip macosx - + 39869945 c6d8266c6a3243c8f1e41b786c0e3cee4c781263 build-tools_r23.0.3-windows.zip @@ -1263,21 +1349,21 @@ June 2014. - + 39080519 c1d6209212b01469f80fa804e0c1d39a06bc9060 build-tools_r23-linux.zip linux - + 38070540 90ba6e716f7703a236cd44b2e71c5ff430855a03 build-tools_r23-macosx.zip macosx - + 38570715 3874948f35f2f8946597679cc6e9151449f23b5d build-tools_r23-windows.zip @@ -1295,21 +1381,21 @@ June 2014. - + 33104577 da8b9c5c3ede39298e6cf0283c000c2ee9029646 build-tools_r22.0.1-linux.zip linux - + 33646102 53dad7f608e01d53b17176ba11165acbfccc5bbf build-tools_r22.0.1-macosx.zip macosx - + 33254137 61d8cbe069d9e0a57872a83e5e5abe164b7d52cf build-tools_r22.0.1-windows.zip @@ -1328,21 +1414,21 @@ June 2014. - + 33104280 a8a1619dd090e44fac957bce6842e62abf87965b build-tools_r22-linux.zip linux - + 33646090 af95429b24088d704bc5db9bd606e34ac1b82c0d build-tools_r22-macosx.zip macosx - + 33254114 08fcca41e81b172bd9f570963b90d3a84929e043 build-tools_r22-windows.zip @@ -1360,21 +1446,21 @@ June 2014. - + 32637678 5e35259843bf2926113a38368b08458735479658 build-tools_r21.1.2-linux.zip linux - + 33152878 e7c906b4ba0eea93b32ba36c610dbd6b204bff48 build-tools_r21.1.2-macosx.zip macosx - + 32792587 1d944759c47f60e634d2b8a1f3a4259be2f8d652 build-tools_r21.1.2-windows.zip @@ -1393,21 +1479,21 @@ June 2014. - + 32642454 1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d build-tools_r21.1.1-linux.zip linux - + 33157676 836a146eab0504aa9387a5132e986fe7c7381571 build-tools_r21.1.1-macosx.zip macosx - + 32797356 53fc4201237f899d5cd92f0b76ad41fb89da188b build-tools_r21.1.1-windows.zip @@ -1426,21 +1512,21 @@ June 2014. - + 32642820 b7455e543784d52a8925f960bc880493ed1478cb build-tools_r21.1-linux.zip linux - + 33158159 df619356c2359aa5eacdd48699d15b335d9bd246 build-tools_r21.1-macosx.zip macosx - + 32797810 c79d63ac6b713a1e326ad4dae43f2ee76708a2f4 build-tools_r21.1-windows.zip @@ -1459,21 +1545,21 @@ June 2014. - + 22153122 e1236ab8897b62b57414adcf04c132567b2612a5 build-tools_r21.0.2-linux.zip linux - + 22668597 f17471c154058f3734729ef3cc363399b1cd3de1 build-tools_r21.0.2-macosx.zip macosx - + 22306371 37496141b23cbe633167927b7abe6e22d9f1a1c1 build-tools_r21.0.2-windows.zip @@ -1492,21 +1578,21 @@ June 2014. - + 22153013 e573069eea3e5255e7a65bedeb767f4fd0a5f49a build-tools_r21.0.1-linux.zip linux - + 22668616 b60c8f9b810c980abafa04896706f3911be1ade7 build-tools_r21.0.1-macosx.zip macosx - + 22306243 d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df build-tools_r21.0.1-windows.zip @@ -1877,100 +1963,64 @@ June 2014. - + 24 0 - 1 + 2 - - 3328487 - 597f626c206dac435b55c64bbfa13e153a7d97c2 - platform-tools_r24-linux.zip + + 3341647 + a268850d31973d32de5c1515853f81924a4068cf + platform-tools_r24.0.2-linux.zip linux - - 3143839 - f089af7906ccb6a43691b9bad9bb197e7104902e - platform-tools_r24-macosx.zip + + 3157182 + 16053da716cbc6ef31c32a0d2f1437b22089c88c + platform-tools_r24.0.2-macosx.zip macosx - - 2984063 - f1e2d122544d7beaa6f979e485fe742ba735802e - platform-tools_r24-windows.zip + + 2997417 + ce09a7351d5c50865691554ed56325f6e5cd733c + platform-tools_r24.0.2-windows.zip windows - - - 25 - 1 - 7 - - - - - 234442830 - 36869e6c81cda18f862959a92301761f81bc06b8 - tools_r25.1.7-linux.zip - linux - - - - 161408907 - 0fc555651bc6c7fc93237316311d3b435747bf3b - tools_r25.1.7-macosx.zip - macosx - - - - 230413711 - 2556ac9a5fa741d44d9b989966c0bbdf15cb6424 - tools_r25.1.7-windows.zip - windows - - - - - 20 - - - - + 25 2 - 0 - 1 + 2 - - 277445993 - 084ff93feb2f432f532cb00375e582f46b583ff2 - tools_r25.2-linux.zip + + 273491448 + 99257925a3d8b46fee948a7520d7b7e3e3e1890e + tools_r25.2.2-linux.zip linux - - 195767390 - e49cc97f6f408fde9181f11ab942dbbea31abce3 - tools_r25.2-macosx.zip + + 195856788 + bbaa3929696ce523ea62b58cc8032d7964a154c5 + tools_r25.2.2-macosx.zip macosx - - 301550581 - cc8bcbd7fb5627ab866cc583b041d0bfc18e4441 - tools_r25.2-windows.zip + + 301642481 + ef898dff805c4b9e39f6e77fd9ec397fb1b1f809 + tools_r25.2.2-windows.zip windows @@ -1980,15 +2030,15 @@ June 2014. - - 23 + + 24 1 - - 332171437 - 060ebab2f74861e1ddd9136df26b837312bc087f - docs-23_r01.zip + + 419477967 + eef58238949ee9544876cb3e002f2d58e4ee7b5d + docs-24_r01.zip diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 1138d8284d4..237f1348232 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -558,22 +558,39 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 ARM EABI v7a System Image - 5 + 7 - - 497498007 - 2eb8fb86f7312614a2a0b033d669d67206a618ff - sysimg_armeabi-v7a-24_r05.zip + + 283677512 + 3454546b4eed2d6c3dd06d47757d6da9f4176033 + armeabi-v7a-24_r07.zip - + armeabi-v7a default + + + 24 + ARM 64 v8a System Image + 7 + + + + 384556503 + e8ab2e49e4efe4b064232b33b5eeaded61437d7f + arm64-v8a-24_r07.zip + + + + arm64-v8a + default + 15 @@ -779,19 +796,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 Intel x86 Atom System Image - 5 + 7 - - 535224957 - ce6441c4cadaecd28b364c59b36c31ef0904dae0 - sysimg_x86-24_r05.zip + + 302213276 + 566fdee283a907854bfa3c174265bc31f396eabd + x86-24_r07.zip - + x86 default @@ -847,19 +864,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 Intel x86 Atom_64 System Image - 5 + 7 - - 727226879 - e1869b32b1dcb2f4d4d18c912166b3e2bee8a841 - sysimg_x86_64-24_r05.zip + + 407148033 + a379932395ced0a8f572b39c396d86e08827a9ba + x86_64-24_r07.zip - + x86_64 default diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index cd6ac3b2943..2c8e1b33a46 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -207,27 +207,35 @@ in }; }; + sysimg_arm64-v8a_24 = buildSystemImage { + name = "sysimg-arm64-v8a-24"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; + sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; + }; + }; + sysimg_armeabi-v7a_24 = buildSystemImage { name = "sysimg-armeabi-v7a-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armeabi-v7a-24_r05.zip; - sha1 = "2eb8fb86f7312614a2a0b033d669d67206a618ff"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; + sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; }; }; sysimg_x86_24 = buildSystemImage { name = "sysimg-x86-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-24_r05.zip; - sha1 = "ce6441c4cadaecd28b364c59b36c31ef0904dae0"; + url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip; + sha1 = "566fdee283a907854bfa3c174265bc31f396eabd"; }; }; sysimg_x86_64_24 = buildSystemImage { name = "sysimg-x86_64-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-24_r05.zip; - sha1 = "e1869b32b1dcb2f4d4d18c912166b3e2bee8a841"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip; + sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; }; }; } From 38c143abe2363aa8770a4879b348f7aeaf3fbca1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Sep 2016 19:04:58 +0200 Subject: [PATCH 167/234] ocaml-qtest: 2.0.1 -> 2.2 --- pkgs/development/ocaml-modules/qtest/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index f7e585b43b0..05b9c06af0f 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchzip, ocaml, oasis, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ounit }: -let version = "2.0.1"; in +let version = "2.2"; in stdenv.mkDerivation { name = "ocaml-qtest-${version}"; src = fetchzip { url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "00sir7q7z78s22w8fzrgw9gqm7r8ww0bgwqxrq6nsbbclgxj9c6i"; + sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz"; }; - buildInputs = [ ocaml oasis findlib ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ounit ]; - buildPhase = "ocaml do.ml qtest build $out"; createFindlibDestdir = true; - installPhase = "ocaml do.ml qtest install $out"; + installFlags = [ "BIN=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b66f7f48e3..4d6deb9ca0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5444,9 +5444,7 @@ in oasis = ocaml_oasis; }; - qtest = callPackage ../development/ocaml-modules/qtest { - oasis = ocaml_oasis; - }; + qtest = callPackage ../development/ocaml-modules/qtest { }; re = callPackage ../development/ocaml-modules/re { }; From c34d83eb366245f3a7b3533713cc6a83bed090d5 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Wed, 14 Sep 2016 19:04:23 +0200 Subject: [PATCH 168/234] lizardfs: 3.10.0 -> 3.10.2 --- pkgs/tools/filesystems/lizardfs/412.patch | 43 --------------------- pkgs/tools/filesystems/lizardfs/default.nix | 8 ++-- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 pkgs/tools/filesystems/lizardfs/412.patch diff --git a/pkgs/tools/filesystems/lizardfs/412.patch b/pkgs/tools/filesystems/lizardfs/412.patch deleted file mode 100644 index a2890cad399..00000000000 --- a/pkgs/tools/filesystems/lizardfs/412.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 26a27dedb7bee36f3ac5f48e22b977ea001d5903 Mon Sep 17 00:00:00 2001 -From: Maksymilian Paszkiewicz -Date: Mon, 23 May 2016 12:25:19 +0200 -Subject: [PATCH] common: Fix minor compile and copyright issues - -This commit adds include directive to -slice_read_planner.cc and fixes copyright -statement in filesystem_operations.cc - -Closes #411 -Closes #412 - -Change-Id: I3ac995708a09f64e1389871be2e961d594e4bc68 ---- - src/common/slice_read_planner.cc | 2 ++ - src/master/filesystem_operations.cc | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/common/slice_read_planner.cc b/src/common/slice_read_planner.cc -index 94c106c..d0284f1 100644 ---- a/src/common/slice_read_planner.cc -+++ b/src/common/slice_read_planner.cc -@@ -20,6 +20,8 @@ - - #include "common/slice_read_planner.h" - -+#include -+ - /*! - * Prepares read planner for serving selected parts of a slice type. - * Firstly, function checks if: -diff --git a/src/master/filesystem_operations.cc b/src/master/filesystem_operations.cc -index 69ff270..dc30b1f 100644 ---- a/src/master/filesystem_operations.cc -+++ b/src/master/filesystem_operations.cc -@@ -1,5 +1,6 @@ - /* -- Copyright 2013-2015 Skytechnology sp. z o.o.. -+ Copyright 2005-2010 Jakub Kruszona-Zawadzki, Gemius SA, 2013-2014 EditShare, -+ 2013-2016 Skytechnology sp. z o.o.. - - This file is part of LizardFS. - diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 0301d2e18fb..a50d8341f6b 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "lizardfs-${version}"; - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "lizardfs"; repo = "lizardfs"; - rev = "v.${version}"; - sha256 = "18p2pj9crjqgxxxzdfcs3j3fqhinmwi7qxcf71jsw17syqwyygh8"; + rev = "v${version}"; + sha256 = "0xw6skprxw0wcbqh4yx8f8a4q00x0sfz42llqgd047bcbga1k5zg"; }; buildInputs = @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { zlib boost pkgconfig judy pam makeWrapper ]; - patches = [ ./412.patch ]; - postInstall = '' wrapProgram $out/sbin/lizardfs-cgiserver \ --prefix PATH ":" "${python}/bin" From 92f0d709e997cde22cfc46e1c97b258b4cfa2ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 14 Sep 2016 19:15:19 +0200 Subject: [PATCH 169/234] libmaxminddb: init at 1.2.0 --- .../libraries/libmaxminddb/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libmaxminddb/default.nix diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix new file mode 100644 index 00000000000..827f18d2ffc --- /dev/null +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libmaxminddb-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; + sha256 = "0dxdyw6sxxmpzk2a96qp323r5kdmw7vm6m0l5a8gr52gf7nmks0z"; + }; + + meta = with stdenv.lib; { + description = "C library for working with MaxMind geolocation DB files"; + homepage = "https://github.com/maxmind/libmaxminddb"; + license = licenses.apsl20; + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d6deb9ca0c..2edce791899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8255,6 +8255,8 @@ in libltc = callPackage ../development/libraries/libltc { }; + libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmediainfo = callPackage ../development/libraries/libmediainfo { }; From 6a01fc2b7c7f6534821572e34febc2902b5370fb Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Wed, 24 Aug 2016 04:56:46 -0400 Subject: [PATCH 170/234] mosquitto: add websockets support. --- pkgs/servers/mqtt/mosquitto/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index be7947a03d6..a136c94aa57 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake }: +{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets }: stdenv.mkDerivation rec { pname = "mosquitto"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr"; }; - buildInputs = [ openssl libuuid ] + buildInputs = [ openssl libuuid libwebsockets ] ++ stdenv.lib.optional stdenv.isDarwin cmake; makeFlags = [ @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace config.mk \ --replace "/usr/local" "" + substituteInPlace config.mk \ + --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" + ''; meta = { From 85f2c3ebc9608f8efe8dbbccc798fa7550ef45a6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Sep 2016 01:12:22 -0500 Subject: [PATCH 171/234] mplayer: fix on darwin --- .../applications/audio/cdparanoia/default.nix | 2 +- pkgs/applications/video/mplayer/default.nix | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 28183a2c669..ceff147d618 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Carbon IOKit ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a317e1d4fe5..43b6f4f36cf 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, freetype, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? false, libvdpau ? null -, cddaSupport ? true, cdparanoia ? null -, dvdnavSupport ? true, libdvdnav ? null +, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null +, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null , bluraySupport ? true, libbluray ? null , amrSupport ? false, amrnb ? null, amrwb ? null , cacaSupport ? true, libcaca ? null @@ -24,6 +24,7 @@ , libpngSupport ? true, libpng ? null , libjpegSupport ? true, libjpeg ? null , useUnfreeCodecs ? false +, darwin ? null }: assert fontconfigSupport -> (fontconfig != null); @@ -102,6 +103,13 @@ stdenv.mkDerivation rec { sed -i /^_install_strip/d configure ''; + patches = [ + (fetchpatch { + url = "https://github.com/pigoz/mplayer-svn/commit/6c6a7c2afe11c15716cdf4371fb4bf211644b7e1.patch"; + sha256 = "0abg5122kisgcc8ay3barlibrgn259igsfq3ak6na9g8j5cgviw9"; + }) + ]; + buildInputs = with stdenv.lib; [ pkgconfig freetype ] ++ optional aalibSupport aalib @@ -127,6 +135,7 @@ stdenv.mkDerivation rec { ++ optional libpngSupport libpng ++ optional libjpegSupport libjpeg ++ optional bs2bSupport libbs2b + ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ]) ; nativeBuildInputs = [ yasm ]; @@ -162,8 +171,8 @@ stdenv.mkDerivation rec { --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc - --enable-vidix - --enable-fbdev + ${optionalString stdenv.isLinux "--enable-vidix"} + ${optionalString stdenv.isLinux "--enable-fbdev"} --disable-ossaudio ''; From db7adbf69c3536fedb0177709985abeab3a5f3b4 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 13 Sep 2016 00:23:56 +0200 Subject: [PATCH 172/234] go: fix darwin build --- pkgs/development/compilers/go/1.7.nix | 76 ++++++++--------- .../development/compilers/go/cacert-1.7.patch | 82 +++++++++++++++++++ 2 files changed, 115 insertions(+), 43 deletions(-) create mode 100644 pkgs/development/compilers/go/cacert-1.7.patch diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index d623d800bd7..0f78646e1aa 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -1,9 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand +{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch -, pcre +, pcre, cacert , Security, Foundation, bash }: let + + inherit (stdenv.lib) optional optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out cp -rf ${go_bootstrap}/* $out/ @@ -11,6 +19,7 @@ let find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ ''; + in stdenv.mkDerivation rec { @@ -27,28 +36,11 @@ stdenv.mkDerivation rec { # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch ]; buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ - Security Foundation - ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - topdir=$PWD - mkdir -p $out/share - cd $out/share - ''; - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go patchShebangs ./ # replace /bin/bash # This source produces shell script at run time, @@ -81,9 +73,9 @@ stdenv.mkDerivation rec { # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go - '' + lib.optionalString stdenv.isLinux '' + '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + lib.optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go @@ -93,6 +85,7 @@ stdenv.mkDerivation rec { sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestCurrent/areturn' src/os/user/user_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go @@ -106,20 +99,11 @@ stdenv.mkDerivation rec { touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd sed -i '1 a\exit 0' misc/cgo/errors/test.bash - - mkdir $topdir/dirtyhacks - cat < $topdir/dirtyhacks/clang - #!${bash}/bin/bash - $(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - exit $? - EOF - chmod +x $topdir/dirtyhacks/clang - PATH=$topdir/dirtyhacks:$PATH ''; - patches = [ - ./remove-tools-1.7.patch - ]; + patches = [ ./remove-tools-1.7.patch ./cacert-1.7.patch ]; + + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" @@ -127,7 +111,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; @@ -136,19 +120,25 @@ stdenv.mkDerivation rec { # just want the generic `cc` here. CC = if stdenv.isDarwin then "clang" else "cc"; + configurePhase = '' + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - echo Building - ./all.bash + cp -r . $GOROOT + ( cd $GOROOT/src && ./all.bash ) ''; preFixup = '' rm -r $out/share/go/pkg/bootstrap - rmdir $out/bin && mv $out/share/go/bin $out/bin + mv $out/share/go/bin $out/bin ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/cacert-1.7.patch new file mode 100644 index 00000000000..0fe9ff8cc23 --- /dev/null +++ b/pkgs/development/compilers/go/cacert-1.7.patch @@ -0,0 +1,82 @@ +diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +index a4b33c7..9700b75 100644 +--- a/src/crypto/x509/root_cgo_darwin.go ++++ b/src/crypto/x509/root_cgo_darwin.go +@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + var data C.CFDataRef = nil + err := C.FetchPEMRoots(&data) +diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +index 78de56c..05eada4 100644 +--- a/src/crypto/x509/root_darwin.go ++++ b/src/crypto/x509/root_darwin.go +@@ -6,20 +6,31 @@ + + package x509 + +-import "os/exec" ++import ( ++ "io/ioutil" ++ "os" ++ "os/exec" ++) + + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { + return nil, nil + } + + func execSecurityRoots() (*CertPool, error) { ++ roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") + data, err := cmd.Output() + if err != nil { + return nil, err + } + +- roots := NewCertPool() + roots.AppendCertsFromPEM(data) + return roots, nil + } +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index 7bcb3d6..3986e1a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + var firstErr error + for _, file := range certFiles { + data, err := ioutil.ReadFile(file) From a4cbd69ef05d7722118329c92fa162bd24974fc9 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 14 Sep 2016 21:32:29 +0200 Subject: [PATCH 173/234] emacs-modes: add upstream tramp this fixes http://emacs.stackexchange.com/questions/21026/tramp-recreates-dev-null-as-a-regular-file --- .../editors/emacs-modes/tramp/default.nix | 16 ++++++++++++++++ pkgs/top-level/emacs-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/tramp/default.nix diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix new file mode 100644 index 00000000000..b0cfe997908 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, emacs, texinfo }: + +stdenv.mkDerivation rec { + name = "tramp-2.3.0"; + src = fetchurl { + url = "mirror://gnu/tramp/${name}.tar.gz"; + sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi"; + }; + buildInputs = [ emacs texinfo ]; + meta = { + description = "Transparently access remote files from Emacs. Newer versions than built-in."; + homepage = https://www.gnu.org/software/tramp; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 62fb9407ee5..87023154ccb 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1566,6 +1566,8 @@ let }; }; + tramp = callPackage ../applications/editors/emacs-modes/tramp { }; + tracking = melpaBuild rec { pname = "tracking"; version = circe.version; From cb948d5b5c59b99042b6d2532e1a4df642aa1d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 14 Sep 2016 18:31:56 -0300 Subject: [PATCH 174/234] Greybird: 2016-08-16 -> 2016-09-13 --- pkgs/misc/themes/greybird/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 05fc2ab6103..6adedcb0d8d 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, autoreconfHook, sass, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - pname = "Greybird"; - version = "2016-08-16"; name = "${pname}-${version}"; + pname = "Greybird"; + version = "2016-09-13"; src = fetchFromGitHub { repo = "${pname}"; owner = "shimmerproject"; - rev = "fcaa400df68b1a29bb9dc8eb9c772a241f17c9ea"; - sha256 = "02f2zlkhi2als39ajq3v91iik708g5a9iyl3cvd65n80gr4jifmr"; + rev = "1942afc8732f904a1139fd41d7afd74263b87887"; + sha256 = "0qawc7rx5s3mnk5awvlbp6k5m9aj5krb1lasmgl2cb9fk09khf2v"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)"; - homepage = http://shimmerproject.org/our-projects/greybird/; + homepage = https://github.com/shimmerproject/Greybird; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; - maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; } From a1b7d213183cdc21dd367beda7bc804ef23d5f0d Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Wed, 14 Sep 2016 23:19:17 +0000 Subject: [PATCH 175/234] emoj: init at 0.3.0 --- .../node-packages/node-packages-v4.nix | 385 ++++++++++++++++-- .../node-packages/node-packages-v5.nix | 270 ++++++++++-- .../node-packages/node-packages.json | 1 + 3 files changed, 584 insertions(+), 72 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 55ab1b898cc..8367eff07a3 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -3766,13 +3766,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.5" = { + "pbkdf2-3.0.6" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.5.tgz"; - sha1 = "10d907817f11d1191c11499bd067f04330a0aec3"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.6.tgz"; + sha1 = "943d289ccd92b3dec55cc77dd696d44d6087e8bd"; }; }; "public-encrypt-4.0.0" = { @@ -8873,6 +8873,114 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; + "got-6.5.0" = { + name = "got"; + packageName = "got"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; + sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "node-status-codes-2.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.0.tgz"; + sha1 = "f2d469d8927f088aff28a956d2b93e3e2d14fb8d"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; @@ -9818,13 +9926,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.5" = { + "for-in-0.1.6" = { name = "for-in"; packageName = "for-in"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"; - sha1 = "007374e2b6d5c67420a1479bdb75a04872b738c4"; + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; + sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; }; }; "glob-base-0.3.0" = { @@ -11349,13 +11457,13 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.14.0" = { + "http-proxy-1.15.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz"; - sha1 = "be32ab34dd5229e87840f4c27cb335ee195b2a83"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz"; + sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393"; }; }; "isbinaryfile-3.0.1" = { @@ -12951,13 +13059,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.3.0" = { + "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.0.tgz"; - sha1 = "c0859acb27b6804895a6067c981d410e68d2b116"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; "ignore-by-default-1.0.1" = { @@ -16264,13 +16372,13 @@ let sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "uc.micro-1.0.2" = { + "uc.micro-1.0.3" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.2.tgz"; - sha1 = "466f26316a0bb707def6682f91f50139b8b8d538"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; "htmlparser2-3.9.1" = { @@ -17506,13 +17614,13 @@ let sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; }; }; - "loader-utils-0.2.15" = { + "loader-utils-0.2.16" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.15.tgz"; - sha1 = "c7df3342a9d4e2103dddc97d4060daccc246d6ac"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; + sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; "memory-fs-0.3.0" = { @@ -19026,7 +19134,7 @@ in }) ]; }) - sources."pbkdf2-3.0.5" + sources."pbkdf2-3.0.6" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -20154,7 +20262,7 @@ in }) ]; }) - sources."pbkdf2-3.0.5" + sources."pbkdf2-3.0.6" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -22266,6 +22374,211 @@ in }; production = true; }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; + sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + }; + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."got-6.5.0" // { + dependencies = [ + (sources."create-error-class-3.0.2" // { + dependencies = [ + sources."capture-stack-trace-1.0.0" + ]; + }) + sources."duplexer3-0.1.4" + (sources."get-stream-2.3.1" // { + dependencies = [ + sources."object-assign-4.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-2.0.0" + sources."timed-out-2.0.0" + sources."unzip-response-2.0.1" + (sources."url-parse-lax-1.0.0" // { + dependencies = [ + sources."prepend-http-1.0.4" + ]; + }) + ]; + }) + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."lodash.debounce-4.0.8" + (sources."log-update-1.0.2" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + (sources."cli-cursor-1.0.2" // { + dependencies = [ + (sources."restore-cursor-1.0.1" // { + dependencies = [ + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + ]; + }) + ]; + }) + ]; + }) + sources."mem-0.1.1" + (sources."meow-3.7.0" // { + dependencies = [ + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + (sources."loud-rejection-1.6.0" // { + dependencies = [ + (sources."currently-unhandled-0.4.1" // { + dependencies = [ + sources."array-find-index-1.0.1" + ]; + }) + sources."signal-exit-3.0.1" + ]; + }) + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.3" + ]; + }) + ]; + }) + sources."object-assign-4.1.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.6" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.6" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."redent-1.0.0" // { + dependencies = [ + (sources."indent-string-2.1.0" // { + dependencies = [ + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + ]; + }) + (sources."strip-indent-1.0.1" // { + dependencies = [ + sources."get-stdin-4.0.1" + ]; + }) + ]; + }) + sources."trim-newlines-1.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; @@ -22761,7 +23074,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -23806,7 +24119,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -24494,7 +24807,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -24861,7 +25174,7 @@ in ]; }) sources."graceful-fs-4.1.6" - (sources."http-proxy-1.14.0" // { + (sources."http-proxy-1.15.1" // { dependencies = [ sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" @@ -25495,7 +25808,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -27681,7 +27994,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -28003,7 +28316,7 @@ in sources."ms-0.7.1" ]; }) - sources."es6-promise-3.3.0" + sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" (sources."lodash.defaults-3.1.2" // { dependencies = [ @@ -33252,7 +33565,7 @@ in sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" - sources."uc.micro-1.0.2" + sources."uc.micro-1.0.3" ]; }) (sources."sanitize-html-1.13.0" // { @@ -35847,7 +36160,7 @@ in }) sources."acorn-3.3.0" sources."interpret-0.6.6" - (sources."loader-utils-0.2.15" // { + (sources."loader-utils-0.2.16" // { dependencies = [ sources."big.js-3.1.3" sources."emojis-list-2.0.1" @@ -36073,7 +36386,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index 9e8bf6f9935..d2d3fd63eb7 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -3757,13 +3757,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.5" = { + "pbkdf2-3.0.6" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.5.tgz"; - sha1 = "10d907817f11d1191c11499bd067f04330a0aec3"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.6.tgz"; + sha1 = "943d289ccd92b3dec55cc77dd696d44d6087e8bd"; }; }; "public-encrypt-4.0.0" = { @@ -8855,6 +8855,114 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; + "got-6.5.0" = { + name = "got"; + packageName = "got"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; + sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "node-status-codes-2.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.0.tgz"; + sha1 = "f2d469d8927f088aff28a956d2b93e3e2d14fb8d"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; @@ -9800,13 +9908,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.5" = { + "for-in-0.1.6" = { name = "for-in"; packageName = "for-in"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"; - sha1 = "007374e2b6d5c67420a1479bdb75a04872b738c4"; + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; + sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; }; }; "glob-base-0.3.0" = { @@ -11331,13 +11439,13 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.14.0" = { + "http-proxy-1.15.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz"; - sha1 = "be32ab34dd5229e87840f4c27cb335ee195b2a83"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz"; + sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393"; }; }; "isbinaryfile-3.0.1" = { @@ -12933,13 +13041,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.3.0" = { + "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.0.tgz"; - sha1 = "c0859acb27b6804895a6067c981d410e68d2b116"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; "ignore-by-default-1.0.1" = { @@ -16255,13 +16363,13 @@ let sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "uc.micro-1.0.2" = { + "uc.micro-1.0.3" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.2.tgz"; - sha1 = "466f26316a0bb707def6682f91f50139b8b8d538"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; "htmlparser2-3.9.1" = { @@ -17497,13 +17605,13 @@ let sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; }; }; - "loader-utils-0.2.15" = { + "loader-utils-0.2.16" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.15.tgz"; - sha1 = "c7df3342a9d4e2103dddc97d4060daccc246d6ac"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; + sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; "memory-fs-0.3.0" = { @@ -18346,7 +18454,7 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.5" + sources."pbkdf2-3.0.6" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" @@ -19014,7 +19122,7 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.5" + sources."pbkdf2-3.0.6" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" @@ -19797,6 +19905,96 @@ in }; production = true; }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; + sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + }; + dependencies = [ + sources."chalk-1.1.3" + sources."got-6.5.0" + sources."has-ansi-2.0.0" + sources."lodash.debounce-4.0.8" + sources."log-update-1.0.2" + sources."mem-0.1.1" + sources."meow-3.7.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."get-stream-2.3.1" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-2.0.0" + sources."timed-out-2.0.0" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."object-assign-4.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."prepend-http-1.0.4" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + sources."normalize-package-data-2.3.5" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.1" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."semver-5.3.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.3" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.6" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.1" + sources."number-is-nan-1.0.0" + sources."get-stdin-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; @@ -20077,7 +20275,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -20589,7 +20787,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."glob-parent-2.0.0" @@ -20940,7 +21138,7 @@ in }) sources."glob-7.0.6" sources."graceful-fs-4.1.6" - sources."http-proxy-1.14.0" + sources."http-proxy-1.15.1" sources."isbinaryfile-3.0.1" sources."lodash-3.10.1" (sources."log4js-0.6.38" // { @@ -21015,7 +21213,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -21491,7 +21689,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -22384,7 +22582,7 @@ in dependencies = [ sources."chokidar-1.6.0" sources."debug-2.2.0" - sources."es6-promise-3.3.0" + sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" sources."minimatch-3.0.3" @@ -22433,7 +22631,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -25112,7 +25310,7 @@ in sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" - sources."uc.micro-1.0.2" + sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.1" // { dependencies = [ sources."readable-stream-2.1.5" @@ -26364,7 +26562,7 @@ in }) sources."acorn-3.3.0" sources."interpret-0.6.6" - sources."loader-utils-0.2.15" + sources."loader-utils-0.2.16" sources."memory-fs-0.3.0" sources."mkdirp-0.5.1" (sources."node-libs-browser-0.6.0" // { @@ -26505,7 +26703,7 @@ in sources."is-posix-bracket-0.1.1" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 650f2642013..b3924727c01 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -10,6 +10,7 @@ , "dnschain" , "docker-registry-server" , "elasticdump" +, "emoj" , "eslint" , "fetch-bower" , "forever" From 56904d7c423f2b13b37fbd29f39bbb4b52bc7824 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 14 Sep 2016 19:31:32 -0400 Subject: [PATCH 176/234] Update libtiff URLs (#18611) * libtiff: remove dead source url * libgeotiff: update url --- pkgs/development/libraries/libgeotiff/default.nix | 2 +- pkgs/development/libraries/libtiff/default.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index d30ea6e5324..01dd6b0d49e 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgeotiff-1.2.5"; src = fetchurl { - url = ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; + url = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj"; }; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 373405432c8..bb6907c7b04 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -7,10 +7,7 @@ stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { - urls = - [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" - "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" - ]; + url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd"; }; From 952c477f901f35a99758bcc8fdf8b685ad8fa3e0 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 15 Sep 2016 00:51:56 +0100 Subject: [PATCH 177/234] nodePackages.bower2nix: Add back PATH wrapping bower2nix and fetch-bower need git in the PATH to operate. This wrapping got lost with the nodePackages updates. (Fixes #18454) --- pkgs/development/node-packages/default-v4.nix | 9 +++++++++ pkgs/development/node-packages/default-v5.nix | 9 +++++++++ pkgs/development/node-packages/default-v6.nix | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index be5a0abc4fc..99cb7ca4044 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -38,4 +38,13 @@ nodePackages // { npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { postInstall = "npm run-script prepublish"; }; + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix index c858c580d2a..00dce5966aa 100644 --- a/pkgs/development/node-packages/default-v5.nix +++ b/pkgs/development/node-packages/default-v5.nix @@ -32,4 +32,13 @@ nodePackages // { dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. }); + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index c858c580d2a..00dce5966aa 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -32,4 +32,13 @@ nodePackages // { dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. }); + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } From 131b8d4edb39d302db64ff284a7f5863d2d53522 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 15 Sep 2016 01:20:49 +0100 Subject: [PATCH 178/234] nodePackages.bower2nix: 3.0.1 -> 3.1.1 --- .../development/node-packages/node-packages-v4.nix | 8 ++++---- .../development/node-packages/node-packages-v5.nix | 8 ++++---- pkgs/top-level/node-packages-generated.nix | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 55ab1b898cc..a8c10a596a4 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -18570,10 +18570,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; - sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; }; dependencies = [ (sources."argparse-1.0.4" // { @@ -36452,4 +36452,4 @@ in }; production = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index 9e8bf6f9935..6d6d1b9f884 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -18101,10 +18101,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; - sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; }; dependencies = [ sources."argparse-1.0.4" @@ -26676,4 +26676,4 @@ in }; production = true; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index dbaa35cf7a6..432a367d153 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -5381,15 +5381,15 @@ cpu = [ ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.0.1"; - by-version."bower2nix"."3.0.1" = self.buildNodePackage { - name = "bower2nix-3.0.1"; - version = "3.0.1"; + self.by-version."bower2nix"."3.1.1"; + by-version."bower2nix"."3.1.1" = self.buildNodePackage { + name = "bower2nix-3.1.1"; + version = "3.1.1"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - name = "bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + name = "bower2nix-3.1.1.tgz"; + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; }; deps = { "argparse-1.0.4" = self.by-version."argparse"."1.0.4"; From 43dcb662e72826beb70c4f298eee38727c91c61b Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 14 Sep 2016 23:35:05 -0400 Subject: [PATCH 179/234] openssh: update gssapi patch, fix the build --- pkgs/tools/networking/openssh/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8f4c0aa54df..a6e4b7c4c20 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -17,9 +17,10 @@ let sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; }; + # **please** update this patch when you update to a new openssh release. gssapiSrc = fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35"; - sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5"; + url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=477bb7636238c106f8cd7c868a8c0c5eabcfb3db"; + sha256 = "1kcx2rw6z7y591vr60ww2m2civ0cx6f6awdpi66p1sric9b65si3"; }; in From ff9208c37a21cf3b488e7bb6ca7d0abba7419b47 Mon Sep 17 00:00:00 2001 From: Etienne Laurin Date: Thu, 15 Sep 2016 00:31:23 -0400 Subject: [PATCH 180/234] swiProlog: 6.6.6 -> 7.2.3 --- pkgs/development/compilers/swi-prolog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index c3e77152b3e..b6d6388c74b 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.6"; + version = "7.2.3"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { - url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z"; + url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"; + sha256 = "1da6sr8pz1zffs79nfa1d25a11ibhalm1vdwsb17p265nx8psra3"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama From af1d6e503ef6d6ad052979d37486076f71dfcf0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2016 18:02:47 +0200 Subject: [PATCH 181/234] configuration-hackage2nix.yaml: make sure some old (but required) packages remain available The switch to LTS 7.x has made many older versions obsolete and so they are no longer included in our package set by default: - aeson-pretty 0.7.x - hoogle 4.x - persistent 2.2 - persistent-sqlite 2.2 - persistent-template 2.1 --- .../haskell-modules/configuration-hackage2nix.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d282638a58e..c39fa422dca 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,6 +37,7 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 + - aeson-pretty < 0.8 # required by elm compiler - binary > 0.7 && < 0.8 # binary 0.8.x is the latest, but it's largely unsupported so far - Cabal == 1.18.* # required for cabal-install et al on old GHC versions - Cabal == 1.20.* # required for cabal-install et al on old GHC versions @@ -48,9 +49,13 @@ extra-packages: - haddock < 2.17 # required on GHC 7.10.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x + - hoogle < 5 # required by current implementation of ghcWithHoogle - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 + - persistent == 2.2.* # needed for git-annex + - persistent-sqlite == 2.2.* # needed for git-annex + - persistent-template == 2.1.* # needed for git-annex - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x From aa1d42442114107971ee1e6c1cf0c9de52400a57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2016 13:40:29 +0200 Subject: [PATCH 182/234] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v2.0.1-9-g9d0fb31 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/d68983aeb2069a83ffc13154cd04de14289f0ecd - LTS Haskell: https://github.com/fpco/lts-haskell/commit/36c0f4fa5e01617466cc1de3449e52e8c881eead - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/8b258a761d580f7be233d4d44d892d27d5240ccf --- .../haskell-modules/configuration-lts.nix | 958 +- .../haskell-modules/hackage-packages.nix | 9162 +---------------- 2 files changed, 515 insertions(+), 9605 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index 4f5c579635e..57e5fc19138 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -8,14 +8,16 @@ self: super: { Cabal = null; array = null; base = null; - bin-package-db = null; binary = null; bytestring = null; containers = null; deepseq = null; directory = null; filepath = null; + ghc-boot = null; + ghc-boot-th = null; ghc-prim = null; + ghci = null; hoopl = null; hpc = null; integer-gmp = null; @@ -27,7 +29,7 @@ self: super: { transformers = null; unix = null; - # lts-6.9 packages + # lts-7.0 packages "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; "3dmodels" = dontDistribute super."3dmodels"; "4Blocks" = dontDistribute super."4Blocks"; @@ -72,7 +74,6 @@ self: super: { "Advgame" = dontDistribute super."Advgame"; "AesonBson" = dontDistribute super."AesonBson"; "Agata" = dontDistribute super."Agata"; - "Agda" = doDistribute super."Agda_2_5_1"; "Agda-executable" = dontDistribute super."Agda-executable"; "AhoCorasick" = dontDistribute super."AhoCorasick"; "AlanDeniseEricLauren" = dontDistribute super."AlanDeniseEricLauren"; @@ -127,6 +128,8 @@ self: super: { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = dontDistribute super."BlogLiterately"; + "BlogLiterately-diagrams" = dontDistribute super."BlogLiterately-diagrams"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -157,6 +160,7 @@ self: super: { "CSPM-cspm" = dontDistribute super."CSPM-cspm"; "CTRex" = dontDistribute super."CTRex"; "CV" = dontDistribute super."CV"; + "Cabal-ide-backend" = dontDistribute super."Cabal-ide-backend"; "CabalSearch" = dontDistribute super."CabalSearch"; "Capabilities" = dontDistribute super."Capabilities"; "Cardinality" = dontDistribute super."Cardinality"; @@ -165,12 +169,8 @@ self: super: { "Cartesian" = dontDistribute super."Cartesian"; "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; - "Chart" = doDistribute super."Chart_1_6"; - "Chart-cairo" = doDistribute super."Chart-cairo_1_6"; - "Chart-diagrams" = doDistribute super."Chart-diagrams_1_6"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; - "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_1"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -179,7 +179,6 @@ self: super: { "ClassLaws" = dontDistribute super."ClassLaws"; "ClassyPrelude" = dontDistribute super."ClassyPrelude"; "Clean" = dontDistribute super."Clean"; - "Clipboard" = dontDistribute super."Clipboard"; "Coadjute" = dontDistribute super."Coadjute"; "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; @@ -213,7 +212,6 @@ self: super: { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; - "DAV" = doDistribute super."DAV_1_2"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -240,7 +238,6 @@ self: super: { "Delta-Lambda" = dontDistribute super."Delta-Lambda"; "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; "Dflow" = dontDistribute super."Dflow"; - "Diff" = doDistribute super."Diff_0_3_2"; "DifferenceLogic" = dontDistribute super."DifferenceLogic"; "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; "Digit" = dontDistribute super."Digit"; @@ -269,12 +266,12 @@ self: super: { "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; "EEConfig" = dontDistribute super."EEConfig"; - "EdisonAPI" = doDistribute super."EdisonAPI_1_3"; "EditTimeReport" = dontDistribute super."EditTimeReport"; "EitherT" = dontDistribute super."EitherT"; "Elm" = dontDistribute super."Elm"; "Emping" = dontDistribute super."Emping"; "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; "EnumContainers" = dontDistribute super."EnumContainers"; "EnumMap" = dontDistribute super."EnumMap"; "Eq" = dontDistribute super."Eq"; @@ -324,7 +321,6 @@ self: super: { "FpMLv53" = dontDistribute super."FpMLv53"; "FractalArt" = dontDistribute super."FractalArt"; "Fractaler" = dontDistribute super."Fractaler"; - "Frames" = doDistribute super."Frames_0_1_4"; "Frank" = dontDistribute super."Frank"; "FreeTypeGL" = dontDistribute super."FreeTypeGL"; "FunGEn" = dontDistribute super."FunGEn"; @@ -341,8 +337,10 @@ self: super: { "GLMatrix" = dontDistribute super."GLMatrix"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; "GTALib" = dontDistribute super."GTALib"; "Gamgine" = dontDistribute super."Gamgine"; @@ -361,7 +359,6 @@ self: super: { "GiST" = dontDistribute super."GiST"; "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; - "Glob" = doDistribute super."Glob_0_7_10"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; "GlomeView" = dontDistribute super."GlomeView"; @@ -385,7 +382,6 @@ self: super: { "GtkTV" = dontDistribute super."GtkTV"; "GuiHaskell" = dontDistribute super."GuiHaskell"; "GuiTV" = dontDistribute super."GuiTV"; - "H" = doDistribute super."H_0_8_0_0"; "HARM" = dontDistribute super."HARM"; "HAppS-Data" = dontDistribute super."HAppS-Data"; "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; @@ -397,8 +393,9 @@ self: super: { "HCard" = dontDistribute super."HCard"; "HDBC-mysql" = dontDistribute super."HDBC-mysql"; "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; - "HDBC-session" = doDistribute super."HDBC-session_0_1_0_1"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; "HDRUtils" = dontDistribute super."HDRUtils"; "HERA" = dontDistribute super."HERA"; "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; @@ -434,6 +431,7 @@ self: super: { "HLearn-classification" = dontDistribute super."HLearn-classification"; "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HList" = dontDistribute super."HList"; "HListPP" = dontDistribute super."HListPP"; "HLogger" = dontDistribute super."HLogger"; "HMM" = dontDistribute super."HMM"; @@ -465,19 +463,17 @@ self: super: { "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; - "HUnit" = doDistribute super."HUnit_1_3_1_1"; "HUnit-Diff" = dontDistribute super."HUnit-Diff"; "HUnit-Plus" = dontDistribute super."HUnit-Plus"; - "HUnit-approx" = dontDistribute super."HUnit-approx"; "HXMPP" = dontDistribute super."HXMPP"; "HXQ" = dontDistribute super."HXQ"; "HaLeX" = dontDistribute super."HaLeX"; "HaMinitel" = dontDistribute super."HaMinitel"; "HaPy" = dontDistribute super."HaPy"; - "HaRe" = doDistribute super."HaRe_0_8_2_3"; "HaTeX-meta" = dontDistribute super."HaTeX-meta"; "HaTeX-qq" = dontDistribute super."HaTeX-qq"; "HaVSA" = dontDistribute super."HaVSA"; + "HaXml" = dontDistribute super."HaXml"; "Hach" = dontDistribute super."Hach"; "HackMail" = dontDistribute super."HackMail"; "Haggressive" = dontDistribute super."Haggressive"; @@ -523,10 +519,10 @@ self: super: { "HsHaruPDF" = dontDistribute super."HsHaruPDF"; "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; "HsJudy" = dontDistribute super."HsJudy"; - "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; "HsParrot" = dontDistribute super."HsParrot"; "HsPerl5" = dontDistribute super."HsPerl5"; "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; "HsTools" = dontDistribute super."HsTools"; "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; @@ -559,10 +555,9 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; - "JuicyPixels" = doDistribute super."JuicyPixels_3_2_7_2"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; - "JuicyPixels-extra" = dontDistribute super."JuicyPixels-extra"; - "JuicyPixels-scale-dct" = doDistribute super."JuicyPixels-scale-dct_0_1_1_0"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; "JunkDB" = dontDistribute super."JunkDB"; "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; @@ -600,12 +595,11 @@ self: super: { "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; - "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; - "ListLike" = doDistribute super."ListLike_4_2_1"; + "List" = dontDistribute super."List"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; "ListZipper" = dontDistribute super."ListZipper"; @@ -616,6 +610,7 @@ self: super: { "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; "LslPlus" = dontDistribute super."LslPlus"; "Lucu" = dontDistribute super."Lucu"; + "MASMGen" = dontDistribute super."MASMGen"; "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; @@ -637,7 +632,6 @@ self: super: { "Michelangelo" = dontDistribute super."Michelangelo"; "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; "MiniAgda" = dontDistribute super."MiniAgda"; - "MissingH" = doDistribute super."MissingH_1_3_0_2"; "MissingK" = dontDistribute super."MissingK"; "MissingM" = dontDistribute super."MissingM"; "MissingPy" = dontDistribute super."MissingPy"; @@ -646,6 +640,7 @@ self: super: { "MoeDict" = dontDistribute super."MoeDict"; "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers" = dontDistribute super."MonadCatchIO-transformers"; "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; @@ -678,8 +673,9 @@ self: super: { "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; "NetSNMP" = dontDistribute super."NetSNMP"; - "Network-NineP" = doDistribute super."Network-NineP_0_4_0"; + "Network-NineP" = dontDistribute super."Network-NineP"; "NewBinary" = dontDistribute super."NewBinary"; + "NineP" = dontDistribute super."NineP"; "Ninjas" = dontDistribute super."Ninjas"; "NoSlow" = dontDistribute super."NoSlow"; "Noise" = dontDistribute super."Noise"; @@ -711,7 +707,6 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; - "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_1_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -756,7 +751,7 @@ self: super: { "Plural" = dontDistribute super."Plural"; "Pollutocracy" = dontDistribute super."Pollutocracy"; "PortFusion" = dontDistribute super."PortFusion"; - "PortMidi" = doDistribute super."PortMidi_0_1_6_0"; + "PortMidi" = dontDistribute super."PortMidi"; "PostgreSQL" = dontDistribute super."PostgreSQL"; "PrimitiveArray" = dontDistribute super."PrimitiveArray"; "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty"; @@ -794,6 +789,7 @@ self: super: { "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; "RNAdesign" = dontDistribute super."RNAdesign"; "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAlien" = dontDistribute super."RNAlien"; "RNAwolf" = dontDistribute super."RNAwolf"; "Raincat" = dontDistribute super."Raincat"; "Random123" = dontDistribute super."Random123"; @@ -806,10 +802,10 @@ self: super: { "Redmine" = dontDistribute super."Redmine"; "Ref" = dontDistribute super."Ref"; "Referees" = dontDistribute super."Referees"; - "RepLib" = dontDistribute super."RepLib"; "ReplicateEffects" = dontDistribute super."ReplicateEffects"; "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; + "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; @@ -848,7 +844,6 @@ self: super: { "Semigroup" = dontDistribute super."Semigroup"; "SeqAlign" = dontDistribute super."SeqAlign"; "SessionLogger" = dontDistribute super."SessionLogger"; - "ShellCheck" = dontDistribute super."ShellCheck"; "Shellac" = dontDistribute super."Shellac"; "Shellac-compatline" = dontDistribute super."Shellac-compatline"; "Shellac-editline" = dontDistribute super."Shellac-editline"; @@ -877,14 +872,9 @@ self: super: { "SpaceInvaders" = dontDistribute super."SpaceInvaders"; "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; - "Spock" = doDistribute super."Spock_0_10_0_1"; - "Spock-api" = dontDistribute super."Spock-api"; "Spock-api-ghcjs" = dontDistribute super."Spock-api-ghcjs"; - "Spock-api-server" = dontDistribute super."Spock-api-server"; "Spock-auth" = dontDistribute super."Spock-auth"; - "Spock-core" = dontDistribute super."Spock-core"; - "Spock-digestive" = doDistribute super."Spock-digestive_0_2_0_0"; - "Spock-worker" = doDistribute super."Spock-worker_0_3_0_0"; + "Spock-digestive" = dontDistribute super."Spock-digestive"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -915,6 +905,8 @@ self: super: { "Tainted" = dontDistribute super."Tainted"; "Takusen" = dontDistribute super."Takusen"; "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TaxonomyTools" = dontDistribute super."TaxonomyTools"; "TeaHS" = dontDistribute super."TeaHS"; "Tensor" = dontDistribute super."Tensor"; "TernaryTrees" = dontDistribute super."TernaryTrees"; @@ -986,7 +978,6 @@ self: super: { "Webrexp" = dontDistribute super."Webrexp"; "Wheb" = dontDistribute super."Wheb"; "WikimediaParser" = dontDistribute super."WikimediaParser"; - "Win32" = doDistribute super."Win32_2_3_1_0"; "Win32-console" = dontDistribute super."Win32-console"; "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; "Win32-errors" = dontDistribute super."Win32-errors"; @@ -1057,8 +1048,6 @@ self: super: { "accelerate-utility" = dontDistribute super."accelerate-utility"; "accentuateus" = dontDistribute super."accentuateus"; "access-time" = dontDistribute super."access-time"; - "accuerr" = dontDistribute super."accuerr"; - "acid-state" = doDistribute super."acid-state_0_14_1"; "acid-state-dist" = dontDistribute super."acid-state-dist"; "acid-state-tls" = dontDistribute super."acid-state-tls"; "acl2" = dontDistribute super."acl2"; @@ -1112,25 +1101,22 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; - "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; - "aeson" = doDistribute super."aeson_0_11_2_0"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-coerce" = dontDistribute super."aeson-coerce"; - "aeson-compat" = doDistribute super."aeson-compat_0_3_5_1"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-flatten" = dontDistribute super."aeson-flatten"; - "aeson-injector" = dontDistribute super."aeson-injector"; "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-json-ast" = dontDistribute super."aeson-json-ast"; + "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; "aeson-prefix" = dontDistribute super."aeson-prefix"; - "aeson-pretty" = doDistribute super."aeson-pretty_0_7_2"; "aeson-schema" = dontDistribute super."aeson-schema"; "aeson-serialize" = dontDistribute super."aeson-serialize"; "aeson-smart" = dontDistribute super."aeson-smart"; @@ -1144,6 +1130,9 @@ self: super: { "afv" = dontDistribute super."afv"; "ag-pictgen" = dontDistribute super."ag-pictgen"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; + "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll"; + "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1151,7 +1140,6 @@ self: super: { "air-spec" = dontDistribute super."air-spec"; "air-th" = dontDistribute super."air-th"; "airbrake" = dontDistribute super."airbrake"; - "airship" = doDistribute super."airship_0_5_0"; "aivika" = dontDistribute super."aivika"; "aivika-branches" = dontDistribute super."aivika-branches"; "aivika-distributed" = dontDistribute super."aivika-distributed"; @@ -1163,7 +1151,6 @@ self: super: { "aivika-transformers" = dontDistribute super."aivika-transformers"; "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; - "alarmclock" = doDistribute super."alarmclock_0_2_0_9"; "alea" = dontDistribute super."alea"; "alex-meta" = dontDistribute super."alex-meta"; "alex-tools" = dontDistribute super."alex-tools"; @@ -1201,10 +1188,7 @@ self: super: { "amazon-emailer" = dontDistribute super."amazon-emailer"; "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; "amazon-products" = dontDistribute super."amazon-products"; - "amazonka-application-autoscaling" = dontDistribute super."amazonka-application-autoscaling"; - "amazonka-discovery" = dontDistribute super."amazonka-discovery"; "ampersand" = dontDistribute super."ampersand"; - "amqp" = doDistribute super."amqp_0_13_1"; "amqp-conduit" = dontDistribute super."amqp-conduit"; "amrun" = dontDistribute super."amrun"; "analyze-client" = dontDistribute super."analyze-client"; @@ -1220,7 +1204,6 @@ self: super: { "annihilator" = dontDistribute super."annihilator"; "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; "ansi-pretty" = dontDistribute super."ansi-pretty"; - "ansigraph" = dontDistribute super."ansigraph"; "antagonist" = dontDistribute super."antagonist"; "antfarm" = dontDistribute super."antfarm"; "anticiv" = dontDistribute super."anticiv"; @@ -1238,9 +1221,20 @@ self: super: { "api-builder" = dontDistribute super."api-builder"; "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; "api-tools" = dontDistribute super."api-tools"; + "apiary" = dontDistribute super."apiary"; + "apiary-authenticate" = dontDistribute super."apiary-authenticate"; + "apiary-clientsession" = dontDistribute super."apiary-clientsession"; + "apiary-cookie" = dontDistribute super."apiary-cookie"; + "apiary-eventsource" = dontDistribute super."apiary-eventsource"; "apiary-helics" = dontDistribute super."apiary-helics"; "apiary-http-client" = dontDistribute super."apiary-http-client"; + "apiary-logger" = dontDistribute super."apiary-logger"; + "apiary-memcached" = dontDistribute super."apiary-memcached"; + "apiary-mongoDB" = dontDistribute super."apiary-mongoDB"; + "apiary-persistent" = dontDistribute super."apiary-persistent"; "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apiary-session" = dontDistribute super."apiary-session"; + "apiary-websockets" = dontDistribute super."apiary-websockets"; "apis" = dontDistribute super."apis"; "apotiki" = dontDistribute super."apotiki"; "app-lens" = dontDistribute super."app-lens"; @@ -1251,14 +1245,13 @@ self: super: { "applicative-parsec" = dontDistribute super."applicative-parsec"; "applicative-quoters" = dontDistribute super."applicative-quoters"; "applicative-splice" = dontDistribute super."applicative-splice"; - "apply-refact" = doDistribute super."apply-refact_0_2_0_0"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate" = dontDistribute super."approximate"; "approximate-equality" = dontDistribute super."approximate-equality"; "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; - "arbtt" = doDistribute super."arbtt_0_9_0_9"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1279,7 +1272,6 @@ self: super: { "armada" = dontDistribute super."armada"; "arpa" = dontDistribute super."arpa"; "array-forth" = dontDistribute super."array-forth"; - "array-memoize" = dontDistribute super."array-memoize"; "array-primops" = dontDistribute super."array-primops"; "array-utils" = dontDistribute super."array-utils"; "arrow-improve" = dontDistribute super."arrow-improve"; @@ -1296,7 +1288,6 @@ self: super: { "ascii-table" = dontDistribute super."ascii-table"; "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; "ascii85-conduit" = dontDistribute super."ascii85-conduit"; - "asciidiagram" = doDistribute super."asciidiagram_1_3_1_1"; "asic" = dontDistribute super."asic"; "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; @@ -1311,7 +1302,6 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async-ajax" = dontDistribute super."async-ajax"; - "async-dejafu" = doDistribute super."async-dejafu_0_1_2_2"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1326,7 +1316,6 @@ self: super: { "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; "atom" = dontDistribute super."atom"; "atom-basic" = dontDistribute super."atom-basic"; - "atom-conduit" = doDistribute super."atom-conduit_0_3_1_1"; "atom-msp430" = dontDistribute super."atom-msp430"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; @@ -1336,13 +1325,14 @@ self: super: { "attempt" = dontDistribute super."attempt"; "atto-lisp" = dontDistribute super."atto-lisp"; "attoparsec-arff" = dontDistribute super."attoparsec-arff"; - "attoparsec-binary" = dontDistribute super."attoparsec-binary"; "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-enumerator" = dontDistribute super."attoparsec-enumerator"; "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; "attoparsec-text" = dontDistribute super."attoparsec-text"; "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attoparsec-trans" = dontDistribute super."attoparsec-trans"; "attosplit" = dontDistribute super."attosplit"; "atuin" = dontDistribute super."atuin"; "audacity" = dontDistribute super."audacity"; @@ -1363,6 +1353,9 @@ self: super: { "avahi" = dontDistribute super."avahi"; "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "avwx" = dontDistribute super."avwx"; @@ -1370,7 +1363,6 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; - "aws" = doDistribute super."aws_0_13_2"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1415,10 +1407,10 @@ self: super: { "barecheck" = dontDistribute super."barecheck"; "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; - "base-noprelude" = doDistribute super."base-noprelude_4_8_2_0"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; "base58address" = dontDistribute super."base58address"; @@ -1427,16 +1419,15 @@ self: super: { "basex-client" = dontDistribute super."basex-client"; "bash" = dontDistribute super."bash"; "basic-lens" = dontDistribute super."basic-lens"; - "basic-prelude" = doDistribute super."basic-prelude_0_5_2"; "basic-sop" = dontDistribute super."basic-sop"; "baskell" = dontDistribute super."baskell"; + "batch-rename" = dontDistribute super."batch-rename"; "battlenet" = dontDistribute super."battlenet"; "battlenet-yesod" = dontDistribute super."battlenet-yesod"; "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; "bbi" = dontDistribute super."bbi"; - "bcrypt" = doDistribute super."bcrypt_0_0_8"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; "bdo" = dontDistribute super."bdo"; @@ -1467,7 +1458,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1485,6 +1475,7 @@ self: super: { "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; @@ -1525,7 +1516,6 @@ self: super: { "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; "bindings-libusb" = dontDistribute super."bindings-libusb"; "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; - "bindings-libzip" = dontDistribute super."bindings-libzip"; "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; "bindings-lxc" = dontDistribute super."bindings-lxc"; "bindings-mmap" = dontDistribute super."bindings-mmap"; @@ -1533,6 +1523,7 @@ self: super: { "bindings-nettle" = dontDistribute super."bindings-nettle"; "bindings-parport" = dontDistribute super."bindings-parport"; "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; "bindings-potrace" = dontDistribute super."bindings-potrace"; "bindings-ppdev" = dontDistribute super."bindings-ppdev"; "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; @@ -1552,20 +1543,18 @@ self: super: { "bio" = dontDistribute super."bio"; "biohazard" = dontDistribute super."biohazard"; "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; - "biophd" = doDistribute super."biophd_0_0_4"; + "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; "bit-array" = dontDistribute super."bit-array"; "bit-vector" = dontDistribute super."bit-vector"; "bitarray" = dontDistribute super."bitarray"; - "bitcoin-payment-channel" = dontDistribute super."bitcoin-payment-channel"; "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; "bitly-cli" = dontDistribute super."bitly-cli"; "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-bytestring-lazy" = dontDistribute super."bits-bytestring-lazy"; @@ -1577,14 +1566,13 @@ self: super: { "bitstring" = dontDistribute super."bitstring"; "bittorrent" = dontDistribute super."bittorrent"; "bitvec" = dontDistribute super."bitvec"; - "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bitwise" = dontDistribute super."bitwise"; "bk-tree" = dontDistribute super."bk-tree"; "bkr" = dontDistribute super."bkr"; "bktrees" = dontDistribute super."bktrees"; "bla" = dontDistribute super."bla"; "black-jewel" = dontDistribute super."black-jewel"; "blacktip" = dontDistribute super."blacktip"; - "blake2" = doDistribute super."blake2_0_1_0"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; "blas" = dontDistribute super."blas"; @@ -1592,13 +1580,12 @@ self: super: { "blatex" = dontDistribute super."blatex"; "blaze" = dontDistribute super."blaze"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-builder-enumerator" = dontDistribute super."blaze-builder-enumerator"; "blaze-from-html" = dontDistribute super."blaze-from-html"; - "blaze-html" = doDistribute super."blaze-html_0_8_1_1"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; - "blaze-markup" = doDistribute super."blaze-markup_0_7_0_3"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -1609,15 +1596,14 @@ self: super: { "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; + "bloomfilter" = dontDistribute super."bloomfilter"; "bloomfilter-redis" = dontDistribute super."bloomfilter-redis"; - "blosum" = dontDistribute super."blosum"; "bloxorz" = dontDistribute super."bloxorz"; "blubber" = dontDistribute super."blubber"; "blubber-server" = dontDistribute super."blubber-server"; "bluetile" = dontDistribute super."bluetile"; "bluetileutils" = dontDistribute super."bluetileutils"; "blunt" = dontDistribute super."blunt"; - "bmp" = doDistribute super."bmp_1_2_5_2"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; @@ -1625,11 +1611,11 @@ self: super: { "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bookkeeper" = dontDistribute super."bookkeeper"; "bookkeeper-permissions" = dontDistribute super."bookkeeper-permissions"; + "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; - "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; "boombox" = dontDistribute super."boombox"; "boomslang" = dontDistribute super."boomslang"; @@ -1637,9 +1623,9 @@ self: super: { "boring-window-switcher" = dontDistribute super."boring-window-switcher"; "bot" = dontDistribute super."bot"; "botpp" = dontDistribute super."botpp"; + "bound" = dontDistribute super."bound"; "bound-gen" = dontDistribute super."bound-gen"; "bounded-tchan" = dontDistribute super."bounded-tchan"; - "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "box-tuples" = dontDistribute super."box-tuples"; "bpann" = dontDistribute super."bpann"; @@ -1651,7 +1637,7 @@ self: super: { "breakout" = dontDistribute super."breakout"; "breve" = dontDistribute super."breve"; "brians-brain" = dontDistribute super."brians-brain"; - "brick" = doDistribute super."brick_0_4_1"; + "brick" = dontDistribute super."brick"; "brillig" = dontDistribute super."brillig"; "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; @@ -1662,6 +1648,7 @@ self: super: { "bspack" = dontDistribute super."bspack"; "bsparse" = dontDistribute super."bsparse"; "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder" = dontDistribute super."buffer-builder"; "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; "buffer-pipe" = dontDistribute super."buffer-pipe"; "buffon" = dontDistribute super."buffon"; @@ -1681,17 +1668,17 @@ self: super: { "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; - "bytestring-builder" = doDistribute super."bytestring-builder_0_10_6_0_0"; "bytestring-class" = dontDistribute super."bytestring-class"; "bytestring-csv" = dontDistribute super."bytestring-csv"; "bytestring-delta" = dontDistribute super."bytestring-delta"; "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-mmap" = dontDistribute super."bytestring-mmap"; "bytestring-nums" = dontDistribute super."bytestring-nums"; "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; - "bytestring-tree-builder" = doDistribute super."bytestring-tree-builder_0_2_7"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1709,14 +1696,13 @@ self: super: { "cabal-cargs" = dontDistribute super."cabal-cargs"; "cabal-constraints" = dontDistribute super."cabal-constraints"; "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = dontDistribute super."cabal-debian"; "cabal-dev" = dontDistribute super."cabal-dev"; "cabal-dir" = dontDistribute super."cabal-dir"; "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; - "cabal-helper" = doDistribute super."cabal-helper_0_6_3_1"; "cabal-info" = dontDistribute super."cabal-info"; - "cabal-install" = doDistribute super."cabal-install_1_22_9_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1727,7 +1713,6 @@ self: super: { "cabal-nirvana" = dontDistribute super."cabal-nirvana"; "cabal-progdeps" = dontDistribute super."cabal-progdeps"; "cabal-query" = dontDistribute super."cabal-query"; - "cabal-rpm" = doDistribute super."cabal-rpm_0_9_11"; "cabal-scripts" = dontDistribute super."cabal-scripts"; "cabal-setup" = dontDistribute super."cabal-setup"; "cabal-sign" = dontDistribute super."cabal-sign"; @@ -1741,7 +1726,6 @@ self: super: { "cabal2doap" = dontDistribute super."cabal2doap"; "cabal2ebuild" = dontDistribute super."cabal2ebuild"; "cabal2ghci" = dontDistribute super."cabal2ghci"; - "cabal2nix" = dontDistribute super."cabal2nix"; "cabal2spec" = dontDistribute super."cabal2spec"; "cabalQuery" = dontDistribute super."cabalQuery"; "cabalg" = dontDistribute super."cabalg"; @@ -1751,14 +1735,11 @@ self: super: { "cabalvchk" = dontDistribute super."cabalvchk"; "cabin" = dontDistribute super."cabin"; "cabocha" = dontDistribute super."cabocha"; - "cache" = dontDistribute super."cache"; "cached-io" = dontDistribute super."cached-io"; "cached-traversable" = dontDistribute super."cached-traversable"; - "cacophony" = doDistribute super."cacophony_0_6_0"; "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; - "cairo" = doDistribute super."cairo_0_13_1_1"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1767,12 +1748,12 @@ self: super: { "cal3d-examples" = dontDistribute super."cal3d-examples"; "cal3d-opengl" = dontDistribute super."cal3d-opengl"; "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; "caldims" = dontDistribute super."caldims"; "caledon" = dontDistribute super."caledon"; "calendar-recycling" = dontDistribute super."calendar-recycling"; "call" = dontDistribute super."call"; "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; - "camfort" = dontDistribute super."camfort"; "camh" = dontDistribute super."camh"; "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; @@ -1791,8 +1772,6 @@ self: super: { "caramia" = dontDistribute super."caramia"; "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; - "carray" = doDistribute super."carray_0_1_6_4"; - "cartel" = doDistribute super."cartel_0_16_0_0"; "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; @@ -1816,10 +1795,7 @@ self: super: { "casr-logbook-types" = dontDistribute super."casr-logbook-types"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; - "cassava-conduit" = dontDistribute super."cassava-conduit"; - "cassava-megaparsec" = dontDistribute super."cassava-megaparsec"; "cassava-streams" = dontDistribute super."cassava-streams"; - "cassette" = dontDistribute super."cassette"; "cassy" = dontDistribute super."cassy"; "castle" = dontDistribute super."castle"; "casui" = dontDistribute super."casui"; @@ -1830,6 +1806,7 @@ self: super: { "category-extras" = dontDistribute super."category-extras"; "category-printf" = dontDistribute super."category-printf"; "category-traced" = dontDistribute super."category-traced"; + "cautious-file" = dontDistribute super."cautious-file"; "cayley-dickson" = dontDistribute super."cayley-dickson"; "cblrepo" = dontDistribute super."cblrepo"; "cci" = dontDistribute super."cci"; @@ -1840,7 +1817,6 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; - "cereal" = doDistribute super."cereal_0_5_2_0"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1890,14 +1866,12 @@ self: super: { "chronos" = dontDistribute super."chronos"; "chu2" = dontDistribute super."chu2"; "chuchu" = dontDistribute super."chuchu"; - "chunked-data" = doDistribute super."chunked-data_0_2_0"; "chunks" = dontDistribute super."chunks"; "chunky" = dontDistribute super."chunky"; "church-list" = dontDistribute super."church-list"; "cil" = dontDistribute super."cil"; "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; - "cipher-aes128" = doDistribute super."cipher-aes128_0_7_0_1"; "cipher-rc5" = dontDistribute super."cipher-rc5"; "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; @@ -1916,23 +1890,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; - "clash-ghc" = doDistribute super."clash-ghc_0_6_21"; - "clash-lib" = doDistribute super."clash-lib_0_6_19"; - "clash-prelude" = doDistribute super."clash-prelude_0_10_10"; + "clash-ghc" = dontDistribute super."clash-ghc"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; - "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_7"; - "clash-verilog" = doDistribute super."clash-verilog_0_6_7"; - "clash-vhdl" = doDistribute super."clash-vhdl_0_6_15"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; - "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; - "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_8"; - "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_8"; - "clay" = doDistribute super."clay_0_10_1"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; - "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_3"; "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; "cld2" = dontDistribute super."cld2"; @@ -1940,7 +1904,6 @@ self: super: { "clean-unions" = dontDistribute super."clean-unions"; "cless" = dontDistribute super."cless"; "clevercss" = dontDistribute super."clevercss"; - "cli" = dontDistribute super."cli"; "click-clack" = dontDistribute super."click-clack"; "clifford" = dontDistribute super."clifford"; "clippard" = dontDistribute super."clippard"; @@ -1961,8 +1924,6 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; - "cmark-highlight" = dontDistribute super."cmark-highlight"; - "cmark-lucid" = dontDistribute super."cmark-lucid"; "cmark-sections" = dontDistribute super."cmark-sections"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; @@ -1983,8 +1944,7 @@ self: super: { "codemonitor" = dontDistribute super."codemonitor"; "codepad" = dontDistribute super."codepad"; "codeworld-api" = dontDistribute super."codeworld-api"; - "codex" = doDistribute super."codex_0_4_0_10"; - "codo-notation" = dontDistribute super."codo-notation"; + "codex" = dontDistribute super."codex"; "cofunctor" = dontDistribute super."cofunctor"; "cognimeta-utils" = dontDistribute super."cognimeta-utils"; "coin" = dontDistribute super."coin"; @@ -2018,7 +1978,6 @@ self: super: { "commodities" = dontDistribute super."commodities"; "commsec" = dontDistribute super."commsec"; "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; - "comonad" = doDistribute super."comonad_4_2_7_2"; "comonad-extras" = dontDistribute super."comonad-extras"; "comonad-random" = dontDistribute super."comonad-random"; "compact-map" = dontDistribute super."compact-map"; @@ -2037,23 +1996,24 @@ self: super: { "complexity" = dontDistribute super."complexity"; "compose-ltr" = dontDistribute super."compose-ltr"; "compose-trans" = dontDistribute super."compose-trans"; + "composition-tree" = dontDistribute super."composition-tree"; "compound-types" = dontDistribute super."compound-types"; + "compressed" = dontDistribute super."compressed"; "compression" = dontDistribute super."compression"; "compstrat" = dontDistribute super."compstrat"; "comptrans" = dontDistribute super."comptrans"; "computational-algebra" = dontDistribute super."computational-algebra"; "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; "concorde" = dontDistribute super."concorde"; "concraft" = dontDistribute super."concraft"; "concraft-hr" = dontDistribute super."concraft-hr"; "concraft-pl" = dontDistribute super."concraft-pl"; "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; "concrete-typerep" = dontDistribute super."concrete-typerep"; - "concurrency" = dontDistribute super."concurrency"; "concurrent-barrier" = dontDistribute super."concurrent-barrier"; "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; "concurrent-machines" = dontDistribute super."concurrent-machines"; - "concurrent-output" = doDistribute super."concurrent-output_1_7_6"; "concurrent-rpc" = dontDistribute super."concurrent-rpc"; "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; @@ -2067,16 +2027,14 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; - "conduit" = doDistribute super."conduit_1_2_6_6"; "conduit-audio" = dontDistribute super."conduit-audio"; "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-combinators" = doDistribute super."conduit-combinators_1_0_4"; + "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-find" = dontDistribute super."conduit-find"; "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; - "conduit-parse" = doDistribute super."conduit-parse_0_1_1_1"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; "conf" = dontDistribute super."conf"; @@ -2092,7 +2050,6 @@ self: super: { "conjugateGradient" = dontDistribute super."conjugateGradient"; "conjure" = dontDistribute super."conjure"; "conlogger" = dontDistribute super."conlogger"; - "connection" = doDistribute super."connection_0_2_5"; "connection-pool" = dontDistribute super."connection-pool"; "consistent" = dontDistribute super."consistent"; "console-program" = dontDistribute super."console-program"; @@ -2114,7 +2071,6 @@ self: super: { "continue" = dontDistribute super."continue"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; - "contravariant-extras" = doDistribute super."contravariant-extras_0_3_2"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; "control-monad-exception" = dontDistribute super."control-monad-exception"; @@ -2158,23 +2114,21 @@ self: super: { "couchdb-conduit" = dontDistribute super."couchdb-conduit"; "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; "count" = dontDistribute super."count"; - "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; - "courier" = doDistribute super."courier_0_1_1_3"; + "country-codes" = dontDistribute super."country-codes"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplex-hs" = dontDistribute super."cplex-hs"; "cplusplus-th" = dontDistribute super."cplusplus-th"; - "cpphs" = doDistribute super."cpphs_1_20_1"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; "cpuinfo" = dontDistribute super."cpuinfo"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; - "cql" = doDistribute super."cql_3_0_7"; - "cql-io" = doDistribute super."cql-io_0_15_2"; + "cql" = dontDistribute super."cql"; + "cql-io" = dontDistribute super."cql-io"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2219,9 +2173,6 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash-md5" = dontDistribute super."cryptohash-md5"; "cryptohash-sha1" = dontDistribute super."cryptohash-sha1"; - "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; - "cryptol" = doDistribute super."cryptol_2_3_0"; - "cryptonite" = doDistribute super."cryptonite_0_15"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; "cryptsy-api" = dontDistribute super."cryptsy-api"; "crystalfontz" = dontDistribute super."crystalfontz"; @@ -2235,7 +2186,7 @@ self: super: { "csp" = dontDistribute super."csp"; "cspmchecker" = dontDistribute super."cspmchecker"; "css" = dontDistribute super."css"; - "css-text" = doDistribute super."css-text_0_1_2_1"; + "csv-conduit" = dontDistribute super."csv-conduit"; "csv-enumerator" = dontDistribute super."csv-enumerator"; "csv-nptools" = dontDistribute super."csv-nptools"; "csv-table" = dontDistribute super."csv-table"; @@ -2275,7 +2226,6 @@ self: super: { "danibot" = dontDistribute super."danibot"; "dao" = dontDistribute super."dao"; "dapi" = dontDistribute super."dapi"; - "darcs" = doDistribute super."darcs_2_12_0"; "darcs-benchmark" = dontDistribute super."darcs-benchmark"; "darcs-beta" = dontDistribute super."darcs-beta"; "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; @@ -2303,17 +2253,14 @@ self: super: { "data-carousel" = dontDistribute super."data-carousel"; "data-category" = dontDistribute super."data-category"; "data-cell" = dontDistribute super."data-cell"; - "data-check" = dontDistribute super."data-check"; "data-checked" = dontDistribute super."data-checked"; "data-clist" = dontDistribute super."data-clist"; "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; - "data-default" = doDistribute super."data-default_0_5_3"; - "data-default-class" = doDistribute super."data-default-class_0_0_1"; "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; - "data-default-instances-base" = doDistribute super."data-default-instances-base_0_1_0"; + "data-default-instances-base" = dontDistribute super."data-default-instances-base"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; @@ -2396,11 +2343,11 @@ self: super: { "datetime-sb" = dontDistribute super."datetime-sb"; "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; - "dawg-ord" = doDistribute super."dawg-ord_0_5_0_1"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; "dbm" = dontDistribute super."dbm"; + "dbmigrations" = dontDistribute super."dbmigrations"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2428,8 +2375,8 @@ self: super: { "ddci-core" = dontDistribute super."ddci-core"; "dead-code-detection" = dontDistribute super."dead-code-detection"; "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = dontDistribute super."debian"; "debian-binary" = dontDistribute super."debian-binary"; - "debian-build" = doDistribute super."debian-build_0_9_2_0"; "debug-diff" = dontDistribute super."debug-diff"; "debug-time" = dontDistribute super."debug-time"; "decepticons" = dontDistribute super."decepticons"; @@ -2440,7 +2387,6 @@ self: super: { "deepcontrol" = dontDistribute super."deepcontrol"; "deeplearning-hs" = dontDistribute super."deeplearning-hs"; "deepseq-bounded" = dontDistribute super."deepseq-bounded"; - "deepseq-generics" = doDistribute super."deepseq-generics_0_1_1_2"; "deepseq-magic" = dontDistribute super."deepseq-magic"; "deepseq-th" = dontDistribute super."deepseq-th"; "deepzoom" = dontDistribute super."deepzoom"; @@ -2452,7 +2398,6 @@ self: super: { "definitive-reactive" = dontDistribute super."definitive-reactive"; "definitive-sound" = dontDistribute super."definitive-sound"; "deiko-config" = dontDistribute super."deiko-config"; - "dejafu" = doDistribute super."dejafu_0_3_2_1"; "deka" = dontDistribute super."deka"; "deka-tests" = dontDistribute super."deka-tests"; "delaunay" = dontDistribute super."delaunay"; @@ -2466,7 +2411,6 @@ self: super: { "demarcate" = dontDistribute super."demarcate"; "denominate" = dontDistribute super."denominate"; "dense" = dontDistribute super."dense"; - "dependent-map" = doDistribute super."dependent-map_0_2_2_0"; "dependent-state" = dontDistribute super."dependent-state"; "depends" = dontDistribute super."depends"; "dephd" = dontDistribute super."dephd"; @@ -2482,7 +2426,6 @@ self: super: { "derive-storable-plugin" = dontDistribute super."derive-storable-plugin"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; - "deriving-compat" = doDistribute super."deriving-compat_0_2"; "derp" = dontDistribute super."derp"; "derp-lib" = dontDistribute super."derp-lib"; "descrilo" = dontDistribute super."descrilo"; @@ -2500,22 +2443,16 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-boolean" = dontDistribute super."diagrams-boolean"; - "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_3"; - "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_1"; - "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_5"; - "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_11"; + "diagrams-builder" = dontDistribute super."diagrams-builder"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-haddock" = dontDistribute super."diagrams-haddock"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; - "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_6"; - "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; - "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_7"; "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; - "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_10"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; @@ -2532,17 +2469,19 @@ self: super: { "difftodo" = dontDistribute super."difftodo"; "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; - "digestive-functors" = doDistribute super."digestive-functors_0_8_0_1"; + "digestive-functors" = dontDistribute super."digestive-functors"; + "digestive-functors-aeson" = dontDistribute super."digestive-functors-aeson"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; - "digestive-functors-lucid" = doDistribute super."digestive-functors-lucid_0_0_0_3"; + "digestive-functors-lucid" = dontDistribute super."digestive-functors-lucid"; "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; - "digits" = doDistribute super."digits_0_2"; "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; @@ -2560,7 +2499,6 @@ self: super: { "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser"; - "directory-tree" = doDistribute super."directory-tree_0_12_0"; "dirfiles" = dontDistribute super."dirfiles"; "dirstream" = dontDistribute super."dirstream"; "disassembler" = dontDistribute super."disassembler"; @@ -2571,33 +2509,38 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; "distributed-process-ekg" = dontDistribute super."distributed-process-ekg"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; "distributed-process-lifted" = dontDistribute super."distributed-process-lifted"; "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; - "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; "distribution-plot" = dontDistribute super."distribution-plot"; + "dixi" = dontDistribute super."dixi"; "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; - "dlist" = doDistribute super."dlist_0_7_1_2"; - "dns" = doDistribute super."dns_2_0_4"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; - "do-list" = dontDistribute super."do-list"; "doc-review" = dontDistribute super."doc-review"; "doccheck" = dontDistribute super."doccheck"; "docidx" = dontDistribute super."docidx"; "docker" = dontDistribute super."docker"; "dockercook" = dontDistribute super."dockercook"; "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; - "doctest-prop" = dontDistribute super."doctest-prop"; - "docvim" = dontDistribute super."docvim"; "dom-lt" = dontDistribute super."dom-lt"; "dom-parser" = dontDistribute super."dom-parser"; "dom-selector" = dontDistribute super."dom-selector"; @@ -2607,7 +2550,6 @@ self: super: { "dot" = dontDistribute super."dot"; "dot-linker" = dontDistribute super."dot-linker"; "dot2graphml" = dontDistribute super."dot2graphml"; - "dotenv" = doDistribute super."dotenv_0_3_0_1"; "dotfs" = dontDistribute super."dotfs"; "dotgen" = dontDistribute super."dotgen"; "double-metaphone" = dontDistribute super."double-metaphone"; @@ -2628,7 +2570,6 @@ self: super: { "dph-prim-seq" = dontDistribute super."dph-prim-seq"; "dph-seq" = dontDistribute super."dph-seq"; "dpkg" = dontDistribute super."dpkg"; - "dpor" = doDistribute super."dpor_0_1_0_1"; "drClickOn" = dontDistribute super."drClickOn"; "draw-poker" = dontDistribute super."draw-poker"; "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe"; @@ -2688,15 +2629,14 @@ self: super: { "ecdsa" = dontDistribute super."ecdsa"; "ecma262" = dontDistribute super."ecma262"; "ecu" = dontDistribute super."ecu"; - "ed25519" = dontDistribute super."ed25519"; "ed25519-donna" = dontDistribute super."ed25519-donna"; "eddie" = dontDistribute super."eddie"; - "ede" = doDistribute super."ede_0_2_8_4"; "edenmodules" = dontDistribute super."edenmodules"; "edenskel" = dontDistribute super."edenskel"; "edentv" = dontDistribute super."edentv"; "edge" = dontDistribute super."edge"; "edis" = dontDistribute super."edis"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; "edit-lenses" = dontDistribute super."edit-lenses"; "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; @@ -2721,9 +2661,8 @@ self: super: { "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; - "ekg-statsd" = doDistribute super."ekg-statsd_0_2_0_4"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; - "elerea" = dontDistribute super."elerea"; "elerea-examples" = dontDistribute super."elerea-examples"; "elerea-sdl" = dontDistribute super."elerea-sdl"; "elevator" = dontDistribute super."elevator"; @@ -2749,7 +2688,6 @@ self: super: { "email-postmark" = dontDistribute super."email-postmark"; "email-validate-json" = dontDistribute super."email-validate-json"; "email-validator" = dontDistribute super."email-validator"; - "emailaddress" = dontDistribute super."emailaddress"; "emailparse" = dontDistribute super."emailparse"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2758,25 +2696,27 @@ self: super: { "empty" = dontDistribute super."empty"; "enchant" = dontDistribute super."enchant"; "encoding" = dontDistribute super."encoding"; - "encoding-io" = dontDistribute super."encoding-io"; "endo" = dontDistribute super."endo"; + "engine-io" = dontDistribute super."engine-io"; "engine-io-growler" = dontDistribute super."engine-io-growler"; "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; "engineering-units" = dontDistribute super."engineering-units"; "enumerable" = dontDistribute super."enumerable"; "enumerate" = dontDistribute super."enumerate"; "enumeration" = dontDistribute super."enumeration"; + "enumerator" = dontDistribute super."enumerator"; "enumerator-fd" = dontDistribute super."enumerator-fd"; "enumerator-tf" = dontDistribute super."enumerator-tf"; "enumfun" = dontDistribute super."enumfun"; "enummapmap" = dontDistribute super."enummapmap"; "enummapset" = dontDistribute super."enummapset"; - "enummapset-th" = dontDistribute super."enummapset-th"; "enumset" = dontDistribute super."enumset"; "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; - "envy" = doDistribute super."envy_1_1_0_0"; + "envy" = dontDistribute super."envy"; "epanet-haskell" = dontDistribute super."epanet-haskell"; "epass" = dontDistribute super."epass"; "epic" = dontDistribute super."epic"; @@ -2803,10 +2743,10 @@ self: super: { "error-message" = dontDistribute super."error-message"; "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; - "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; "esotericbot" = dontDistribute super."esotericbot"; + "esqueleto" = dontDistribute super."esqueleto"; "ess" = dontDistribute super."ess"; "estimator" = dontDistribute super."estimator"; "estimators" = dontDistribute super."estimators"; @@ -2817,7 +2757,6 @@ self: super: { "ethereum-rlp" = dontDistribute super."ethereum-rlp"; "ety" = dontDistribute super."ety"; "euler" = dontDistribute super."euler"; - "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; @@ -2825,15 +2764,16 @@ self: super: { "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; "eventsourced" = dontDistribute super."eventsourced"; - "eventstore" = doDistribute super."eventstore_0_12_0_0"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; + "exact-real" = dontDistribute super."exact-real"; "exception-hierarchy" = dontDistribute super."exception-hierarchy"; "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "execs" = dontDistribute super."execs"; + "exhaustive" = dontDistribute super."exhaustive"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2845,10 +2785,8 @@ self: super: { "exists" = dontDistribute super."exists"; "exit-codes" = dontDistribute super."exit-codes"; "exp-extended" = dontDistribute super."exp-extended"; - "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; - "expiring-cache-map" = doDistribute super."expiring-cache-map_0_0_5_4"; "expiring-mvar" = dontDistribute super."expiring-mvar"; "explain" = dontDistribute super."explain"; "explicit-determinant" = dontDistribute super."explicit-determinant"; @@ -2863,7 +2801,6 @@ self: super: { "extemp" = dontDistribute super."extemp"; "extended-categories" = dontDistribute super."extended-categories"; "extended-reals" = dontDistribute super."extended-reals"; - "extensible" = dontDistribute super."extensible"; "extensible-data" = dontDistribute super."extensible-data"; "external-sort" = dontDistribute super."external-sort"; "extractelf" = dontDistribute super."extractelf"; @@ -2882,7 +2819,6 @@ self: super: { "falling-turnip" = dontDistribute super."falling-turnip"; "fallingblocks" = dontDistribute super."fallingblocks"; "family-tree" = dontDistribute super."family-tree"; - "fast-digits" = dontDistribute super."fast-digits"; "fast-math" = dontDistribute super."fast-math"; "fast-tags" = dontDistribute super."fast-tags"; "fast-tagsoup" = dontDistribute super."fast-tagsoup"; @@ -2896,12 +2832,14 @@ self: super: { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb-persistent" = dontDistribute super."fb-persistent"; "fbmessenger-api" = dontDistribute super."fbmessenger-api"; "fca" = dontDistribute super."fca"; "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-notify" = dontDistribute super."fdo-notify"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; "fedora-packages" = dontDistribute super."fedora-packages"; @@ -2924,7 +2862,6 @@ self: super: { "fficxx-runtime" = dontDistribute super."fficxx-runtime"; "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; - "fft" = doDistribute super."fft_0_1_8_3"; "fftwRaw" = dontDistribute super."fftwRaw"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -2937,7 +2874,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed-poly" = dontDistribute super."file-embed-poly"; - "file-modules" = doDistribute super."file-modules_0_1_2_3"; + "file-location" = dontDistribute super."file-location"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; "filepather" = dontDistribute super."filepather"; @@ -2962,6 +2899,7 @@ self: super: { "fix-parser-simple" = dontDistribute super."fix-parser-simple"; "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; "fixed-length" = dontDistribute super."fixed-length"; + "fixed-list" = dontDistribute super."fixed-list"; "fixed-point" = dontDistribute super."fixed-point"; "fixed-point-vector" = dontDistribute super."fixed-point-vector"; "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; @@ -3011,6 +2949,7 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn-extra" = dontDistribute super."fn-extra"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-statistics" = dontDistribute super."foldl-statistics"; "foldl-transduce" = dontDistribute super."foldl-transduce"; @@ -3038,7 +2977,6 @@ self: super: { "formlets-hsp" = dontDistribute super."formlets-hsp"; "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; - "fortran-src" = dontDistribute super."fortran-src"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; "foscam-sort" = dontDistribute super."foscam-sort"; @@ -3072,7 +3010,6 @@ self: super: { "free-theorems-webui" = dontDistribute super."free-theorems-webui"; "free-vector-spaces" = dontDistribute super."free-vector-spaces"; "freekick2" = dontDistribute super."freekick2"; - "freer" = dontDistribute super."freer"; "freesect" = dontDistribute super."freesect"; "freesound" = dontDistribute super."freesound"; "freetype-simple" = dontDistribute super."freetype-simple"; @@ -3083,7 +3020,6 @@ self: super: { "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; "friday-scale-dct" = dontDistribute super."friday-scale-dct"; - "friendly-time" = dontDistribute super."friendly-time"; "frown" = dontDistribute super."frown"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3093,7 +3029,6 @@ self: super: { "fs-events" = dontDistribute super."fs-events"; "fsharp" = dontDistribute super."fsharp"; "fsmActions" = dontDistribute super."fsmActions"; - "fsnotify-conduit" = dontDistribute super."fsnotify-conduit"; "fst" = dontDistribute super."fst"; "fsutils" = dontDistribute super."fsutils"; "fswatcher" = dontDistribute super."fswatcher"; @@ -3170,7 +3105,6 @@ self: super: { "generic-binary" = dontDistribute super."generic-binary"; "generic-church" = dontDistribute super."generic-church"; "generic-deepseq" = dontDistribute super."generic-deepseq"; - "generic-deriving" = doDistribute super."generic-deriving_1_10_5"; "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; "generic-maybe" = dontDistribute super."generic-maybe"; "generic-pretty" = dontDistribute super."generic-pretty"; @@ -3179,8 +3113,8 @@ self: super: { "generic-server" = dontDistribute super."generic-server"; "generic-storable" = dontDistribute super."generic-storable"; "generic-tree" = dontDistribute super."generic-tree"; + "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; - "generics-sop-lens" = dontDistribute super."generics-sop-lens"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -3219,26 +3153,25 @@ self: super: { "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; - "ghc-exactprint" = doDistribute super."ghc-exactprint_0_5_1_1"; "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; - "ghc-mod" = doDistribute super."ghc-mod_5_5_0_0"; + "ghc-mtl" = dontDistribute super."ghc-mtl"; "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; "ghc-prof" = dontDistribute super."ghc-prof"; "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; "ghc-server" = dontDistribute super."ghc-server"; + "ghc-session" = dontDistribute super."ghc-session"; "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; - "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1_3"; - "ghc-typelits-knownnat" = dontDistribute super."ghc-typelits-knownnat"; - "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4_6"; "ghc-typelits-presburger" = dontDistribute super."ghc-typelits-presburger"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; @@ -3247,15 +3180,12 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; - "ghcid" = doDistribute super."ghcid_0_6_4"; "ghcjs-ajax" = dontDistribute super."ghcjs-ajax"; - "ghcjs-dom" = doDistribute super."ghcjs-dom_0_2_4_0"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; "ghcjs-dom-jsaddle" = dontDistribute super."ghcjs-dom-jsaddle"; "ghcjs-dom-jsffi" = dontDistribute super."ghcjs-dom-jsffi"; "ghcjs-dom-webkit" = dontDistribute super."ghcjs-dom-webkit"; - "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; - "ghcjs-perch" = dontDistribute super."ghcjs-perch"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3268,25 +3198,20 @@ self: super: { "gi-gtk-hs" = dontDistribute super."gi-gtk-hs"; "gi-gtkosxapplication" = dontDistribute super."gi-gtkosxapplication"; "gi-gtksource" = dontDistribute super."gi-gtksource"; - "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; "gi-notify" = dontDistribute super."gi-notify"; "gi-pangocairo" = dontDistribute super."gi-pangocairo"; "gi-poppler" = dontDistribute super."gi-poppler"; - "gi-soup" = dontDistribute super."gi-soup"; "gi-vte" = dontDistribute super."gi-vte"; - "gi-webkit" = dontDistribute super."gi-webkit"; "gi-webkit2" = dontDistribute super."gi-webkit2"; "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension"; "giak" = dontDistribute super."giak"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; - "gio" = doDistribute super."gio_0_13_1_1"; - "gipeda" = doDistribute super."gipeda_0_2_0_1"; "gist" = dontDistribute super."gist"; "git" = dontDistribute super."git"; "git-all" = dontDistribute super."git-all"; - "git-annex" = doDistribute super."git-annex_6_20160511"; + "git-annex" = dontDistribute super."git-annex"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; @@ -3301,9 +3226,12 @@ self: super: { "gitHUD" = dontDistribute super."gitHUD"; "gitcache" = dontDistribute super."gitcache"; "gitdo" = dontDistribute super."gitdo"; - "github-backup" = doDistribute super."github-backup_1_20160522"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; "github-post-receive" = dontDistribute super."github-post-receive"; + "github-release" = dontDistribute super."github-release"; "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; "gitignore" = dontDistribute super."gitignore"; "gitit" = dontDistribute super."gitit"; "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; @@ -3311,17 +3239,14 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; - "gitson" = doDistribute super."gitson_0_5_1"; "gitter" = dontDistribute super."gitter"; "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; - "glabrous" = dontDistribute super."glabrous"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; - "glib" = doDistribute super."glib_0_13_2_2"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3332,7 +3257,6 @@ self: super: { "global-lock" = dontDistribute super."global-lock"; "global-variables" = dontDistribute super."global-variables"; "glome-hs" = dontDistribute super."glome-hs"; - "gloss" = dontDistribute super."gloss"; "gloss-accelerate" = dontDistribute super."gloss-accelerate"; "gloss-algorithms" = dontDistribute super."gloss-algorithms"; "gloss-banana" = dontDistribute super."gloss-banana"; @@ -3342,7 +3266,6 @@ self: super: { "gloss-juicy" = dontDistribute super."gloss-juicy"; "gloss-raster" = dontDistribute super."gloss-raster"; "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; - "gloss-rendering" = dontDistribute super."gloss-rendering"; "gloss-sodium" = dontDistribute super."gloss-sodium"; "glpk-hs" = dontDistribute super."glpk-hs"; "glue" = dontDistribute super."glue"; @@ -3357,7 +3280,9 @@ self: super: { "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; "gnss-converters" = dontDistribute super."gnss-converters"; + "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; + "gnutls" = dontDistribute super."gnutls"; "goa" = dontDistribute super."goa"; "goal-core" = dontDistribute super."goal-core"; "goal-geometry" = dontDistribute super."goal-geometry"; @@ -3366,110 +3291,12 @@ self: super: { "goatee" = dontDistribute super."goatee"; "goatee-gtk" = dontDistribute super."goatee-gtk"; "gofer-prelude" = dontDistribute super."gofer-prelude"; - "gogol" = dontDistribute super."gogol"; - "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; - "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; - "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; - "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; - "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; - "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; - "gogol-adsense" = dontDistribute super."gogol-adsense"; - "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; - "gogol-affiliates" = dontDistribute super."gogol-affiliates"; - "gogol-analytics" = dontDistribute super."gogol-analytics"; - "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; - "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; - "gogol-appengine" = dontDistribute super."gogol-appengine"; - "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; - "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; - "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; - "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; - "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; - "gogol-appstate" = dontDistribute super."gogol-appstate"; - "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; - "gogol-bigquery" = dontDistribute super."gogol-bigquery"; - "gogol-billing" = dontDistribute super."gogol-billing"; - "gogol-blogger" = dontDistribute super."gogol-blogger"; - "gogol-books" = dontDistribute super."gogol-books"; - "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; - "gogol-classroom" = dontDistribute super."gogol-classroom"; - "gogol-cloudmonitoring" = dontDistribute super."gogol-cloudmonitoring"; - "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; - "gogol-compute" = dontDistribute super."gogol-compute"; - "gogol-container" = dontDistribute super."gogol-container"; - "gogol-core" = dontDistribute super."gogol-core"; - "gogol-customsearch" = dontDistribute super."gogol-customsearch"; - "gogol-dataflow" = dontDistribute super."gogol-dataflow"; - "gogol-dataproc" = dontDistribute super."gogol-dataproc"; - "gogol-datastore" = dontDistribute super."gogol-datastore"; - "gogol-debugger" = dontDistribute super."gogol-debugger"; - "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; - "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; - "gogol-discovery" = dontDistribute super."gogol-discovery"; - "gogol-dns" = dontDistribute super."gogol-dns"; - "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; - "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; - "gogol-drive" = dontDistribute super."gogol-drive"; - "gogol-firebase-rules" = dontDistribute super."gogol-firebase-rules"; - "gogol-fitness" = dontDistribute super."gogol-fitness"; - "gogol-fonts" = dontDistribute super."gogol-fonts"; - "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; - "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; - "gogol-games" = dontDistribute super."gogol-games"; - "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; - "gogol-games-management" = dontDistribute super."gogol-games-management"; - "gogol-genomics" = dontDistribute super."gogol-genomics"; - "gogol-gmail" = dontDistribute super."gogol-gmail"; - "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; - "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; - "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; - "gogol-kgsearch" = dontDistribute super."gogol-kgsearch"; - "gogol-latencytest" = dontDistribute super."gogol-latencytest"; - "gogol-logging" = dontDistribute super."gogol-logging"; - "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; - "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; - "gogol-mirror" = dontDistribute super."gogol-mirror"; - "gogol-monitoring" = dontDistribute super."gogol-monitoring"; - "gogol-oauth2" = dontDistribute super."gogol-oauth2"; - "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; - "gogol-partners" = dontDistribute super."gogol-partners"; - "gogol-people" = dontDistribute super."gogol-people"; - "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; - "gogol-plus" = dontDistribute super."gogol-plus"; - "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; - "gogol-prediction" = dontDistribute super."gogol-prediction"; - "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; - "gogol-pubsub" = dontDistribute super."gogol-pubsub"; - "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; - "gogol-replicapool" = dontDistribute super."gogol-replicapool"; - "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; - "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; - "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; - "gogol-script" = dontDistribute super."gogol-script"; - "gogol-sheets" = dontDistribute super."gogol-sheets"; - "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; - "gogol-siteverification" = dontDistribute super."gogol-siteverification"; - "gogol-spectrum" = dontDistribute super."gogol-spectrum"; - "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; - "gogol-storage" = dontDistribute super."gogol-storage"; - "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; - "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; - "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; - "gogol-translate" = dontDistribute super."gogol-translate"; - "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; - "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; - "gogol-vision" = dontDistribute super."gogol-vision"; - "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; - "gogol-youtube" = dontDistribute super."gogol-youtube"; - "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; - "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; "gooey" = dontDistribute super."gooey"; "google-dictionary" = dontDistribute super."google-dictionary"; "google-drive" = dontDistribute super."google-drive"; "google-html5-slide" = dontDistribute super."google-html5-slide"; "google-mail-filters" = dontDistribute super."google-mail-filters"; "google-oauth2" = dontDistribute super."google-oauth2"; - "google-oauth2-jwt" = dontDistribute super."google-oauth2-jwt"; "google-search" = dontDistribute super."google-search"; "google-translate" = dontDistribute super."google-translate"; "googleplus" = dontDistribute super."googleplus"; @@ -3532,12 +3359,19 @@ self: super: { "gridfs" = dontDistribute super."gridfs"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; + "groundhog" = dontDistribute super."groundhog"; "groundhog-converters" = dontDistribute super."groundhog-converters"; "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "groundhog-mysql" = dontDistribute super."groundhog-mysql"; + "groundhog-postgresql" = dontDistribute super."groundhog-postgresql"; + "groundhog-sqlite" = dontDistribute super."groundhog-sqlite"; + "groundhog-th" = dontDistribute super."groundhog-th"; "group-with" = dontDistribute super."group-with"; "groupoid" = dontDistribute super."groupoid"; + "growler" = dontDistribute super."growler"; "gruff" = dontDistribute super."gruff"; "gruff-examples" = dontDistribute super."gruff-examples"; + "gsasl" = dontDistribute super."gsasl"; "gsc-weighting" = dontDistribute super."gsc-weighting"; "gsl-random" = dontDistribute super."gsl-random"; "gsl-random-fu" = dontDistribute super."gsl-random-fu"; @@ -3545,7 +3379,6 @@ self: super: { "gstreamer" = dontDistribute super."gstreamer"; "gt-tools" = dontDistribute super."gt-tools"; "gtfs" = dontDistribute super."gtfs"; - "gtk" = doDistribute super."gtk_0_14_2"; "gtk-helpers" = dontDistribute super."gtk-helpers"; "gtk-jsinput" = dontDistribute super."gtk-jsinput"; "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; @@ -3555,7 +3388,6 @@ self: super: { "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; "gtk-toy" = dontDistribute super."gtk-toy"; "gtk-traymanager" = dontDistribute super."gtk-traymanager"; - "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_5"; "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; @@ -3565,13 +3397,11 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; - "gtk3" = doDistribute super."gtk3_0_14_2"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; "gtkrsync" = dontDistribute super."gtkrsync"; "gtksourceview2" = dontDistribute super."gtksourceview2"; - "gtksourceview3" = doDistribute super."gtksourceview3_0_13_2_1"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; "guid" = dontDistribute super."guid"; @@ -3591,8 +3421,6 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; - "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4"; - "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; "hRESP" = dontDistribute super."hRESP"; @@ -3636,7 +3464,6 @@ self: super: { "hackage-processing" = dontDistribute super."hackage-processing"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; - "hackage-security" = dontDistribute super."hackage-security"; "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; "hackage-server" = dontDistribute super."hackage-server"; "hackage-sparks" = dontDistribute super."hackage-sparks"; @@ -3649,11 +3476,9 @@ self: super: { "hactor" = dontDistribute super."hactor"; "hactors" = dontDistribute super."hactors"; "haddock" = dontDistribute super."haddock"; - "haddock-api" = doDistribute super."haddock-api_2_16_1"; "haddock-leksah" = dontDistribute super."haddock-leksah"; - "haddock-library" = doDistribute super."haddock-library_1_2_1"; "haddock-test" = dontDistribute super."haddock-test"; - "haddocset" = doDistribute super."haddocset_0_4_1"; + "haddocset" = dontDistribute super."haddocset"; "hadoop-formats" = dontDistribute super."hadoop-formats"; "hadoop-rpc" = dontDistribute super."hadoop-rpc"; "hadoop-tools" = dontDistribute super."hadoop-tools"; @@ -3662,7 +3487,6 @@ self: super: { "haha" = dontDistribute super."haha"; "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; - "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; "hails" = dontDistribute super."hails"; "hails-bin" = dontDistribute super."hails-bin"; @@ -3671,6 +3495,7 @@ self: super: { "hake" = dontDistribute super."hake"; "hakismet" = dontDistribute super."hakismet"; "hako" = dontDistribute super."hako"; + "hakyll" = dontDistribute super."hakyll"; "hakyll-R" = dontDistribute super."hakyll-R"; "hakyll-agda" = dontDistribute super."hakyll-agda"; "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; @@ -3683,6 +3508,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-filestore" = dontDistribute super."hakyll-filestore"; "hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; "hakyll-shakespeare" = dontDistribute super."hakyll-shakespeare"; "halberd" = dontDistribute super."halberd"; "halfs" = dontDistribute super."halfs"; @@ -3714,7 +3540,6 @@ self: super: { "happs-tutorial" = dontDistribute super."happs-tutorial"; "happstack" = dontDistribute super."happstack"; "happstack-auth" = dontDistribute super."happstack-auth"; - "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_3"; "happstack-contrib" = dontDistribute super."happstack-contrib"; "happstack-data" = dontDistribute super."happstack-data"; "happstack-dlg" = dontDistribute super."happstack-dlg"; @@ -3765,7 +3590,6 @@ self: super: { "hashed-storage" = dontDistribute super."hashed-storage"; "hashids" = dontDistribute super."hashids"; "hashing" = dontDistribute super."hashing"; - "hashmap" = dontDistribute super."hashmap"; "hashring" = dontDistribute super."hashring"; "hashtables-plus" = dontDistribute super."hashtables-plus"; "hasim" = dontDistribute super."hasim"; @@ -3796,20 +3620,15 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; - "haskell-gi" = doDistribute super."haskell-gi_0_17_4"; - "haskell-gi-base" = doDistribute super."haskell-gi-base_0_17"; "haskell-google-trends" = dontDistribute super."haskell-google-trends"; "haskell-igraph" = dontDistribute super."haskell-igraph"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-kubernetes" = dontDistribute super."haskell-kubernetes"; - "haskell-lexer" = doDistribute super."haskell-lexer_1_0"; "haskell-modbus" = dontDistribute super."haskell-modbus"; "haskell-mpfr" = dontDistribute super."haskell-mpfr"; "haskell-mpi" = dontDistribute super."haskell-mpi"; - "haskell-names" = dontDistribute super."haskell-names"; "haskell-openflow" = dontDistribute super."haskell-openflow"; - "haskell-packages" = dontDistribute super."haskell-packages"; "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; "haskell-platform-test" = dontDistribute super."haskell-platform-test"; "haskell-player" = dontDistribute super."haskell-player"; @@ -3870,7 +3689,6 @@ self: super: { "haskhol-core" = dontDistribute super."haskhol-core"; "haskmon" = dontDistribute super."haskmon"; "haskoin" = dontDistribute super."haskoin"; - "haskoin-core" = dontDistribute super."haskoin-core"; "haskoin-crypto" = dontDistribute super."haskoin-crypto"; "haskoin-node" = dontDistribute super."haskoin-node"; "haskoin-protocol" = dontDistribute super."haskoin-protocol"; @@ -3890,7 +3708,6 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; - "hasql" = doDistribute super."hasql_0_19_14"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-class" = dontDistribute super."hasql-class"; "hasql-cursor-query" = dontDistribute super."hasql-cursor-query"; @@ -3909,15 +3726,16 @@ self: super: { "haste-perch" = dontDistribute super."haste-perch"; "hastily" = dontDistribute super."hastily"; "hat" = dontDistribute super."hat"; - "hatex-guide" = dontDistribute super."hatex-guide"; "hath" = dontDistribute super."hath"; "hats" = dontDistribute super."hats"; "hatt" = dontDistribute super."hatt"; "haverer" = dontDistribute super."haverer"; "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-amazonka" = dontDistribute super."haxl-amazonka"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; - "haxr" = doDistribute super."haxr_3000_11_1_6"; + "haxr" = dontDistribute super."haxr"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3941,7 +3759,6 @@ self: super: { "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; - "hdaemonize" = doDistribute super."hdaemonize_0_5_0_2"; "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; "hdbc-aeson" = dontDistribute super."hdbc-aeson"; "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; @@ -3951,7 +3768,6 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; - "hdevtools" = doDistribute super."hdevtools_0_1_3_2"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3959,6 +3775,7 @@ self: super: { "hdiscount" = dontDistribute super."hdiscount"; "hdm" = dontDistribute super."hdm"; "hdo" = dontDistribute super."hdo"; + "hdocs" = dontDistribute super."hdocs"; "hdph" = dontDistribute super."hdph"; "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; @@ -3966,7 +3783,6 @@ self: super: { "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "heckle" = dontDistribute super."heckle"; - "hedis" = doDistribute super."hedis_0_6_10"; "hedis-config" = dontDistribute super."hedis-config"; "hedis-monadic" = dontDistribute super."hedis-monadic"; "hedis-namespace" = dontDistribute super."hedis-namespace"; @@ -3975,7 +3791,7 @@ self: super: { "hedis-tags" = dontDistribute super."hedis-tags"; "hedn" = dontDistribute super."hedn"; "hein" = dontDistribute super."hein"; - "heist" = doDistribute super."heist_0_14_1_4"; + "heist" = dontDistribute super."heist"; "heist-aeson" = dontDistribute super."heist-aeson"; "heist-async" = dontDistribute super."heist-async"; "helics" = dontDistribute super."helics"; @@ -4019,6 +3835,7 @@ self: super: { "hevolisa-dph" = dontDistribute super."hevolisa-dph"; "hexdump" = dontDistribute super."hexdump"; "hexif" = dontDistribute super."hexif"; + "hexpat" = dontDistribute super."hexpat"; "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; "hexpat-lens" = dontDistribute super."hexpat-lens"; "hexpat-pickle" = dontDistribute super."hexpat-pickle"; @@ -4065,6 +3882,7 @@ self: super: { "highWaterMark" = dontDistribute super."highWaterMark"; "higher-leveldb" = dontDistribute super."higher-leveldb"; "higherorder" = dontDistribute super."higherorder"; + "highjson" = dontDistribute super."highjson"; "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; @@ -4081,7 +3899,6 @@ self: super: { "hinotify-bytestring" = dontDistribute super."hinotify-bytestring"; "hinquire" = dontDistribute super."hinquire"; "hinstaller" = dontDistribute super."hinstaller"; - "hint" = doDistribute super."hint_0_5_2"; "hint-server" = dontDistribute super."hint-server"; "hinvaders" = dontDistribute super."hinvaders"; "hinze-streams" = dontDistribute super."hinze-streams"; @@ -4105,23 +3922,21 @@ self: super: { "historian" = dontDistribute super."historian"; "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; - "hjsmin" = doDistribute super."hjsmin_0_2_0_1"; + "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; - "hjsonpointer" = dontDistribute super."hjsonpointer"; - "hjsonschema" = dontDistribute super."hjsonschema"; "hkdf" = dontDistribute super."hkdf"; "hlatex" = dontDistribute super."hlatex"; "hlbfgsb" = dontDistribute super."hlbfgsb"; "hlcm" = dontDistribute super."hlcm"; "hleap" = dontDistribute super."hleap"; - "hledger" = doDistribute super."hledger_0_27"; "hledger-chart" = dontDistribute super."hledger-chart"; "hledger-diff" = dontDistribute super."hledger-diff"; "hledger-irr" = dontDistribute super."hledger-irr"; - "hledger-lib" = doDistribute super."hledger-lib_0_27"; - "hledger-ui" = doDistribute super."hledger-ui_0_27_4"; + "hledger-ui" = dontDistribute super."hledger-ui"; "hledger-vty" = dontDistribute super."hledger-vty"; + "hledger-web" = dontDistribute super."hledger-web"; "hlibBladeRF" = dontDistribute super."hlibBladeRF"; "hlibev" = dontDistribute super."hlibev"; "hlibfam" = dontDistribute super."hlibfam"; @@ -4139,7 +3954,6 @@ self: super: { "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; "hmatrix-repa" = dontDistribute super."hmatrix-repa"; - "hmatrix-special" = dontDistribute super."hmatrix-special"; "hmatrix-static" = dontDistribute super."hmatrix-static"; "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; @@ -4153,7 +3967,6 @@ self: super: { "hmm" = dontDistribute super."hmm"; "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; "hmp3" = dontDistribute super."hmp3"; - "hmpfr" = dontDistribute super."hmpfr"; "hmt-diagrams" = dontDistribute super."hmt-diagrams"; "hmumps" = dontDistribute super."hmumps"; "hnetcdf" = dontDistribute super."hnetcdf"; @@ -4165,7 +3978,6 @@ self: super: { "hob" = dontDistribute super."hob"; "hobbes" = dontDistribute super."hobbes"; "hobbits" = dontDistribute super."hobbits"; - "hocilib" = dontDistribute super."hocilib"; "hoe" = dontDistribute super."hoe"; "hofix-mtl" = dontDistribute super."hofix-mtl"; "hog" = dontDistribute super."hog"; @@ -4181,7 +3993,6 @@ self: super: { "hommage" = dontDistribute super."hommage"; "hommage-ds" = dontDistribute super."hommage-ds"; "homoiconic" = dontDistribute super."homoiconic"; - "homplexity" = dontDistribute super."homplexity"; "honi" = dontDistribute super."honi"; "honk" = dontDistribute super."honk"; "hoobuddy" = dontDistribute super."hoobuddy"; @@ -4197,13 +4008,11 @@ self: super: { "hoodle-publish" = dontDistribute super."hoodle-publish"; "hoodle-render" = dontDistribute super."hoodle-render"; "hoodle-types" = dontDistribute super."hoodle-types"; - "hoogle" = doDistribute super."hoogle_4_2_43"; "hoogle-index" = dontDistribute super."hoogle-index"; "hooks-dir" = dontDistribute super."hooks-dir"; "hoovie" = dontDistribute super."hoovie"; "hopencc" = dontDistribute super."hopencc"; "hopencl" = dontDistribute super."hopencl"; - "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_18"; "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; @@ -4226,7 +4035,6 @@ self: super: { "hp2any-manager" = dontDistribute super."hp2any-manager"; "hp2html" = dontDistribute super."hp2html"; "hp2pretty" = dontDistribute super."hp2pretty"; - "hpack-convert" = dontDistribute super."hpack-convert"; "hpaco" = dontDistribute super."hpaco"; "hpaco-lib" = dontDistribute super."hpaco-lib"; "hpage" = dontDistribute super."hpage"; @@ -4234,18 +4042,15 @@ self: super: { "hpaste" = dontDistribute super."hpaste"; "hpasteit" = dontDistribute super."hpasteit"; "hpath" = dontDistribute super."hpath"; - "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_4"; "hpc-strobe" = dontDistribute super."hpc-strobe"; "hpc-tracer" = dontDistribute super."hpc-tracer"; "hpdft" = dontDistribute super."hpdft"; - "hpio" = dontDistribute super."hpio"; "hplayground" = dontDistribute super."hplayground"; "hplaylist" = dontDistribute super."hplaylist"; "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; "hpqtypes-extras" = dontDistribute super."hpqtypes-extras"; - "hprotoc" = doDistribute super."hprotoc_2_2_0"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4254,12 +4059,9 @@ self: super: { "hpygments" = dontDistribute super."hpygments"; "hpylos" = dontDistribute super."hpylos"; "hpyrg" = dontDistribute super."hpyrg"; - "hquantlib" = dontDistribute super."hquantlib"; "hquery" = dontDistribute super."hquery"; "hranker" = dontDistribute super."hranker"; - "hreader" = dontDistribute super."hreader"; "hricket" = dontDistribute super."hricket"; - "hruby" = dontDistribute super."hruby"; "hs-blake2" = dontDistribute super."hs-blake2"; "hs-captcha" = dontDistribute super."hs-captcha"; "hs-carbon" = dontDistribute super."hs-carbon"; @@ -4332,14 +4134,13 @@ self: super: { "hscuid" = dontDistribute super."hscuid"; "hscurses" = dontDistribute super."hscurses"; "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; "hsdif" = dontDistribute super."hsdif"; "hsdip" = dontDistribute super."hsdip"; - "hsdns" = dontDistribute super."hsdns"; "hsdns-cache" = dontDistribute super."hsdns-cache"; "hsemail-ns" = dontDistribute super."hsemail-ns"; "hsenv" = dontDistribute super."hsenv"; "hserv" = dontDistribute super."hserv"; - "hset" = dontDistribute super."hset"; "hsfacter" = dontDistribute super."hsfacter"; "hsfcsh" = dontDistribute super."hsfcsh"; "hsfilt" = dontDistribute super."hsfilt"; @@ -4378,21 +4179,18 @@ self: super: { "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; "hspec-experimental" = dontDistribute super."hspec-experimental"; - "hspec-golden-aeson" = dontDistribute super."hspec-golden-aeson"; "hspec-hashable" = dontDistribute super."hspec-hashable"; "hspec-laws" = dontDistribute super."hspec-laws"; - "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; - "hspec-snap" = doDistribute super."hspec-snap_0_4_0_1"; + "hspec-snap" = dontDistribute super."hspec-snap"; "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; - "hspec-webdriver" = doDistribute super."hspec-webdriver_1_1_0"; "hspec2" = dontDistribute super."hspec2"; "hspecVariant" = dontDistribute super."hspecVariant"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4431,10 +4229,8 @@ self: super: { "hsx" = dontDistribute super."hsx"; "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; - "hsyslog" = doDistribute super."hsyslog_2_0"; "hsyslog-udp" = dontDistribute super."hsyslog-udp"; "hszephyr" = dontDistribute super."hszephyr"; - "htaglib" = doDistribute super."htaglib_1_0_3"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htestu" = dontDistribute super."htestu"; @@ -4456,8 +4252,8 @@ self: super: { "htsn" = dontDistribute super."htsn"; "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; "http-attoparsec" = dontDistribute super."http-attoparsec"; - "http-client" = doDistribute super."http-client_0_4_31"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4472,20 +4268,16 @@ self: super: { "http-enumerator" = dontDistribute super."http-enumerator"; "http-kinder" = dontDistribute super."http-kinder"; "http-kit" = dontDistribute super."http-kit"; - "http-link-header" = doDistribute super."http-link-header_1_0_1"; "http-listen" = dontDistribute super."http-listen"; "http-monad" = dontDistribute super."http-monad"; "http-proxy" = dontDistribute super."http-proxy"; "http-querystring" = dontDistribute super."http-querystring"; "http-response-decoder" = dontDistribute super."http-response-decoder"; - "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_3"; "http-server" = dontDistribute super."http-server"; "http-shed" = dontDistribute super."http-shed"; - "http-streams" = doDistribute super."http-streams_0_8_3_3"; "http-test" = dontDistribute super."http-test"; "http-trace" = dontDistribute super."http-trace"; "http-wget" = dontDistribute super."http-wget"; - "http2" = doDistribute super."http2_1_6_1"; "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; "httpspec" = dontDistribute super."httpspec"; @@ -4501,7 +4293,6 @@ self: super: { "hulk" = dontDistribute super."hulk"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; - "hunit-dejafu" = doDistribute super."hunit-dejafu_0_3_0_1"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4516,12 +4307,8 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; - "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; - "hw-diagnostics" = doDistribute super."hw-diagnostics_0_0_0_2"; - "hw-json" = doDistribute super."hw-json_0_0_0_2"; + "hw-json" = dontDistribute super."hw-json"; "hw-mquery" = dontDistribute super."hw-mquery"; - "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; - "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; "hwsl2" = dontDistribute super."hwsl2"; @@ -4532,9 +4319,12 @@ self: super: { "hxournal" = dontDistribute super."hxournal"; "hxt-binary" = dontDistribute super."hxt-binary"; "hxt-cache" = dontDistribute super."hxt-cache"; - "hxt-css" = doDistribute super."hxt-css_0_1_0_2"; + "hxt-curl" = dontDistribute super."hxt-curl"; + "hxt-expat" = dontDistribute super."hxt-expat"; "hxt-extras" = dontDistribute super."hxt-extras"; "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-relaxng" = dontDistribute super."hxt-relaxng"; + "hxt-tagsoup" = dontDistribute super."hxt-tagsoup"; "hxt-xpath" = dontDistribute super."hxt-xpath"; "hxt-xslt" = dontDistribute super."hxt-xslt"; "hxthelper" = dontDistribute super."hxthelper"; @@ -4563,12 +4353,14 @@ self: super: { "hyloutils" = dontDistribute super."hyloutils"; "hyperdrive" = dontDistribute super."hyperdrive"; "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperloglog" = dontDistribute super."hyperloglog"; "hyperloglogplus" = dontDistribute super."hyperloglogplus"; "hyperpublic" = dontDistribute super."hyperpublic"; "hyphenate" = dontDistribute super."hyphenate"; "hypher" = dontDistribute super."hypher"; "hzaif" = dontDistribute super."hzaif"; "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; "i18n" = dontDistribute super."i18n"; "iCalendar" = dontDistribute super."iCalendar"; "iException" = dontDistribute super."iException"; @@ -4576,16 +4368,18 @@ self: super: { "ib-api" = dontDistribute super."ib-api"; "iban" = dontDistribute super."iban"; "ibus-hs" = dontDistribute super."ibus-hs"; + "ide-backend" = dontDistribute super."ide-backend"; + "ide-backend-common" = dontDistribute super."ide-backend-common"; + "ide-backend-rts" = dontDistribute super."ide-backend-rts"; + "ide-backend-server" = dontDistribute super."ide-backend-server"; "ideas" = dontDistribute super."ideas"; "ideas-math" = dontDistribute super."ideas-math"; "idempotent" = dontDistribute super."idempotent"; - "identicon" = dontDistribute super."identicon"; "identifiers" = dontDistribute super."identifiers"; "idiii" = dontDistribute super."idiii"; "idna" = dontDistribute super."idna"; "idna2008" = dontDistribute super."idna2008"; "idringen" = dontDistribute super."idringen"; - "idris" = doDistribute super."idris_0_11_2"; "ieee" = dontDistribute super."ieee"; "ieee-utils" = dontDistribute super."ieee-utils"; "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; @@ -4593,16 +4387,26 @@ self: super: { "ifcxt" = dontDistribute super."ifcxt"; "iff" = dontDistribute super."iff"; "ifscs" = dontDistribute super."ifscs"; - "ig" = doDistribute super."ig_0_7"; + "ig" = dontDistribute super."ig"; "ige-mac-integration" = dontDistribute super."ige-mac-integration"; "igraph" = dontDistribute super."igraph"; "igrf" = dontDistribute super."igrf"; + "ihaskell" = dontDistribute super."ihaskell"; + "ihaskell-aeson" = dontDistribute super."ihaskell-aeson"; + "ihaskell-basic" = dontDistribute super."ihaskell-basic"; + "ihaskell-blaze" = dontDistribute super."ihaskell-blaze"; + "ihaskell-charts" = dontDistribute super."ihaskell-charts"; + "ihaskell-diagrams" = dontDistribute super."ihaskell-diagrams"; "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-hatex" = dontDistribute super."ihaskell-hatex"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-juicypixels" = dontDistribute super."ihaskell-juicypixels"; + "ihaskell-magic" = dontDistribute super."ihaskell-magic"; "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-rlangqq" = dontDistribute super."ihaskell-rlangqq"; "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; "ihttp" = dontDistribute super."ihttp"; - "ilist" = dontDistribute super."ilist"; "illuminate" = dontDistribute super."illuminate"; "image-type" = dontDistribute super."image-type"; "imagefilters" = dontDistribute super."imagefilters"; @@ -4612,7 +4416,6 @@ self: super: { "imapget" = dontDistribute super."imapget"; "imbib" = dontDistribute super."imbib"; "imgurder" = dontDistribute super."imgurder"; - "imm" = dontDistribute super."imm"; "imparse" = dontDistribute super."imparse"; "imperative-edsl" = dontDistribute super."imperative-edsl"; "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; @@ -4631,8 +4434,6 @@ self: super: { "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; "indentation" = dontDistribute super."indentation"; - "indentation-core" = dontDistribute super."indentation-core"; - "indentation-parsec" = dontDistribute super."indentation-parsec"; "indentation-trifecta" = dontDistribute super."indentation-trifecta"; "indentparser" = dontDistribute super."indentparser"; "index-core" = dontDistribute super."index-core"; @@ -4656,10 +4457,8 @@ self: super: { "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; - "inline-c" = doDistribute super."inline-c_0_5_5_5"; "inline-c-win32" = dontDistribute super."inline-c-win32"; "inline-java" = dontDistribute super."inline-java"; - "inline-r" = doDistribute super."inline-r_0_8_0_1"; "inquire" = dontDistribute super."inquire"; "inserts" = dontDistribute super."inserts"; "inspection-proxy" = dontDistribute super."inspection-proxy"; @@ -4684,7 +4483,6 @@ self: super: { "interlude-l" = dontDistribute super."interlude-l"; "intern" = dontDistribute super."intern"; "internetmarke" = dontDistribute super."internetmarke"; - "intero" = dontDistribute super."intero"; "interpol" = dontDistribute super."interpol"; "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; @@ -4694,12 +4492,10 @@ self: super: { "interval" = dontDistribute super."interval"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; - "invariant" = doDistribute super."invariant_0_3_1"; "invertible" = dontDistribute super."invertible"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; - "io-streams-haproxy" = dontDistribute super."io-streams-haproxy"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4715,12 +4511,10 @@ self: super: { "ipprint" = dontDistribute super."ipprint"; "iptables-helpers" = dontDistribute super."iptables-helpers"; "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = dontDistribute super."ipython-kernel"; "irc-bytestring" = dontDistribute super."irc-bytestring"; - "irc-client" = doDistribute super."irc-client_0_3_0_0"; "irc-colors" = dontDistribute super."irc-colors"; - "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0"; "irc-core" = dontDistribute super."irc-core"; - "irc-dcc" = doDistribute super."irc-dcc_1_2_1"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4775,7 +4569,6 @@ self: super: { "jackminimix" = dontDistribute super."jackminimix"; "jacobi-roots" = dontDistribute super."jacobi-roots"; "jail" = dontDistribute super."jail"; - "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; "jalaali" = dontDistribute super."jalaali"; "jalla" = dontDistribute super."jalla"; "jammittools" = dontDistribute super."jammittools"; @@ -4791,6 +4584,7 @@ self: super: { "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; "jdi" = dontDistribute super."jdi"; "jespresso" = dontDistribute super."jespresso"; + "jmacro-rpc-snap" = dontDistribute super."jmacro-rpc-snap"; "jobqueue" = dontDistribute super."jobqueue"; "join" = dontDistribute super."join"; "joinlist" = dontDistribute super."joinlist"; @@ -4798,8 +4592,7 @@ self: super: { "jort" = dontDistribute super."jort"; "jpeg" = dontDistribute super."jpeg"; "js-good-parts" = dontDistribute super."js-good-parts"; - "js-jquery" = doDistribute super."js-jquery_1_12_4"; - "jsaddle" = doDistribute super."jsaddle_0_3_0_3"; + "jsaddle" = dontDistribute super."jsaddle"; "jsaddle-dom" = dontDistribute super."jsaddle-dom"; "jsaddle-hello" = dontDistribute super."jsaddle-hello"; "jsc" = dontDistribute super."jsc"; @@ -4810,6 +4603,7 @@ self: super: { "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; "json-b" = dontDistribute super."json-b"; + "json-builder" = dontDistribute super."json-builder"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4823,7 +4617,6 @@ self: super: { "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; "json-rpc-client" = dontDistribute super."json-rpc-client"; - "json-rpc-generic" = dontDistribute super."json-rpc-generic"; "json-rpc-server" = dontDistribute super."json-rpc-server"; "json-sop" = dontDistribute super."json-sop"; "json-state" = dontDistribute super."json-state"; @@ -4851,19 +4644,18 @@ self: super: { "kademlia" = dontDistribute super."kademlia"; "kafka-client" = dontDistribute super."kafka-client"; "kaleidoscope" = dontDistribute super."kaleidoscope"; - "kan-extensions" = doDistribute super."kan-extensions_4_2_3"; "kangaroo" = dontDistribute super."kangaroo"; + "kanji" = dontDistribute super."kanji"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; "karakuri" = dontDistribute super."karakuri"; "karver" = dontDistribute super."karver"; - "katip" = doDistribute super."katip_0_2_0_0"; - "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_1_0"; + "katip" = dontDistribute super."katip"; + "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; "katt" = dontDistribute super."katt"; "kawaii" = dontDistribute super."kawaii"; - "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; "kd-tree" = dontDistribute super."kd-tree"; @@ -4889,9 +4681,7 @@ self: super: { "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; - "keter" = doDistribute super."keter_1_4_3_1"; "kevin" = dontDistribute super."kevin"; - "keycode" = doDistribute super."keycode_0_2"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; "keysafe" = dontDistribute super."keysafe"; @@ -4918,6 +4708,7 @@ self: super: { "krpc" = dontDistribute super."krpc"; "ks-test" = dontDistribute super."ks-test"; "ktx" = dontDistribute super."ktx"; + "kure" = dontDistribute super."kure"; "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; "kyotocabinet" = dontDistribute super."kyotocabinet"; "l-bfgs-b" = dontDistribute super."l-bfgs-b"; @@ -4955,10 +4746,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -4970,16 +4764,13 @@ self: super: { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; - "language-c-quote" = doDistribute super."language-c-quote_0_11_6_2"; "language-cil" = dontDistribute super."language-cil"; "language-conf" = dontDistribute super."language-conf"; "language-css" = dontDistribute super."language-css"; "language-dart" = dontDistribute super."language-dart"; - "language-dockerfile" = dontDistribute super."language-dockerfile"; "language-dot" = dontDistribute super."language-dot"; "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; "language-eiffel" = dontDistribute super."language-eiffel"; - "language-fortran" = dontDistribute super."language-fortran"; "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; @@ -4992,7 +4783,6 @@ self: super: { "language-objc" = dontDistribute super."language-objc"; "language-openscad" = dontDistribute super."language-openscad"; "language-pig" = dontDistribute super."language-pig"; - "language-puppet" = dontDistribute super."language-puppet"; "language-python" = dontDistribute super."language-python"; "language-python-colour" = dontDistribute super."language-python-colour"; "language-python-test" = dontDistribute super."language-python-test"; @@ -5001,7 +4791,6 @@ self: super: { "language-slice" = dontDistribute super."language-slice"; "language-spelling" = dontDistribute super."language-spelling"; "language-sqlite" = dontDistribute super."language-sqlite"; - "language-thrift" = doDistribute super."language-thrift_0_8_0_1"; "language-typescript" = dontDistribute super."language-typescript"; "language-vhdl" = dontDistribute super."language-vhdl"; "language-webidl" = dontDistribute super."language-webidl"; @@ -5009,6 +4798,9 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -5032,7 +4824,6 @@ self: super: { "leaky" = dontDistribute super."leaky"; "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; - "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; "learn-physics" = dontDistribute super."learn-physics"; "learn-physics-examples" = dontDistribute super."learn-physics-examples"; @@ -5040,9 +4831,8 @@ self: super: { "leetify" = dontDistribute super."leetify"; "legion" = dontDistribute super."legion"; "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; - "lens" = doDistribute super."lens_4_13"; - "lens-family-th" = doDistribute super."lens-family-th_0_4_1_0"; "lens-prelude" = dontDistribute super."lens-prelude"; "lens-properties" = dontDistribute super."lens-properties"; "lens-sop" = dontDistribute super."lens-sop"; @@ -5052,7 +4842,7 @@ self: super: { "lens-utils" = dontDistribute super."lens-utils"; "lenses" = dontDistribute super."lenses"; "lensref" = dontDistribute super."lensref"; - "lentil" = doDistribute super."lentil_0_1_12_0"; + "lentil" = dontDistribute super."lentil"; "lenz" = dontDistribute super."lenz"; "lenz-template" = dontDistribute super."lenz-template"; "level-monad" = dontDistribute super."level-monad"; @@ -5080,19 +4870,19 @@ self: super: { "liblastfm" = dontDistribute super."liblastfm"; "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; "libltdl" = dontDistribute super."libltdl"; - "libmpd" = dontDistribute super."libmpd"; - "libnotify" = doDistribute super."libnotify_0_1_1_0"; "libnvvm" = dontDistribute super."libnvvm"; "liboleg" = dontDistribute super."liboleg"; "libpafe" = dontDistribute super."libpafe"; "libpq" = dontDistribute super."libpq"; "librandomorg" = dontDistribute super."librandomorg"; + "librato" = dontDistribute super."librato"; "libravatar" = dontDistribute super."libravatar"; "libroman" = dontDistribute super."libroman"; "libssh2" = dontDistribute super."libssh2"; "libssh2-conduit" = dontDistribute super."libssh2-conduit"; "libstackexchange" = dontDistribute super."libstackexchange"; "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; "libtagc" = dontDistribute super."libtagc"; "libvirt-hs" = dontDistribute super."libvirt-hs"; "libvorbis" = dontDistribute super."libvorbis"; @@ -5161,7 +4951,6 @@ self: super: { "list-grouping" = dontDistribute super."list-grouping"; "list-mux" = dontDistribute super."list-mux"; "list-remote-forwards" = dontDistribute super."list-remote-forwards"; - "list-t" = doDistribute super."list-t_0_4_7"; "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; "list-t-html-parser" = dontDistribute super."list-t-html-parser"; "list-t-http-client" = dontDistribute super."list-t-http-client"; @@ -5247,28 +5036,26 @@ self: super: { "lowgl" = dontDistribute super."lowgl"; "lp-diagrams" = dontDistribute super."lp-diagrams"; "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; - "lrucaching" = dontDistribute super."lrucaching"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; "lsystem" = dontDistribute super."lsystem"; - "ltext" = doDistribute super."ltext_0_0_2_1"; "ltiv1p1" = dontDistribute super."ltiv1p1"; + "ltk" = dontDistribute super."ltk"; "ltl" = dontDistribute super."ltl"; "lua-bc" = dontDistribute super."lua-bc"; "lua-bytecode" = dontDistribute super."lua-bytecode"; "luachunk" = dontDistribute super."luachunk"; "luautils" = dontDistribute super."luautils"; "lub" = dontDistribute super."lub"; - "lucid" = doDistribute super."lucid_2_9_5"; "lucid-foundation" = dontDistribute super."lucid-foundation"; - "lucid-svg" = doDistribute super."lucid-svg_0_6_0_1"; "lucienne" = dontDistribute super."lucienne"; "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luis-client" = dontDistribute super."luis-client"; "luka" = dontDistribute super."luka"; - "luminance" = doDistribute super."luminance_0_11_0_2"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5279,6 +5066,7 @@ self: super: { "lz4" = dontDistribute super."lz4"; "lzma" = dontDistribute super."lzma"; "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-conduit" = dontDistribute super."lzma-conduit"; "lzma-enumerator" = dontDistribute super."lzma-enumerator"; "lzma-streams" = dontDistribute super."lzma-streams"; "maam" = dontDistribute super."maam"; @@ -5286,9 +5074,10 @@ self: super: { "macbeth-lib" = dontDistribute super."macbeth-lib"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; - "machines" = doDistribute super."machines_0_5_1"; - "machines-directory" = doDistribute super."machines-directory_0_2_0_8"; - "machines-io" = doDistribute super."machines-io_0_2_0_12"; + "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = dontDistribute super."machines-directory"; + "machines-io" = dontDistribute super."machines-io"; + "machines-process" = dontDistribute super."machines-process"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5307,7 +5096,6 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; - "makefile" = dontDistribute super."makefile"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5326,13 +5114,12 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; - "mandrill" = doDistribute super."mandrill_0_5_2_2"; "mandulia" = dontDistribute super."mandulia"; "mangopay" = dontDistribute super."mangopay"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; "map-exts" = dontDistribute super."map-exts"; - "map-syntax" = doDistribute super."map-syntax_0_2"; + "map-syntax" = dontDistribute super."map-syntax"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5351,7 +5138,6 @@ self: super: { "mastermind" = dontDistribute super."mastermind"; "matcher" = dontDistribute super."matcher"; "matchers" = dontDistribute super."matchers"; - "math-functions" = doDistribute super."math-functions_0_1_7_0"; "mathblog" = dontDistribute super."mathblog"; "mathgenealogy" = dontDistribute super."mathgenealogy"; "mathista" = dontDistribute super."mathista"; @@ -5385,7 +5171,6 @@ self: super: { "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; "meep" = dontDistribute super."meep"; "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"; @@ -5395,15 +5180,15 @@ self: super: { "memcache-conduit" = dontDistribute super."memcache-conduit"; "memcache-haskell" = dontDistribute super."memcache-haskell"; "memcached" = dontDistribute super."memcached"; + "memcached-binary" = dontDistribute super."memcached-binary"; "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; - "memoize" = doDistribute super."memoize_0_7"; + "memoization-utils" = dontDistribute super."memoization-utils"; + "memoize" = dontDistribute super."memoize"; "memorypool" = dontDistribute super."memorypool"; "memscript" = dontDistribute super."memscript"; "merge-bash-history" = dontDistribute super."merge-bash-history"; - "mersenne-random" = dontDistribute super."mersenne-random"; - "messagepack" = doDistribute super."messagepack_0_5_1"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5420,17 +5205,12 @@ self: super: { "mi" = dontDistribute super."mi"; "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; - "microlens" = doDistribute super."microlens_0_4_5_0"; - "microlens-aeson" = doDistribute super."microlens-aeson_2_1_1"; "microlens-each" = dontDistribute super."microlens-each"; - "microlens-ghc" = doDistribute super."microlens-ghc_0_4_5_0"; - "microlens-mtl" = doDistribute super."microlens-mtl_0_1_9_0"; - "microlens-platform" = doDistribute super."microlens-platform_0_3_3_0"; - "microlens-th" = doDistribute super."microlens-th_0_4_0_0"; "micrologger" = dontDistribute super."micrologger"; "microspec" = dontDistribute super."microspec"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; + "midair" = dontDistribute super."midair"; "midi" = dontDistribute super."midi"; "midi-alsa" = dontDistribute super."midi-alsa"; "midi-music-box" = dontDistribute super."midi-music-box"; @@ -5489,6 +5269,7 @@ self: super: { "modulo" = dontDistribute super."modulo"; "moe" = dontDistribute super."moe"; "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; "mollie-api-haskell" = dontDistribute super."mollie-api-haskell"; "monad-abort-fd" = dontDistribute super."monad-abort-fd"; "monad-atom" = dontDistribute super."monad-atom"; @@ -5506,7 +5287,6 @@ self: super: { "monad-levels" = dontDistribute super."monad-levels"; "monad-lgbt" = dontDistribute super."monad-lgbt"; "monad-log" = dontDistribute super."monad-log"; - "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5517,6 +5297,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-st" = dontDistribute super."monad-st"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-ste" = dontDistribute super."monad-ste"; @@ -5543,21 +5324,16 @@ self: super: { "monadtransform" = dontDistribute super."monadtransform"; "monarch" = dontDistribute super."monarch"; "mondo" = dontDistribute super."mondo"; - "mongoDB" = doDistribute super."mongoDB_2_0_10"; "mongodb-queue" = dontDistribute super."mongodb-queue"; "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "monky" = dontDistribute super."monky"; "mono-foldable" = dontDistribute super."mono-foldable"; - "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; - "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; - "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; - "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_5"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5570,7 +5346,6 @@ self: super: { "morfette" = dontDistribute super."morfette"; "morfeusz" = dontDistribute super."morfeusz"; "morph" = dontDistribute super."morph"; - "morte" = doDistribute super."morte_1_6_1"; "mosaico-lib" = dontDistribute super."mosaico-lib"; "mount" = dontDistribute super."mount"; "mp" = dontDistribute super."mp"; @@ -5590,6 +5365,8 @@ self: super: { "msgpack-idl" = dontDistribute super."msgpack-idl"; "msgpack-rpc" = dontDistribute super."msgpack-rpc"; "msh" = dontDistribute super."msh"; + "msi-kb-backlit" = dontDistribute super."msi-kb-backlit"; + "mstate" = dontDistribute super."mstate"; "msu" = dontDistribute super."msu"; "mtgoxapi" = dontDistribute super."mtgoxapi"; "mtl-c" = dontDistribute super."mtl-c"; @@ -5614,6 +5391,7 @@ self: super: { "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; "multiplate-simplified" = dontDistribute super."multiplate-simplified"; "multiplicity" = dontDistribute super."multiplicity"; "multirec" = dontDistribute super."multirec"; @@ -5624,7 +5402,6 @@ self: super: { "muon" = dontDistribute super."muon"; "murder" = dontDistribute super."murder"; "murmur" = dontDistribute super."murmur"; - "murmur3" = dontDistribute super."murmur3"; "murmurhash3" = dontDistribute super."murmurhash3"; "music-articulation" = dontDistribute super."music-articulation"; "music-diatonic" = dontDistribute super."music-diatonic"; @@ -5642,7 +5419,6 @@ self: super: { "musicbrainz-email" = dontDistribute super."musicbrainz-email"; "musicxml" = dontDistribute super."musicxml"; "musicxml2" = dontDistribute super."musicxml2"; - "mustache" = doDistribute super."mustache_1_0_2"; "mustache-haskell" = dontDistribute super."mustache-haskell"; "mustache2hs" = dontDistribute super."mustache2hs"; "mutable-iter" = dontDistribute super."mutable-iter"; @@ -5650,14 +5426,15 @@ self: super: { "mvc" = dontDistribute super."mvc"; "mvc-updates" = dontDistribute super."mvc-updates"; "mvclient" = dontDistribute super."mvclient"; - "mwc-random-monad" = dontDistribute super."mwc-random-monad"; "myTestlll" = dontDistribute super."myTestlll"; "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; "myo" = dontDistribute super."myo"; "mysnapsession" = dontDistribute super."mysnapsession"; "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql" = dontDistribute super."mysql"; "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-haskell" = dontDistribute super."mysql-haskell"; + "mysql-simple" = dontDistribute super."mysql-simple"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; "mystem" = dontDistribute super."mystem"; @@ -5706,7 +5483,7 @@ self: super: { "nero" = dontDistribute super."nero"; "nero-wai" = dontDistribute super."nero-wai"; "nero-warp" = dontDistribute super."nero-warp"; - "nested-routes" = doDistribute super."nested-routes_7_0_0"; + "nested-routes" = dontDistribute super."nested-routes"; "nested-sequence" = dontDistribute super."nested-sequence"; "nested-sets" = dontDistribute super."nested-sets"; "nestedmap" = dontDistribute super."nestedmap"; @@ -5717,7 +5494,6 @@ self: super: { "netlink" = dontDistribute super."netlink"; "netlist" = dontDistribute super."netlist"; "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; - "netpbm" = dontDistribute super."netpbm"; "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; @@ -5727,12 +5503,12 @@ self: super: { "netwire" = dontDistribute super."netwire"; "netwire-input" = dontDistribute super."netwire-input"; "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; - "network" = doDistribute super."network_2_6_2_1"; "network-address" = dontDistribute super."network-address"; "network-api-support" = dontDistribute super."network-api-support"; "network-bitcoin" = dontDistribute super."network-bitcoin"; "network-builder" = dontDistribute super."network-builder"; "network-bytestring" = dontDistribute super."network-bytestring"; + "network-carbon" = dontDistribute super."network-carbon"; "network-conduit" = dontDistribute super."network-conduit"; "network-connection" = dontDistribute super."network-connection"; "network-data" = dontDistribute super."network-data"; @@ -5747,8 +5523,10 @@ self: super: { "network-minihttp" = dontDistribute super."network-minihttp"; "network-msg" = dontDistribute super."network-msg"; "network-msgpack-rpc" = dontDistribute super."network-msgpack-rpc"; + "network-multicast" = dontDistribute super."network-multicast"; "network-netpacket" = dontDistribute super."network-netpacket"; "network-pgi" = dontDistribute super."network-pgi"; + "network-protocol-xmpp" = dontDistribute super."network-protocol-xmpp"; "network-rpca" = dontDistribute super."network-rpca"; "network-server" = dontDistribute super."network-server"; "network-service" = dontDistribute super."network-service"; @@ -5758,7 +5536,7 @@ self: super: { "network-stream" = dontDistribute super."network-stream"; "network-topic-models" = dontDistribute super."network-topic-models"; "network-transport-amqp" = dontDistribute super."network-transport-amqp"; - "network-uri-flag" = dontDistribute super."network-uri-flag"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; "network-uri-static" = dontDistribute super."network-uri-static"; "network-wai-router" = dontDistribute super."network-wai-router"; "network-websocket" = dontDistribute super."network-websocket"; @@ -5768,6 +5546,7 @@ self: super: { "newsynth" = dontDistribute super."newsynth"; "newt" = dontDistribute super."newt"; "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-generics" = dontDistribute super."newtype-generics"; "newtype-th" = dontDistribute super."newtype-th"; "newtyper" = dontDistribute super."newtyper"; "nextstep-plist" = dontDistribute super."nextstep-plist"; @@ -5797,7 +5576,6 @@ self: super: { "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; - "non-empty-sequence" = dontDistribute super."non-empty-sequence"; "non-negative" = dontDistribute super."non-negative"; "nondeterminism" = dontDistribute super."nondeterminism"; "nonempty-alternative" = dontDistribute super."nonempty-alternative"; @@ -5852,12 +5630,10 @@ self: super: { "obj" = dontDistribute super."obj"; "objectid" = dontDistribute super."objectid"; "observable-sharing" = dontDistribute super."observable-sharing"; - "octane" = doDistribute super."octane_0_4_24"; "octohat" = dontDistribute super."octohat"; "octopus" = dontDistribute super."octopus"; "oculus" = dontDistribute super."oculus"; "oden-go-packages" = dontDistribute super."oden-go-packages"; - "oeis" = dontDistribute super."oeis"; "off-simple" = dontDistribute super."off-simple"; "ogmarkup" = dontDistribute super."ogmarkup"; "ohloh-hs" = dontDistribute super."ohloh-hs"; @@ -5872,14 +5648,12 @@ self: super: { "omnicodec" = dontDistribute super."omnicodec"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; - "once" = doDistribute super."once_0_1_0_0"; "one-liner" = dontDistribute super."one-liner"; "one-time-password" = dontDistribute super."one-time-password"; "oneOfN" = dontDistribute super."oneOfN"; "oneormore" = dontDistribute super."oneormore"; "only" = dontDistribute super."only"; "onu-course" = dontDistribute super."onu-course"; - "opaleye" = doDistribute super."opaleye_0_4_2_0"; "opaleye-classy" = dontDistribute super."opaleye-classy"; "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; "open-haddock" = dontDistribute super."open-haddock"; @@ -5916,7 +5690,6 @@ self: super: { "opentheory-probability" = dontDistribute super."opentheory-probability"; "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; - "operational" = doDistribute super."operational_0_2_3_2"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; @@ -5928,7 +5701,6 @@ self: super: { "optional" = dontDistribute super."optional"; "options-time" = dontDistribute super."options-time"; "optparse-declarative" = dontDistribute super."optparse-declarative"; - "optparse-text" = dontDistribute super."optparse-text"; "orc" = dontDistribute super."orc"; "orchestrate" = dontDistribute super."orchestrate"; "orchid" = dontDistribute super."orchid"; @@ -5953,7 +5725,6 @@ self: super: { "osx-ar" = dontDistribute super."osx-ar"; "ot" = dontDistribute super."ot"; "ottparse-pretty" = dontDistribute super."ottparse-pretty"; - "overloaded-records" = dontDistribute super."overloaded-records"; "overture" = dontDistribute super."overture"; "pack" = dontDistribute super."pack"; "package-o-tron" = dontDistribute super."package-o-tron"; @@ -5966,13 +5737,10 @@ self: super: { "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; - "pagination" = dontDistribute super."pagination"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; - "palette" = doDistribute super."palette_0_1_0_3"; "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; - "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9_1_1"; "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; @@ -5981,9 +5749,7 @@ self: super: { "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; - "pandoc-types" = doDistribute super."pandoc-types_1_16_1"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; - "pango" = doDistribute super."pango_0_13_1_1"; "papa" = dontDistribute super."papa"; "papa-base" = dontDistribute super."papa-base"; "papa-include" = dontDistribute super."papa-include"; @@ -6033,6 +5799,7 @@ self: super: { "parsimony" = dontDistribute super."parsimony"; "partage" = dontDistribute super."partage"; "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; "partial-lens" = dontDistribute super."partial-lens"; "partial-uri" = dontDistribute super."partial-uri"; "partly" = dontDistribute super."partly"; @@ -6043,8 +5810,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; - "path" = doDistribute super."path_0_5_8"; - "path-io" = doDistribute super."path-io_1_1_0"; + "patches-vector" = dontDistribute super."patches-vector"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -6055,7 +5821,6 @@ self: super: { "paypal-api" = dontDistribute super."paypal-api"; "pb" = dontDistribute super."pb"; "pbc4hs" = dontDistribute super."pbc4hs"; - "pbkdf" = dontDistribute super."pbkdf"; "pcap-conduit" = dontDistribute super."pcap-conduit"; "pcap-enumerator" = dontDistribute super."pcap-enumerator"; "pcd-loader" = dontDistribute super."pcd-loader"; @@ -6088,7 +5853,6 @@ self: super: { "perm" = dontDistribute super."perm"; "permute" = dontDistribute super."permute"; "persist2er" = dontDistribute super."persist2er"; - "persistent" = doDistribute super."persistent_2_2_4_1"; "persistent-audit" = dontDistribute super."persistent-audit"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-database-url" = dontDistribute super."persistent-database-url"; @@ -6097,16 +5861,12 @@ self: super: { "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; - "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_4"; - "persistent-mysql" = doDistribute super."persistent-mysql_2_3_0_2"; + "persistent-mongoDB" = dontDistribute super."persistent-mongoDB"; + "persistent-mysql" = dontDistribute super."persistent-mysql"; "persistent-odbc" = dontDistribute super."persistent-odbc"; "persistent-parser" = dontDistribute super."persistent-parser"; - "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; - "persistent-redis" = dontDistribute super."persistent-redis"; - "persistent-sqlite" = doDistribute super."persistent-sqlite_2_2_1"; - "persistent-template" = doDistribute super."persistent-template_2_1_8_1"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -6144,27 +5904,22 @@ self: super: { "picosat" = dontDistribute super."picosat"; "piet" = dontDistribute super."piet"; "piki" = dontDistribute super."piki"; - "pinboard" = dontDistribute super."pinboard"; - "pinch" = doDistribute super."pinch_0_2_0_2"; - "pinchot" = doDistribute super."pinchot_0_18_2_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-binary" = dontDistribute super."pipes-binary"; "pipes-bzip" = dontDistribute super."pipes-bzip"; - "pipes-cacophony" = doDistribute super."pipes-cacophony_0_2_1"; "pipes-cellular" = dontDistribute super."pipes-cellular"; "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; "pipes-cereal" = dontDistribute super."pipes-cereal"; "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; - "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; "pipes-conduit" = dontDistribute super."pipes-conduit"; "pipes-core" = dontDistribute super."pipes-core"; "pipes-courier" = dontDistribute super."pipes-courier"; "pipes-errors" = dontDistribute super."pipes-errors"; "pipes-extra" = dontDistribute super."pipes-extra"; "pipes-files" = dontDistribute super."pipes-files"; - "pipes-http" = doDistribute super."pipes-http_1_0_3"; "pipes-interleave" = dontDistribute super."pipes-interleave"; "pipes-io" = dontDistribute super."pipes-io"; "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv"; @@ -6174,11 +5929,11 @@ self: super: { "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-protolude" = dontDistribute super."pipes-protolude"; - "pipes-random" = dontDistribute super."pipes-random"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-s3" = dontDistribute super."pipes-s3"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -6187,7 +5942,6 @@ self: super: { "pit" = dontDistribute super."pit"; "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; - "pixelated-avatar-generator" = dontDistribute super."pixelated-avatar-generator"; "pkcs1" = dontDistribute super."pkcs1"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; @@ -6199,6 +5953,10 @@ self: super: { "plist" = dontDistribute super."plist"; "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; + "plot" = dontDistribute super."plot"; + "plot-gtk" = dontDistribute super."plot-gtk"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-gtk3" = dontDistribute super."plot-gtk3"; "plot-lab" = dontDistribute super."plot-lab"; "plotfont" = dontDistribute super."plotfont"; "plotserver-api" = dontDistribute super."plotserver-api"; @@ -6212,7 +5970,6 @@ self: super: { "pngload-fixed" = dontDistribute super."pngload-fixed"; "pnm" = dontDistribute super."pnm"; "pocket-dns" = dontDistribute super."pocket-dns"; - "pointed" = doDistribute super."pointed_4_2_0_2"; "pointedalternative" = dontDistribute super."pointedalternative"; "pointfree" = dontDistribute super."pointfree"; "pointless-haskell" = dontDistribute super."pointless-haskell"; @@ -6227,6 +5984,7 @@ self: super: { "polh-lexicon" = dontDistribute super."polh-lexicon"; "polimorf" = dontDistribute super."polimorf"; "poll" = dontDistribute super."poll"; + "poly-arity" = dontDistribute super."poly-arity"; "poly-control" = dontDistribute super."poly-control"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; @@ -6268,14 +6026,12 @@ self: super: { "possible" = dontDistribute super."possible"; "postcodes" = dontDistribute super."postcodes"; "postgres-tmp" = dontDistribute super."postgres-tmp"; - "postgresql-binary" = doDistribute super."postgresql-binary_0_9_0_1"; "postgresql-config" = dontDistribute super."postgresql-config"; "postgresql-connector" = dontDistribute super."postgresql-connector"; "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; "postgresql-cube" = dontDistribute super."postgresql-cube"; "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; - "postgresql-libpq" = doDistribute super."postgresql-libpq_0_9_1_1"; - "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-simple-bind" = dontDistribute super."postgresql-simple-bind"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; @@ -6297,6 +6053,7 @@ self: super: { "pqueue-mtl" = dontDistribute super."pqueue-mtl"; "practice-room" = dontDistribute super."practice-room"; "precis" = dontDistribute super."precis"; + "pred-trie" = dontDistribute super."pred-trie"; "predicates" = dontDistribute super."predicates"; "predictive" = dontDistribute super."predictive"; "prednote-test" = dontDistribute super."prednote-test"; @@ -6320,7 +6077,6 @@ self: super: { "pretty-ncols" = dontDistribute super."pretty-ncols"; "pretty-sop" = dontDistribute super."pretty-sop"; "pretty-tree" = dontDistribute super."pretty-tree"; - "pretty-types" = dontDistribute super."pretty-types"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-spoon" = dontDistribute super."prim-spoon"; "prim-uniq" = dontDistribute super."prim-uniq"; @@ -6341,12 +6097,12 @@ self: super: { "proc" = dontDistribute super."proc"; "proc-net" = dontDistribute super."proc-net"; "process-conduit" = dontDistribute super."process-conduit"; - "process-extras" = doDistribute super."process-extras_0_3_3_8"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; "process-progress" = dontDistribute super."process-progress"; "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; "processing" = dontDistribute super."processing"; "processing-for-haskell" = dontDistribute super."processing-for-haskell"; "processor-creative-kit" = dontDistribute super."processor-creative-kit"; @@ -6383,11 +6139,8 @@ self: super: { "proto-lens-optparse" = dontDistribute super."proto-lens-optparse"; "proto-lens-protoc" = dontDistribute super."proto-lens-protoc"; "protobuf-native" = dontDistribute super."protobuf-native"; - "protocol-buffers" = doDistribute super."protocol-buffers_2_2_0"; - "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; - "protolude" = doDistribute super."protolude_0_1_6"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6397,10 +6150,8 @@ self: super: { "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; "psi" = dontDistribute super."psi"; - "psqueues" = doDistribute super."psqueues_0_2_2_1"; "pstemmer" = dontDistribute super."pstemmer"; "pub" = dontDistribute super."pub"; - "publicsuffix" = doDistribute super."publicsuffix_0_20160522"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; "pubnub" = dontDistribute super."pubnub"; @@ -6421,15 +6172,13 @@ self: super: { "pure-priority-queue" = dontDistribute super."pure-priority-queue"; "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; "pure-zlib" = dontDistribute super."pure-zlib"; - "purescript" = doDistribute super."purescript_0_8_5_0"; - "purescript-bridge" = dontDistribute super."purescript-bridge"; "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; "pursuit-client" = dontDistribute super."pursuit-client"; "push-notify" = dontDistribute super."push-notify"; "push-notify-ccs" = dontDistribute super."push-notify-ccs"; "push-notify-general" = dontDistribute super."push-notify-general"; "pusher-haskell" = dontDistribute super."pusher-haskell"; - "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_2"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; "pusher-ws" = dontDistribute super."pusher-ws"; "pushme" = dontDistribute super."pushme"; "putlenses" = dontDistribute super."putlenses"; @@ -6454,10 +6203,10 @@ self: super: { "qtah-qt5" = dontDistribute super."qtah-qt5"; "quack" = dontDistribute super."quack"; "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quandl-api" = dontDistribute super."quandl-api"; "quantfin" = dontDistribute super."quantfin"; "quantities" = dontDistribute super."quantities"; "quantum-arrow" = dontDistribute super."quantum-arrow"; - "quantum-random" = dontDistribute super."quantum-random"; "qudb" = dontDistribute super."qudb"; "quenya-verb" = dontDistribute super."quenya-verb"; "querystring-pickle" = dontDistribute super."querystring-pickle"; @@ -6466,10 +6215,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; - "quickcheck-arbitrary-adt" = dontDistribute super."quickcheck-arbitrary-adt"; - "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; - "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; "quickcheck-regex" = dontDistribute super."quickcheck-regex"; @@ -6535,8 +6281,6 @@ self: super: { "rapid" = dontDistribute super."rapid"; "rascal" = dontDistribute super."rascal"; "rate-limit" = dontDistribute super."rate-limit"; - "ratel" = doDistribute super."ratel_0_1_3"; - "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; @@ -6574,14 +6318,12 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; - "read-env-var" = doDistribute super."read-env-var_0_1_0_0"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "readshp" = dontDistribute super."readshp"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; "reasonable-lens" = dontDistribute super."reasonable-lens"; "reasonable-operational" = dontDistribute super."reasonable-operational"; - "rebase" = dontDistribute super."rebase"; "recaptcha" = dontDistribute super."recaptcha"; "record" = dontDistribute super."record"; "record-aeson" = dontDistribute super."record-aeson"; @@ -6590,6 +6332,7 @@ self: super: { "record-syntax" = dontDistribute super."record-syntax"; "records" = dontDistribute super."records"; "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; "recursive-line-count" = dontDistribute super."recursive-line-count"; "redHandlers" = dontDistribute super."redHandlers"; "reddit" = dontDistribute super."reddit"; @@ -6598,6 +6341,7 @@ self: super: { "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6630,6 +6374,7 @@ self: super: { "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-rc" = dontDistribute super."regex-tdfa-rc"; "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; "regex-tre" = dontDistribute super."regex-tre"; @@ -6660,12 +6405,11 @@ self: super: { "relacion" = dontDistribute super."relacion"; "relation" = dontDistribute super."relation"; "relational-postgresql8" = dontDistribute super."relational-postgresql8"; - "relational-query" = doDistribute super."relational-query_0_8_3_0"; - "relational-record" = doDistribute super."relational-record_0_1_5_0"; "relational-record-examples" = dontDistribute super."relational-record-examples"; "relative-date" = dontDistribute super."relative-date"; "relit" = dontDistribute super."relit"; "reload" = dontDistribute super."reload"; + "rematch" = dontDistribute super."rematch"; "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; @@ -6674,12 +6418,12 @@ self: super: { "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; - "renderable" = dontDistribute super."renderable"; "reord" = dontDistribute super."reord"; "reorderable" = dontDistribute super."reorderable"; "repa-array" = dontDistribute super."repa-array"; "repa-bytestring" = dontDistribute super."repa-bytestring"; "repa-convert" = dontDistribute super."repa-convert"; + "repa-devil" = dontDistribute super."repa-devil"; "repa-eval" = dontDistribute super."repa-eval"; "repa-examples" = dontDistribute super."repa-examples"; "repa-fftw" = dontDistribute super."repa-fftw"; @@ -6703,7 +6447,6 @@ self: super: { "representable-tries" = dontDistribute super."representable-tries"; "reqcatcher" = dontDistribute super."reqcatcher"; "request-monad" = dontDistribute super."request-monad"; - "reroute" = doDistribute super."reroute_0_3_1_0"; "reserve" = dontDistribute super."reserve"; "resistor-cube" = dontDistribute super."resistor-cube"; "resource-effect" = dontDistribute super."resource-effect"; @@ -6711,15 +6454,13 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; - "resourcet" = doDistribute super."resourcet_1_1_7_4"; "respond" = dontDistribute super."respond"; "rest-example" = dontDistribute super."rest-example"; + "rest-snap" = dontDistribute super."rest-snap"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; - "result" = dontDistribute super."result"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; - "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retryer" = dontDistribute super."retryer"; @@ -6734,8 +6475,8 @@ self: super: { "rezoom" = dontDistribute super."rezoom"; "rfc3339" = dontDistribute super."rfc3339"; "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; - "riak" = doDistribute super."riak_1_0_1_1"; - "riak-protobuf" = doDistribute super."riak-protobuf_0_21_0_0"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; "richreports" = dontDistribute super."richreports"; "riemann" = dontDistribute super."riemann"; "riff" = dontDistribute super."riff"; @@ -6776,6 +6517,7 @@ self: super: { "rose-trie" = dontDistribute super."rose-trie"; "roshask" = dontDistribute super."roshask"; "rosmsg" = dontDistribute super."rosmsg"; + "rosmsg-bin" = dontDistribute super."rosmsg-bin"; "rospkg" = dontDistribute super."rospkg"; "rosso" = dontDistribute super."rosso"; "rot13" = dontDistribute super."rot13"; @@ -6817,7 +6559,6 @@ self: super: { "rws" = dontDistribute super."rws"; "s-cargot" = dontDistribute super."s-cargot"; "safe-access" = dontDistribute super."safe-access"; - "safe-exceptions" = dontDistribute super."safe-exceptions"; "safe-failure" = dontDistribute super."safe-failure"; "safe-failure-cme" = dontDistribute super."safe-failure-cme"; "safe-freeze" = dontDistribute super."safe-freeze"; @@ -6847,7 +6588,6 @@ self: super: { "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; "samtools-iteratee" = dontDistribute super."samtools-iteratee"; - "sandi" = doDistribute super."sandi_0_3_6"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; "sarsi" = dontDistribute super."sarsi"; @@ -6862,7 +6602,6 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbp2udp" = dontDistribute super."sbp2udp"; - "sbv" = doDistribute super."sbv_5_11"; "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; @@ -6905,14 +6644,12 @@ self: super: { "scotty-view" = dontDistribute super."scotty-view"; "scp-streams" = dontDistribute super."scp-streams"; "scrabble-bot" = dontDistribute super."scrabble-bot"; - "scrape-changes" = dontDistribute super."scrape-changes"; "scrobble" = dontDistribute super."scrobble"; "scroll" = dontDistribute super."scroll"; "scrz" = dontDistribute super."scrz"; "scyther-proof" = dontDistribute super."scyther-proof"; "sde-solver" = dontDistribute super."sde-solver"; "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; - "sdl2" = doDistribute super."sdl2_2_1_2_1"; "sdl2-cairo" = dontDistribute super."sdl2-cairo"; "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; "sdl2-compositor" = dontDistribute super."sdl2-compositor"; @@ -6928,7 +6665,6 @@ self: super: { "secdh" = dontDistribute super."secdh"; "seclib" = dontDistribute super."seclib"; "second-transfer" = dontDistribute super."second-transfer"; - "secp256k1" = dontDistribute super."secp256k1"; "secret-santa" = dontDistribute super."secret-santa"; "secret-sharing" = dontDistribute super."secret-sharing"; "secrm" = dontDistribute super."secrm"; @@ -6943,9 +6679,7 @@ self: super: { "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; "semibounded-lattices" = dontDistribute super."semibounded-lattices"; - "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; - "semigroups" = doDistribute super."semigroups_0_18_1"; "semigroups-actions" = dontDistribute super."semigroups-actions"; "semiring" = dontDistribute super."semiring"; "semver-range" = dontDistribute super."semver-range"; @@ -6966,15 +6700,13 @@ self: super: { "sequor" = dontDistribute super."sequor"; "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; "serpentine" = dontDistribute super."serpentine"; "serv" = dontDistribute super."serv"; "serv-wai" = dontDistribute super."serv-wai"; - "servant-aeson-specs" = dontDistribute super."servant-aeson-specs"; - "servant-auth-cookie" = dontDistribute super."servant-auth-cookie"; "servant-auth-hmac" = dontDistribute super."servant-auth-hmac"; "servant-auth-token" = dontDistribute super."servant-auth-token"; "servant-auth-token-api" = dontDistribute super."servant-auth-token-api"; - "servant-cassava" = doDistribute super."servant-cassava_0_7_1"; "servant-csharp" = dontDistribute super."servant-csharp"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6987,19 +6719,20 @@ self: super: { "servant-pandoc" = dontDistribute super."servant-pandoc"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; - "servant-purescript" = dontDistribute super."servant-purescript"; "servant-quickcheck" = dontDistribute super."servant-quickcheck"; "servant-response" = dontDistribute super."servant-response"; "servant-router" = dontDistribute super."servant-router"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-smsc-ru" = dontDistribute super."servant-smsc-ru"; - "servant-subscriber" = dontDistribute super."servant-subscriber"; - "servant-swagger" = doDistribute super."servant-swagger_1_0_3"; - "servant-swagger-ui" = dontDistribute super."servant-swagger-ui"; "server-generic" = dontDistribute super."server-generic"; + "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent"; + "serversession-backend-redis" = dontDistribute super."serversession-backend-redis"; + "serversession-frontend-snap" = dontDistribute super."serversession-frontend-snap"; + "ses-html" = dontDistribute super."ses-html"; "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; "sessions" = dontDistribute super."sessions"; "set-cover" = dontDistribute super."set-cover"; + "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setgame" = dontDistribute super."setgame"; @@ -7024,12 +6757,10 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; - "shake-language-c" = doDistribute super."shake-language-c_0_9_1"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; - "shakespeare" = doDistribute super."shakespeare_2_0_9"; "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; @@ -7052,6 +6783,7 @@ self: super: { "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; "shellmate-extras" = dontDistribute super."shellmate-extras"; + "shelltestrunner" = dontDistribute super."shelltestrunner"; "shelly-extra" = dontDistribute super."shelly-extra"; "shine" = dontDistribute super."shine"; "shine-varying" = dontDistribute super."shine-varying"; @@ -7060,7 +6792,6 @@ self: super: { "shortcircuit" = dontDistribute super."shortcircuit"; "shorten-strings" = dontDistribute super."shorten-strings"; "show" = dontDistribute super."show"; - "show-type" = dontDistribute super."show-type"; "showdown" = dontDistribute super."showdown"; "shpider" = dontDistribute super."shpider"; "shplit" = dontDistribute super."shplit"; @@ -7081,7 +6812,6 @@ self: super: { "simple-conduit" = dontDistribute super."simple-conduit"; "simple-config" = dontDistribute super."simple-config"; "simple-css" = dontDistribute super."simple-css"; - "simple-download" = dontDistribute super."simple-download"; "simple-effects" = dontDistribute super."simple-effects"; "simple-eval" = dontDistribute super."simple-eval"; "simple-firewire" = dontDistribute super."simple-firewire"; @@ -7097,6 +6827,7 @@ self: super: { "simple-observer" = dontDistribute super."simple-observer"; "simple-pascal" = dontDistribute super."simple-pascal"; "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; "simple-rope" = dontDistribute super."simple-rope"; "simple-server" = dontDistribute super."simple-server"; "simple-sessions" = dontDistribute super."simple-sessions"; @@ -7107,6 +6838,7 @@ self: super: { "simple-vec3" = dontDistribute super."simple-vec3"; "simple-zipper" = dontDistribute super."simple-zipper"; "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; "simpleirc-lens" = dontDistribute super."simpleirc-lens"; "simplenote" = dontDistribute super."simplenote"; "simpleprelude" = dontDistribute super."simpleprelude"; @@ -7118,9 +6850,7 @@ self: super: { "simseq" = dontDistribute super."simseq"; "simtreelo" = dontDistribute super."simtreelo"; "sindre" = dontDistribute super."sindre"; - "singleton-bool" = dontDistribute super."singleton-bool"; "singleton-nats" = dontDistribute super."singleton-nats"; - "singletons" = doDistribute super."singletons_2_0_1"; "sink" = dontDistribute super."sink"; "siphon" = dontDistribute super."siphon"; "sirkel" = dontDistribute super."sirkel"; @@ -7140,7 +6870,6 @@ self: super: { "slack" = dontDistribute super."slack"; "slack-api" = dontDistribute super."slack-api"; "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; - "slave-thread" = doDistribute super."slave-thread_1_0_1_1"; "sleep" = dontDistribute super."sleep"; "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; "slidemews" = dontDistribute super."slidemews"; @@ -7148,7 +6877,6 @@ self: super: { "sloane" = dontDistribute super."sloane"; "slot-lambda" = dontDistribute super."slot-lambda"; "sloth" = dontDistribute super."sloth"; - "slug" = doDistribute super."slug_0_1_4"; "smallarray" = dontDistribute super."smallarray"; "smallcheck-laws" = dontDistribute super."smallcheck-laws"; "smallcheck-lens" = dontDistribute super."smallcheck-lens"; @@ -7162,8 +6890,6 @@ self: super: { "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; "smerdyakov" = dontDistribute super."smerdyakov"; - "smoothie" = doDistribute super."smoothie_0_4_2_2"; - "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; @@ -7171,14 +6897,13 @@ self: super: { "smtps-gmail" = dontDistribute super."smtps-gmail"; "snake" = dontDistribute super."snake"; "snake-game" = dontDistribute super."snake-game"; - "snap" = doDistribute super."snap_0_14_0_7"; + "snap" = dontDistribute super."snap"; "snap-accept" = dontDistribute super."snap-accept"; "snap-app" = dontDistribute super."snap-app"; "snap-auth-cli" = dontDistribute super."snap-auth-cli"; "snap-blaze" = dontDistribute super."snap-blaze"; "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; - "snap-core" = doDistribute super."snap-core_0_9_8_0"; "snap-cors" = dontDistribute super."snap-cors"; "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; @@ -7188,7 +6913,6 @@ self: super: { "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; "snap-routes" = dontDistribute super."snap-routes"; - "snap-server" = doDistribute super."snap-server_0_9_5_1"; "snap-templates" = dontDistribute super."snap-templates"; "snap-testing" = dontDistribute super."snap-testing"; "snap-utils" = dontDistribute super."snap-utils"; @@ -7200,6 +6924,7 @@ self: super: { "snaplet-coffee" = dontDistribute super."snaplet-coffee"; "snaplet-css-min" = dontDistribute super."snaplet-css-min"; "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-fay" = dontDistribute super."snaplet-fay"; "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; "snaplet-hasql" = dontDistribute super."snaplet-hasql"; "snaplet-haxl" = dontDistribute super."snaplet-haxl"; @@ -7240,28 +6965,27 @@ self: super: { "sneathlane-haste" = dontDistribute super."sneathlane-haste"; "snippet-extractor" = dontDistribute super."snippet-extractor"; "snm" = dontDistribute super."snm"; + "snmp" = dontDistribute super."snmp"; + "snorkels" = dontDistribute super."snorkels"; "snow-white" = dontDistribute super."snow-white"; "snowball" = dontDistribute super."snowball"; "snowflake-core" = dontDistribute super."snowflake-core"; "snowflake-server" = dontDistribute super."snowflake-server"; "snowglobe" = dontDistribute super."snowglobe"; - "soap" = doDistribute super."soap_0_2_3_0"; "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; - "socket" = doDistribute super."socket_0_6_0_1"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = dontDistribute super."socket-io"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "socketson" = dontDistribute super."socketson"; + "sodium" = dontDistribute super."sodium"; "soegtk" = dontDistribute super."soegtk"; - "solga" = dontDistribute super."solga"; - "solga-swagger" = dontDistribute super."solga-swagger"; "solr" = dontDistribute super."solr"; "sonic-visualiser" = dontDistribute super."sonic-visualiser"; "sophia" = dontDistribute super."sophia"; "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; "sorted" = dontDistribute super."sorted"; - "sorted-list" = doDistribute super."sorted-list_0_1_6_1"; "sorting" = dontDistribute super."sorting"; "sorty" = dontDistribute super."sorty"; "sound-collage" = dontDistribute super."sound-collage"; @@ -7339,12 +7063,19 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; - "stache" = dontDistribute super."stache"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; - "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; - "stackage-upload" = doDistribute super."stackage-upload_0_1_0_5"; + "stackage" = dontDistribute super."stackage"; + "stackage-build-plan" = dontDistribute super."stackage-build-plan"; + "stackage-cabal" = dontDistribute super."stackage-cabal"; + "stackage-cli" = dontDistribute super."stackage-cli"; + "stackage-install" = dontDistribute super."stackage-install"; + "stackage-metadata" = dontDistribute super."stackage-metadata"; + "stackage-sandbox" = dontDistribute super."stackage-sandbox"; + "stackage-setup" = dontDistribute super."stackage-setup"; + "stackage-update" = dontDistribute super."stackage-update"; + "stackage-upload" = dontDistribute super."stackage-upload"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7365,6 +7096,7 @@ self: super: { "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; "statistics-fusion" = dontDistribute super."statistics-fusion"; "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "statistics-linreg" = dontDistribute super."statistics-linreg"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; "statsd-client" = dontDistribute super."statsd-client"; @@ -7384,8 +7116,6 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; - "stm-conduit" = doDistribute super."stm-conduit_2_8_0"; - "stm-containers" = doDistribute super."stm-containers_0_2_14"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7403,16 +7133,12 @@ self: super: { "stomp-queue" = dontDistribute super."stomp-queue"; "stompl" = dontDistribute super."stompl"; "storable" = dontDistribute super."storable"; - "storable-record" = dontDistribute super."storable-record"; "storable-static-array" = dontDistribute super."storable-static-array"; "storable-tuple" = dontDistribute super."storable-tuple"; "storablevector" = dontDistribute super."storablevector"; "storablevector-carray" = dontDistribute super."storablevector-carray"; "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; - "store" = dontDistribute super."store"; - "store-core" = dontDistribute super."store-core"; "str" = dontDistribute super."str"; - "stratosphere" = doDistribute super."stratosphere_0_1_2_1"; "stratum-tool" = dontDistribute super."stratum-tool"; "stratux" = dontDistribute super."stratux"; "stratux-http" = dontDistribute super."stratux-http"; @@ -7427,7 +7153,6 @@ 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-data" = dontDistribute super."strict-data"; "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; @@ -7446,10 +7171,8 @@ self: super: { "stringtable-atom" = dontDistribute super."stringtable-atom"; "strio" = dontDistribute super."strio"; "stripe" = dontDistribute super."stripe"; - "stripe-core" = doDistribute super."stripe-core_2_0_3"; - "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; - "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; - "strive" = doDistribute super."strive_2_2_2"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "stripe-http-streams" = dontDistribute super."stripe-http-streams"; "strptime" = dontDistribute super."strptime"; "structs" = dontDistribute super."structs"; "structural-induction" = dontDistribute super."structural-induction"; @@ -7459,7 +7182,6 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; - "stylish-haskell" = doDistribute super."stylish-haskell_0_5_17_0"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7481,6 +7203,7 @@ self: super: { "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; + "supermonad" = dontDistribute super."supermonad"; "supero" = dontDistribute super."supero"; "supervisor" = dontDistribute super."supervisor"; "supplemented" = dontDistribute super."supplemented"; @@ -7492,7 +7215,6 @@ self: super: { "svm-light-utils" = dontDistribute super."svm-light-utils"; "svm-simple" = dontDistribute super."svm-simple"; "svndump" = dontDistribute super."svndump"; - "swagger2" = doDistribute super."swagger2_2_0_2"; "swapper" = dontDistribute super."swapper"; "swearjure" = dontDistribute super."swearjure"; "swf" = dontDistribute super."swf"; @@ -7504,10 +7226,10 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; - "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "symon" = dontDistribute super."symon"; "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7561,7 +7283,6 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; - "tagged" = doDistribute super."tagged_0_8_4"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7571,7 +7292,6 @@ self: super: { "taglib" = dontDistribute super."taglib"; "taglib-api" = dontDistribute super."taglib-api"; "tagset-positional" = dontDistribute super."tagset-positional"; - "tagsoup" = doDistribute super."tagsoup_0_13_10"; "tagsoup-ht" = dontDistribute super."tagsoup-ht"; "tagsoup-megaparsec" = dontDistribute super."tagsoup-megaparsec"; "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; @@ -7590,16 +7310,13 @@ self: super: { "task" = dontDistribute super."task"; "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; - "tasty" = doDistribute super."tasty_0_11_0_3"; - "tasty-dejafu" = doDistribute super."tasty-dejafu_0_3_0_1"; - "tasty-golden" = doDistribute super."tasty-golden_2_3_1"; + "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; - "tasty-program" = dontDistribute super."tasty-program"; - "tasty-silver" = doDistribute super."tasty-silver_3_1_8_1"; + "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; "tbox" = dontDistribute super."tbox"; @@ -7608,14 +7325,14 @@ self: super: { "tce-conf" = dontDistribute super."tce-conf"; "tconfig" = dontDistribute super."tconfig"; "tcp" = dontDistribute super."tcp"; - "tcp-streams" = dontDistribute super."tcp-streams"; "tdd-util" = dontDistribute super."tdd-util"; "tdoc" = dontDistribute super."tdoc"; "teams" = dontDistribute super."teams"; "teeth" = dontDistribute super."teeth"; "telegram" = dontDistribute super."telegram"; - "telegram-api" = doDistribute super."telegram-api_0_4_3_1"; + "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = dontDistribute super."tellbot"; "template-default" = dontDistribute super."template-default"; "template-haskell-util" = dontDistribute super."template-haskell-util"; "template-hsml" = dontDistribute super."template-hsml"; @@ -7643,7 +7360,6 @@ self: super: { "terntup" = dontDistribute super."terntup"; "terrahs" = dontDistribute super."terrahs"; "tersmu" = dontDistribute super."tersmu"; - "test-fixture" = dontDistribute super."test-fixture"; "test-framework-doctest" = dontDistribute super."test-framework-doctest"; "test-framework-golden" = dontDistribute super."test-framework-golden"; "test-framework-program" = dontDistribute super."test-framework-program"; @@ -7651,6 +7367,7 @@ self: super: { "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; "test-framework-skip" = dontDistribute super."test-framework-skip"; "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; "test-invariant" = dontDistribute super."test-invariant"; "test-pkg" = dontDistribute super."test-pkg"; "test-sandbox" = dontDistribute super."test-sandbox"; @@ -7667,11 +7384,8 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; - "texmath" = doDistribute super."texmath_0_8_6_4"; "texrunner" = dontDistribute super."texrunner"; - "text-all" = dontDistribute super."text-all"; "text-and-plots" = dontDistribute super."text-and-plots"; - "text-conversions" = dontDistribute super."text-conversions"; "text-format-simple" = dontDistribute super."text-format-simple"; "text-icu-normalized" = dontDistribute super."text-icu-normalized"; "text-icu-translit" = dontDistribute super."text-icu-translit"; @@ -7681,20 +7395,17 @@ self: super: { "text-loc" = dontDistribute super."text-loc"; "text-locale-encoding" = dontDistribute super."text-locale-encoding"; "text-markup" = dontDistribute super."text-markup"; - "text-metrics" = dontDistribute super."text-metrics"; "text-normal" = dontDistribute super."text-normal"; "text-position" = dontDistribute super."text-position"; "text-printer" = dontDistribute super."text-printer"; "text-regex-replace" = dontDistribute super."text-regex-replace"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; - "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; "text-xml-generic" = dontDistribute super."text-xml-generic"; "text-xml-qq" = dontDistribute super."text-xml-qq"; - "text-zipper" = doDistribute super."text-zipper_0_4"; + "text-zipper" = dontDistribute super."text-zipper"; "text-zipper-monad" = dontDistribute super."text-zipper-monad"; "text1" = dontDistribute super."text1"; "textPlot" = dontDistribute super."textPlot"; @@ -7710,25 +7421,20 @@ self: super: { "th-build" = dontDistribute super."th-build"; "th-cas" = dontDistribute super."th-cas"; "th-context" = dontDistribute super."th-context"; - "th-desugar" = doDistribute super."th-desugar_1_5_5"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; - "th-orphans" = doDistribute super."th-orphans_0_13_0"; - "th-printf" = dontDistribute super."th-printf"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; - "th-utilities" = dontDistribute super."th-utilities"; "themoviedb" = dontDistribute super."themoviedb"; "themplate" = dontDistribute super."themplate"; "thentos-cookie-session" = dontDistribute super."thentos-cookie-session"; "theoremquest" = dontDistribute super."theoremquest"; "theoremquest-client" = dontDistribute super."theoremquest-client"; - "these" = doDistribute super."these_0_6_2_1"; "thespian" = dontDistribute super."thespian"; "theta-functions" = dontDistribute super."theta-functions"; "thih" = dontDistribute super."thih"; @@ -7751,7 +7457,6 @@ self: super: { "tic-tac-toe" = dontDistribute super."tic-tac-toe"; "tickle" = dontDistribute super."tickle"; "tictactoe3d" = dontDistribute super."tictactoe3d"; - "tidal" = doDistribute super."tidal_0_7_1"; "tidal-midi" = dontDistribute super."tidal-midi"; "tidal-serial" = dontDistribute super."tidal-serial"; "tidal-vis" = dontDistribute super."tidal-vis"; @@ -7774,10 +7479,10 @@ self: super: { "time-qq" = dontDistribute super."time-qq"; "time-recurrence" = dontDistribute super."time-recurrence"; "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; "time-w3c" = dontDistribute super."time-w3c"; "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; - "timelens" = dontDistribute super."timelens"; "timeless" = dontDistribute super."timeless"; "timelike" = dontDistribute super."timelike"; "timelike-clock" = dontDistribute super."timelike-clock"; @@ -7794,7 +7499,6 @@ self: super: { "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; "timestamper" = dontDistribute super."timestamper"; "timezone-olson-th" = dontDistribute super."timezone-olson-th"; - "timezone-series" = doDistribute super."timezone-series_0_1_5_1"; "timing-convenience" = dontDistribute super."timing-convenience"; "tinyMesh" = dontDistribute super."tinyMesh"; "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; @@ -7824,6 +7528,7 @@ self: super: { "toolshed" = dontDistribute super."toolshed"; "topkata" = dontDistribute super."topkata"; "torch" = dontDistribute super."torch"; + "torrent" = dontDistribute super."torrent"; "total" = dontDistribute super."total"; "total-alternative" = dontDistribute super."total-alternative"; "total-map" = dontDistribute super."total-map"; @@ -7839,21 +7544,19 @@ self: super: { "tracer" = dontDistribute super."tracer"; "tracetree" = dontDistribute super."tracetree"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "traildb" = dontDistribute super."traildb"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-eff" = dontDistribute super."transformers-eff"; "transformers-free" = dontDistribute super."transformers-free"; "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; - "transient" = dontDistribute super."transient"; - "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7869,7 +7572,6 @@ self: super: { "tremulous-query" = dontDistribute super."tremulous-query"; "trhsx" = dontDistribute super."trhsx"; "triangulation" = dontDistribute super."triangulation"; - "trifecta" = doDistribute super."trifecta_1_5_2"; "trimpolya" = dontDistribute super."trimpolya"; "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; @@ -7888,7 +7590,6 @@ self: super: { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttask" = dontDistribute super."ttask"; - "tttool" = doDistribute super."tttool_1_6_1_1"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -7926,7 +7627,6 @@ self: super: { "twitch" = dontDistribute super."twitch"; "twitter" = dontDistribute super."twitter"; "twitter-enumerator" = dontDistribute super."twitter-enumerator"; - "twitter-feed" = doDistribute super."twitter-feed_0_2_0_7"; "tx" = dontDistribute super."tx"; "txt-sushi" = dontDistribute super."txt-sushi"; "txt2rtf" = dontDistribute super."txt2rtf"; @@ -7941,7 +7641,6 @@ self: super: { "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; - "type-fun" = dontDistribute super."type-fun"; "type-functions" = dontDistribute super."type-functions"; "type-hint" = dontDistribute super."type-hint"; "type-int" = dontDistribute super."type-int"; @@ -7953,14 +7652,12 @@ self: super: { "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; "type-level-sets" = dontDistribute super."type-level-sets"; "type-level-tf" = dontDistribute super."type-level-tf"; - "type-list" = doDistribute super."type-list_0_3_0_4"; "type-natural" = dontDistribute super."type-natural"; "type-operators" = dontDistribute super."type-operators"; "type-ord" = dontDistribute super."type-ord"; "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; "type-prelude" = dontDistribute super."type-prelude"; "type-settheory" = dontDistribute super."type-settheory"; - "type-spec" = dontDistribute super."type-spec"; "type-spine" = dontDistribute super."type-spine"; "type-structure" = dontDistribute super."type-structure"; "type-sub-th" = dontDistribute super."type-sub-th"; @@ -7975,10 +7672,11 @@ self: super: { "typelevel-tensor" = dontDistribute super."typelevel-tensor"; "typeof" = dontDistribute super."typeof"; "typeparams" = dontDistribute super."typeparams"; + "types-compat" = dontDistribute super."types-compat"; "typesafe-endian" = dontDistribute super."typesafe-endian"; "typescript-docs" = dontDistribute super."typescript-docs"; "typical" = dontDistribute super."typical"; - "tz" = doDistribute super."tz_0_1_1_1"; + "tz" = dontDistribute super."tz"; "uAgda" = dontDistribute super."uAgda"; "uacpid" = dontDistribute super."uacpid"; "uber" = dontDistribute super."uber"; @@ -8000,12 +7698,9 @@ self: super: { "unagi-streams" = dontDistribute super."unagi-streams"; "unamb" = dontDistribute super."unamb"; "unamb-custom" = dontDistribute super."unamb-custom"; - "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; - "unfoldable" = dontDistribute super."unfoldable"; - "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8019,13 +7714,10 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; - "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; - "unicode-transforms" = dontDistribute super."unicode-transforms"; "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"; @@ -8033,22 +7725,16 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; - "unit-constraint" = dontDistribute super."unit-constraint"; - "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; - "units-defs" = dontDistribute super."units-defs"; - "units-parser" = dontDistribute super."units-parser"; "unittyped" = dontDistribute super."unittyped"; "universal-binary" = dontDistribute super."universal-binary"; "universe-th" = dontDistribute super."universe-th"; - "unix-compat" = doDistribute super."unix-compat_0_4_1_4"; "unix-fcntl" = dontDistribute super."unix-fcntl"; "unix-handle" = dontDistribute super."unix-handle"; "unix-io-extra" = dontDistribute super."unix-io-extra"; "unix-memory" = dontDistribute super."unix-memory"; "unix-process-conduit" = dontDistribute super."unix-process-conduit"; "unix-pty-light" = dontDistribute super."unix-pty-light"; - "unix-time" = doDistribute super."unix-time_0_3_6"; "unlambda" = dontDistribute super."unlambda"; "unlit" = dontDistribute super."unlit"; "unm-hip" = dontDistribute super."unm-hip"; @@ -8072,12 +7758,11 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; - "uri-bytestring" = doDistribute super."uri-bytestring_0_2_1_2"; "uri-conduit" = dontDistribute super."uri-conduit"; - "uri-encode" = doDistribute super."uri-encode_1_5_0_4"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; "uri-template" = dontDistribute super."uri-template"; + "uri-templater" = dontDistribute super."uri-templater"; "url-generic" = dontDistribute super."url-generic"; "urlcheck" = dontDistribute super."urlcheck"; "urldecode" = dontDistribute super."urldecode"; @@ -8091,11 +7776,10 @@ self: super: { "usb-id-database" = dontDistribute super."usb-id-database"; "usb-iteratee" = dontDistribute super."usb-iteratee"; "usb-safe" = dontDistribute super."usb-safe"; - "userid" = doDistribute super."userid_0_1_2_6"; + "users-persistent" = dontDistribute super."users-persistent"; "utc" = dontDistribute super."utc"; "utf8-env" = dontDistribute super."utf8-env"; "utf8-prelude" = dontDistribute super."utf8-prelude"; - "utility-ht" = doDistribute super."utility-ht_0_0_11"; "uu-cco" = dontDistribute super."uu-cco"; "uu-cco-examples" = dontDistribute super."uu-cco-examples"; "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; @@ -8109,7 +7793,6 @@ self: super: { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; - "uuid-orphans" = doDistribute super."uuid-orphans_1_3_11_1"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -8135,7 +7818,6 @@ self: super: { "varan" = dontDistribute super."varan"; "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; - "varying" = dontDistribute super."varying"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8144,6 +7826,8 @@ self: super: { "vcd" = dontDistribute super."vcd"; "vcs-revision" = dontDistribute super."vcs-revision"; "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vect" = dontDistribute super."vect"; "vect-floating" = dontDistribute super."vect-floating"; "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; @@ -8152,7 +7836,6 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; - "vector-fftw" = doDistribute super."vector-fftw_0_1_3_6"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -8160,19 +7843,16 @@ self: super: { "vector-random" = dontDistribute super."vector-random"; "vector-read-instances" = dontDistribute super."vector-read-instances"; "vector-sized" = dontDistribute super."vector-sized"; - "vector-space" = doDistribute super."vector-space_0_10_3"; "vector-space-map" = dontDistribute super."vector-space-map"; "vector-space-opengl" = dontDistribute super."vector-space-opengl"; "vector-space-points" = dontDistribute super."vector-space-points"; "vector-static" = dontDistribute super."vector-static"; "vector-strategies" = dontDistribute super."vector-strategies"; - "vectortiles" = dontDistribute super."vectortiles"; "verbalexpressions" = dontDistribute super."verbalexpressions"; "verbosity" = dontDistribute super."verbosity"; "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; - "versions" = doDistribute super."versions_2_0_0"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8189,6 +7869,7 @@ self: super: { "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; "vk-aws-route53" = dontDistribute super."vk-aws-route53"; "vk-posix-pty" = dontDistribute super."vk-posix-pty"; "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; @@ -8198,7 +7879,6 @@ self: super: { "vrpn" = dontDistribute super."vrpn"; "vte" = dontDistribute super."vte"; "vtegtk3" = dontDistribute super."vtegtk3"; - "vty" = doDistribute super."vty_5_5_0"; "vty-examples" = dontDistribute super."vty-examples"; "vty-menu" = dontDistribute super."vty-menu"; "vty-ui" = dontDistribute super."vty-ui"; @@ -8208,15 +7888,14 @@ self: super: { "waddle" = dontDistribute super."waddle"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; - "wai-app-static" = doDistribute super."wai-app-static_3_1_5"; "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; "wai-dispatch" = dontDistribute super."wai-dispatch"; - "wai-extra" = doDistribute super."wai-extra_3_0_16_1"; "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; "wai-graceful" = dontDistribute super."wai-graceful"; "wai-handler-devel" = dontDistribute super."wai-handler-devel"; "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-launch" = dontDistribute super."wai-handler-launch"; "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; "wai-handler-snap" = dontDistribute super."wai-handler-snap"; "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; @@ -8225,14 +7904,11 @@ self: super: { "wai-http2-extra" = dontDistribute super."wai-http2-extra"; "wai-lens" = dontDistribute super."wai-lens"; "wai-lite" = dontDistribute super."wai-lite"; - "wai-logger" = doDistribute super."wai-logger_2_2_7"; "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-make-assets" = dontDistribute super."wai-make-assets"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; - "wai-middleware-content-type" = doDistribute super."wai-middleware-content-type_0_4_0"; - "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_4_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -8241,13 +7917,11 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; - "wai-middleware-verbs" = doDistribute super."wai-middleware-verbs_0_2_0"; - "wai-predicates" = doDistribute super."wai-predicates_0_8_6"; - "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; - "wai-route" = doDistribute super."wai-route_0_3_1"; + "wai-route" = dontDistribute super."wai-route"; "wai-router" = dontDistribute super."wai-router"; - "wai-routing" = doDistribute super."wai-routing_0_12_3"; + "wai-routes" = dontDistribute super."wai-routes"; + "wai-routing" = dontDistribute super."wai-routing"; "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-mysql" = dontDistribute super."wai-session-mysql"; @@ -8257,11 +7931,10 @@ self: super: { "wai-test" = dontDistribute super."wai-test"; "wai-thrift" = dontDistribute super."wai-thrift"; "wai-throttler" = dontDistribute super."wai-throttler"; - "wai-websockets" = doDistribute super."wai-websockets_3_0_0_9"; + "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; - "warp" = doDistribute super."warp_3_2_7"; "warp-dynamic" = dontDistribute super."warp-dynamic"; "warp-static" = dontDistribute super."warp-static"; "warp-tls-uid" = dontDistribute super."warp-tls-uid"; @@ -8269,6 +7942,7 @@ self: super: { "watcher" = dontDistribute super."watcher"; "watchit" = dontDistribute super."watchit"; "wavconvert" = dontDistribute super."wavconvert"; + "wavefront" = dontDistribute super."wavefront"; "wavesurfer" = dontDistribute super."wavesurfer"; "wavy" = dontDistribute super."wavy"; "wcwidth" = dontDistribute super."wcwidth"; @@ -8276,42 +7950,36 @@ self: super: { "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; "web-css" = dontDistribute super."web-css"; "web-encodings" = dontDistribute super."web-encodings"; + "web-fpco" = dontDistribute super."web-fpco"; "web-inv-route" = dontDistribute super."web-inv-route"; "web-mongrel2" = dontDistribute super."web-mongrel2"; "web-page" = dontDistribute super."web-page"; - "web-routes" = doDistribute super."web-routes_0_27_10"; "web-routes-mtl" = dontDistribute super."web-routes-mtl"; "web-routes-quasi" = dontDistribute super."web-routes-quasi"; "web-routes-regular" = dontDistribute super."web-routes-regular"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routing" = dontDistribute super."web-routing"; "webapi" = dontDistribute super."webapi"; "webapp" = dontDistribute super."webapp"; "webcloud" = dontDistribute super."webcloud"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; - "webdriver-angular" = doDistribute super."webdriver-angular_0_1_10"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; - "webkitgtk3" = doDistribute super."webkitgtk3_0_14_1_1"; - "webkitgtk3-javascriptcore" = doDistribute super."webkitgtk3-javascriptcore_0_13_1_2"; - "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; - "websockets" = doDistribute super."websockets_0_9_6_2"; - "websockets-snap" = doDistribute super."websockets-snap_0_9_2_0"; + "websockets-snap" = dontDistribute super."websockets-snap"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; "wedged" = dontDistribute super."wedged"; "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; - "werewolf" = doDistribute super."werewolf_1_0_2_2"; - "werewolf-slack" = doDistribute super."werewolf-slack_1_0_1_4"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8322,7 +7990,6 @@ self: super: { "whois" = dontDistribute super."whois"; "why3" = dontDistribute super."why3"; "wigner-symbols" = dontDistribute super."wigner-symbols"; - "wikicfp-scraper" = dontDistribute super."wikicfp-scraper"; "wikipedia4epub" = dontDistribute super."wikipedia4epub"; "win-hp-path" = dontDistribute super."win-hp-path"; "windowslive" = dontDistribute super."windowslive"; @@ -8358,8 +8025,6 @@ self: super: { "wreq-sb" = dontDistribute super."wreq-sb"; "wright" = dontDistribute super."wright"; "writer-cps-monads-tf" = dontDistribute super."writer-cps-monads-tf"; - "writer-cps-mtl" = dontDistribute super."writer-cps-mtl"; - "writer-cps-transformers" = dontDistribute super."writer-cps-transformers"; "wsdl" = dontDistribute super."wsdl"; "wsedit" = dontDistribute super."wsedit"; "wtk" = dontDistribute super."wtk"; @@ -8369,7 +8034,6 @@ self: super: { "wumpus-drawing" = dontDistribute super."wumpus-drawing"; "wumpus-microprint" = dontDistribute super."wumpus-microprint"; "wumpus-tree" = dontDistribute super."wumpus-tree"; - "wuss" = doDistribute super."wuss_1_0_4"; "wx" = dontDistribute super."wx"; "wxAsteroids" = dontDistribute super."wxAsteroids"; "wxFruit" = dontDistribute super."wxFruit"; @@ -8391,10 +8055,10 @@ self: super: { "xcffib" = dontDistribute super."xcffib"; "xchat-plugin" = dontDistribute super."xchat-plugin"; "xcp" = dontDistribute super."xcp"; - "xdcc" = doDistribute super."xdcc_1_0_4"; "xdg-userdirs" = dontDistribute super."xdg-userdirs"; "xdot" = dontDistribute super."xdot"; "xfconf" = dontDistribute super."xfconf"; + "xformat" = dontDistribute super."xformat"; "xhaskell-library" = dontDistribute super."xhaskell-library"; "xhb" = dontDistribute super."xhb"; "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; @@ -8407,7 +8071,6 @@ self: super: { "xinput-conduit" = dontDistribute super."xinput-conduit"; "xkbcommon" = dontDistribute super."xkbcommon"; "xkcd" = dontDistribute super."xkcd"; - "xlsx" = doDistribute super."xlsx_0_2_3"; "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; @@ -8426,10 +8089,10 @@ self: super: { "xml-query" = dontDistribute super."xml-query"; "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; + "xml-to-json" = dontDistribute super."xml-to-json"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; - "xmlhtml" = doDistribute super."xmlhtml_0_2_3_4"; "xmltv" = dontDistribute super."xmltv"; "xmms2-client" = dontDistribute super."xmms2-client"; "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; @@ -8465,15 +8128,14 @@ self: super: { "y0l0bot" = dontDistribute super."y0l0bot"; "yabi" = dontDistribute super."yabi"; "yabi-muno" = dontDistribute super."yabi-muno"; - "yahoo-finance-api" = dontDistribute super."yahoo-finance-api"; "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; "yahoo-web-search" = dontDistribute super."yahoo-web-search"; "yajl" = dontDistribute super."yajl"; "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; - "yaml" = doDistribute super."yaml_0_8_18_1"; "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; @@ -8488,7 +8150,6 @@ self: super: { "yandex-translate" = dontDistribute super."yandex-translate"; "yaop" = dontDistribute super."yaop"; "yap" = dontDistribute super."yap"; - "yarr" = dontDistribute super."yarr"; "yarr-image-io" = dontDistribute super."yarr-image-io"; "yate" = dontDistribute super."yate"; "yavie" = dontDistribute super."yavie"; @@ -8498,29 +8159,27 @@ self: super: { "yeshql" = dontDistribute super."yeshql"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; - "yesod-auth" = doDistribute super."yesod-auth_1_4_13_3"; - "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_2"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; - "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_5_1_1"; + "yesod-auth-deskcom" = dontDistribute super."yesod-auth-deskcom"; + "yesod-auth-fb" = dontDistribute super."yesod-auth-fb"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; - "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_10"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; - "yesod-bin" = doDistribute super."yesod-bin_1_4_18_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; - "yesod-core" = doDistribute super."yesod-core_1_4_22"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-default" = dontDistribute super."yesod-default"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; @@ -8535,7 +8194,6 @@ self: super: { "yesod-paginate" = dontDistribute super."yesod-paginate"; "yesod-pagination" = dontDistribute super."yesod-pagination"; "yesod-paginator" = dontDistribute super."yesod-paginator"; - "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_5"; "yesod-platform" = dontDistribute super."yesod-platform"; "yesod-pnotify" = dontDistribute super."yesod-pnotify"; "yesod-pure" = dontDistribute super."yesod-pure"; @@ -8552,10 +8210,9 @@ self: super: { "yesod-s3" = dontDistribute super."yesod-s3"; "yesod-sass" = dontDistribute super."yesod-sass"; "yesod-session-redis" = dontDistribute super."yesod-session-redis"; - "yesod-static" = doDistribute super."yesod-static_1_5_0_3"; "yesod-tableview" = dontDistribute super."yesod-tableview"; - "yesod-test" = doDistribute super."yesod-test_1_5_1_1"; "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-text-markdown" = dontDistribute super."yesod-text-markdown"; "yesod-tls" = dontDistribute super."yesod-tls"; "yesod-transloadit" = dontDistribute super."yesod-transloadit"; "yesod-vend" = dontDistribute super."yesod-vend"; @@ -8567,7 +8224,6 @@ self: super: { "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; "yi-gtk" = dontDistribute super."yi-gtk"; "yi-monokai" = dontDistribute super."yi-monokai"; - "yi-rope" = doDistribute super."yi-rope_0_7_0_1"; "yi-snippet" = dontDistribute super."yi-snippet"; "yi-solarized" = dontDistribute super."yi-solarized"; "yi-spolsky" = dontDistribute super."yi-spolsky"; @@ -8604,13 +8260,14 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; - "zip-archive" = doDistribute super."zip-archive_0_2_3_7"; + "zim-parser" = dontDistribute super."zim-parser"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; "zipper" = dontDistribute super."zipper"; "zippo" = dontDistribute super."zippo"; "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zlib-enum" = dontDistribute super."zlib-enum"; "zmcat" = dontDistribute super."zmcat"; "zmidi-core" = dontDistribute super."zmidi-core"; "zmidi-score" = dontDistribute super."zmidi-score"; @@ -8620,7 +8277,6 @@ self: super: { "zoom-cache" = dontDistribute super."zoom-cache"; "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; - "zoom-refs" = dontDistribute super."zoom-refs"; "zsh-battery" = dontDistribute super."zsh-battery"; "ztail" = dontDistribute super."ztail"; "zxcvbn-c" = dontDistribute super."zxcvbn-c"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 40fb0abd214..8eafbc90a1a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -691,54 +691,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Agda_2_5_1" = callPackage - ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, EdisonAPI - , EdisonCore, edit-distance, emacs, equivalence, filemanip - , filepath, geniplate-mirror, happy, hashable, hashtables - , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty - , process, QuickCheck, strict, template-haskell, text, time - , transformers, transformers-compat, unordered-containers, xhtml - , zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.5.1"; - sha256 = "ee4658eafb514460d598322fa98528d1af6e25e5aa51843bb473c0d8a325c0c8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary boxes bytestring containers data-hash deepseq - directory EdisonAPI EdisonCore edit-distance equivalence filepath - geniplate-mirror hashable hashtables haskeline haskell-src-exts - monadplus mtl parallel pretty process QuickCheck strict - template-haskell text time transformers transformers-compat - unordered-containers xhtml zlib - ]; - libraryToolDepends = [ alex cpphs happy ]; - executableHaskellDepends = [ - base binary containers directory filemanip filepath - haskell-src-exts mtl process - ]; - executableToolDepends = [ emacs ]; - jailbreak = true; - postInstall = '' - files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $out/bin/agda $f - done - for f in "''${files[@]}" ; do - $out/bin/agda -c --no-main $f - done - $out/bin/agda-mode compile - ''; - homepage = "http://wiki.portal.chalmers.se/agda/"; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; - }) {inherit (pkgs) emacs;}; - "Agda" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring , containers, cpphs, data-hash, deepseq, directory, EdisonAPI @@ -2378,34 +2330,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_1_22_8_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, extensible-exceptions, filepath, HUnit - , old-time, pretty, process, QuickCheck, regex-posix - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , time, unix - }: - mkDerivation { - pname = "Cabal"; - version = "1.22.8.0"; - sha256 = "2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e"; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - pretty process time unix - ]; - testHaskellDepends = [ - base bytestring containers directory extensible-exceptions filepath - HUnit old-time process QuickCheck regex-posix test-framework - test-framework-hunit test-framework-quickcheck2 unix - ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Cabal_1_24_0_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, old-time, pretty @@ -2452,9 +2376,7 @@ self: { filepath HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; - doHaddock = false; jailbreak = true; - doCheck = false; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; @@ -2584,25 +2506,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart_1_6" = callPackage - ({ mkDerivation, array, base, colour, data-default-class, lens, mtl - , old-locale, operational, time, vector - }: - mkDerivation { - pname = "Chart"; - version = "1.6"; - sha256 = "0f73779ab322346cac7c131f58dbda9bcaf1f43693a9e102510be80a07569ea5"; - libraryHaskellDepends = [ - array base colour data-default-class lens mtl old-locale - operational time vector - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "A library for generating 2D Charts and Plots"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector @@ -2620,25 +2523,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart-cairo_1_6" = callPackage - ({ mkDerivation, array, base, cairo, Chart, colour - , data-default-class, lens, mtl, old-locale, operational, time - }: - mkDerivation { - pname = "Chart-cairo"; - version = "1.6"; - sha256 = "e209b6b4d7d7f392593cbd3e8a8cde1d5af83066fee994195e4b25bda680ca0f"; - libraryHaskellDepends = [ - array base cairo Chart colour data-default-class lens mtl - old-locale operational time - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Cairo backend for Charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time @@ -2656,29 +2540,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart-diagrams_1_6" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour - , containers, data-default-class, diagrams-core, diagrams-lib - , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl - , old-locale, operational, SVGFonts, text, time - }: - mkDerivation { - pname = "Chart-diagrams"; - version = "1.6"; - sha256 = "c4c5a60bc623bb3221da113c84c0400b4dd75c481e64f5a9b6788b923ff998eb"; - libraryHaskellDepends = [ - base blaze-markup bytestring Chart colour containers - data-default-class diagrams-core diagrams-lib diagrams-postscript - diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts - text time - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Diagrams backend for Charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib @@ -2735,25 +2596,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ChasingBottoms_1_3_1" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; - version = "1.3.1"; - sha256 = "116cf6aad779499fb02fd1f44e0d42236b69401723bb29ed6138ff6b59eee888"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ChasingBottoms" = callPackage ({ mkDerivation, array, base, containers, mtl, QuickCheck, random , syb @@ -3475,39 +3317,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV_1_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , data-default, exceptions, http-client, http-client-tls - , http-types, lens, mtl, mtl-compat, network, network-uri - , optparse-applicative, transformers, transformers-base - , transformers-compat, utf8-string, xml-conduit, xml-hamlet - }: - mkDerivation { - pname = "DAV"; - version = "1.2"; - sha256 = "1a07c8ef17cd4207c6f889e7eb5c45d9f025374f2cdacc1e34e6d71fe103b746"; - revision = "1"; - editedCabalFile = "6c084095b369b6a2cb797a19a9accf5488f729f19bb6c0240e0f6faf1ac266bb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl mtl-compat - transformers transformers-base transformers-compat utf8-string - xml-conduit xml-hamlet - ]; - executableHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl mtl-compat network - network-uri optparse-applicative transformers transformers-base - transformers-compat utf8-string xml-conduit xml-hamlet - ]; - homepage = "http://floss.scru.org/hDAV"; - description = "RFC 4918 WebDAV support"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "DAV" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, haskeline, http-client, http-client-tls @@ -4032,20 +3841,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Diff_0_3_2" = callPackage - ({ mkDerivation, array, base, pretty }: - mkDerivation { - pname = "Diff"; - version = "0.3.2"; - sha256 = "7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e"; - revision = "1"; - editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328"; - libraryHaskellDepends = [ array base pretty ]; - description = "O(ND) diff algorithm in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Diff" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 @@ -4595,19 +4390,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "EdisonAPI_1_3" = callPackage - ({ mkDerivation, base, mtl }: - mkDerivation { - pname = "EdisonAPI"; - version = "1.3"; - sha256 = "a369d5c9b412bafb16a023121a72470a6fed0116b3d6d143a03dd54cb854154f"; - libraryHaskellDepends = [ base mtl ]; - homepage = "http://rwd.rdockins.name/edison/home/"; - description = "A library of efficent, purely-functional data structures (API)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "EdisonAPI" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -5631,23 +5413,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Frames_0_1_4" = callPackage - ({ mkDerivation, base, ghc-prim, pipes, primitive, readable - , template-haskell, text, transformers, vector, vinyl - }: - mkDerivation { - pname = "Frames"; - version = "0.1.4"; - sha256 = "3330b53867f07959c58b2cfc237390422ea08ca474b329547f092b6cb2bf39a0"; - libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text - transformers vector vinyl - ]; - description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Frames" = callPackage ({ mkDerivation, base, ghc-prim, pipes, primitive, readable , template-haskell, text, transformers, vector, vinyl @@ -6361,30 +6126,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "Glob_0_7_10" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.7.10"; - sha256 = "db8f67725566df72379cdbbdb2f7aaf6500163b94924229b4b0aa9bbaa9804a7"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Glob" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -6796,31 +6537,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "H_0_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, directory, file-embed - , inline-r, pretty, process, singletons, tasty, tasty-golden - , tasty-hunit, temporary, text, vector - }: - mkDerivation { - pname = "H"; - version = "0.8.0.0"; - sha256 = "b679dc140f783afa598da1bc2d111d603ad94b5f04d7db912452194635d47484"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring cmdargs file-embed inline-r pretty process - temporary vector - ]; - testHaskellDepends = [ - base bytestring directory inline-r process singletons tasty - tasty-golden tasty-hunit text vector - ]; - doCheck = false; - description = "The Haskell/R mixed programming environment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "H" = callPackage ({ mkDerivation, base, bytestring, cmdargs, file-embed, inline-r , pretty, process, temporary, vector @@ -7094,19 +6810,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "HDBC-session_0_1_0_1" = callPackage - ({ mkDerivation, base, HDBC }: - mkDerivation { - pname = "HDBC-session"; - version = "0.1.0.1"; - sha256 = "bf9342008c1d86733f05c60f90b18974e8c6748b9bd254bb47555245b6f77008"; - libraryHaskellDepends = [ base HDBC ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Bracketed connection for HDBC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "HDBC-session" = callPackage ({ mkDerivation, base, HDBC }: mkDerivation { @@ -8407,20 +8110,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HUnit_1_3_1_1" = callPackage - ({ mkDerivation, base, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.3.1.1"; - sha256 = "93e5fc4290ab685b469209f04d9858338ffff486e15c23a11260c47e32da8ef8"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base deepseq filepath ]; - homepage = "https://github.com/hspec/HUnit#readme"; - description = "A unit testing framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "HUnit" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { @@ -8571,51 +8260,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HaRe_0_8_2_3" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-helper, containers - , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod - , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit - , monad-control, monoid-extras, mtl, old-time, parsec, pretty - , process, QuickCheck, rosezipper, semigroups, silently - , Strafunski-StrategyLib, stringbuilder, syb, syz, time - , transformers, transformers-base - }: - mkDerivation { - pname = "HaRe"; - version = "0.8.2.3"; - sha256 = "8ccd728cd666929cc59ac1ad9fc16a5a462454a6c04c7c5019767f0b490a0e04"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base - ]; - executableHaskellDepends = [ - array base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time parsec pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base - ]; - testHaskellDepends = [ - base Cabal cabal-helper containers deepseq Diff directory filepath - ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils - hslogger hspec HUnit monad-control monoid-extras mtl old-time - process QuickCheck rosezipper semigroups silently - Strafunski-StrategyLib stringbuilder syb syz time transformers - transformers-base - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/RefactoringTools/HaRe/wiki"; - description = "the Haskell Refactorer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "HaRe" = callPackage ({ mkDerivation, array, base, Cabal, cabal-helper, containers , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod @@ -9202,7 +8846,6 @@ self: { 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; @@ -10302,24 +9945,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels_3_2_7_2" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.2.7.2"; - sha256 = "500b0ed64e1385a5f5e5fa4b51f3575d38e77ebac19a374942a308a04fa7c902"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "JuicyPixels" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib @@ -10378,28 +10003,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels-scale-dct_0_1_1_0" = callPackage - ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels - , JuicyPixels-util, time - }: - mkDerivation { - pname = "JuicyPixels-scale-dct"; - version = "0.1.1.0"; - sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9"; - revision = "2"; - editedCabalFile = "d80ead4c776cec3babb37a69c099560b421e5eb929b9ebe8e433a8fa4ef243ea"; - libraryHaskellDepends = [ - base base-compat carray fft JuicyPixels - ]; - testHaskellDepends = [ - base base-compat carray fft JuicyPixels JuicyPixels-util time - ]; - homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; - description = "Scale JuicyPixels images with DCT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "JuicyPixels-scale-dct" = callPackage ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time }: @@ -10713,6 +10316,7 @@ self: { base constraint-classes hmatrix semigroups vector ]; librarySystemDepends = [ openblasCompat ]; + jailbreak = true; homepage = "http://github.com/guaraqe/lats#readme"; description = "Linear Algebra on Typed Spaces"; license = stdenv.lib.licenses.bsd3; @@ -11159,28 +10763,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ListLike_4_2_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist, fmlist - , HUnit, QuickCheck, random, text, vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.2.1"; - sha256 = "d6542ae5bef685e3571cd46b018c5adac2b6c854f72777ddd35a6823bcf08859"; - libraryHaskellDepends = [ - array base bytestring containers dlist fmlist text vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text vector - ]; - doCheck = false; - homepage = "http://software.complete.org/listlike"; - description = "Generic support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ListLike" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string @@ -11812,34 +11394,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MissingH_1_3_0_2" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; - version = "1.3.0.2"; - sha256 = "64b870214f406d83e48fa13f58f9e4ebf8b69ae898c99788d2d0f3ebfed55ab2"; - revision = "2"; - editedCabalFile = "e3f9dfdd2ff45ad9877fffe9bc6d9cd1d2e150cc6aa8dfcf4b3c37ea16bacbe3"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - doCheck = false; - homepage = "http://software.complete.org/missingh"; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "MissingH" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network @@ -12550,28 +12104,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) net_snmp;}; - "Network-NineP_0_4_0" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, convertible - , exceptions, monad-loops, monad-peel, mstate, mtl, network, NineP - , regex-posix, stateref, transformers - }: - mkDerivation { - pname = "Network-NineP"; - version = "0.4.0"; - sha256 = "2d7e78e03feeb484d5812a3a8cef5f248d26e9daad8b7fe535516f6ec20dd7c0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers convertible exceptions - monad-loops monad-peel mstate mtl network NineP regex-posix - stateref transformers - ]; - jailbreak = true; - description = "High-level abstraction over 9P protocol"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Network-NineP" = callPackage ({ mkDerivation, base, binary, bytestring, containers, convertible , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl @@ -13208,24 +12740,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "OpenGLRaw_3_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.2.1.0"; - sha256 = "a1554684460bd34b2e031cfc5f5e5388e6266f67482bd77829575b5b8b339afe"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesa;}; - "OpenGLRaw" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, mesa , text, transformers @@ -13955,20 +13469,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "PortMidi_0_1_6_0" = callPackage - ({ mkDerivation, alsaLib, base }: - mkDerivation { - pname = "PortMidi"; - version = "0.1.6.0"; - sha256 = "54599bc0377847ab17b175641023ec495587ca82807fd2360e17f4c5575814b1"; - libraryHaskellDepends = [ base ]; - librarySystemDepends = [ alsaLib ]; - homepage = "http://haskell.org/haskellwiki/PortMidi"; - description = "A binding for PortMedia/PortMidi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) alsaLib;}; - "PortMidi" = callPackage ({ mkDerivation, alsaLib, base }: mkDerivation { @@ -15063,7 +14563,6 @@ self: { utf8-string vector zlib ]; testHaskellDepends = [ base directory doctest hspec lens vector ]; - doCheck = false; homepage = "http://code.haskell.org/~aavogt/Rlang-QQ"; description = "quasiquoter for inline-R code"; license = stdenv.lib.licenses.bsd3; @@ -16240,39 +15739,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock_0_10_0_1" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, crypto-random, directory, focus - , hashable, hspec, hspec-wai, http-types, hvect, list-t - , monad-control, mtl, old-locale, path-pieces, random, reroute - , resource-pool, resourcet, stm, stm-containers, text, time - , transformers, transformers-base, unordered-containers, vault, wai - , wai-extra, warp - }: - mkDerivation { - pname = "Spock"; - version = "0.10.0.1"; - sha256 = "ef80deb37728e89369f34c3a8cc9c4190d8aa50911a08a9e1e0c1993466595d2"; - revision = "1"; - editedCabalFile = "4c9fc2e3aae3df4e64c014a0fcba192dda7e1bd244c87145e0723bf0c6b2abf4"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - crypto-random directory focus hashable http-types hvect list-t - monad-control mtl old-locale path-pieces random reroute - resource-pool resourcet stm stm-containers text time transformers - transformers-base unordered-containers vault wai wai-extra warp - ]; - testHaskellDepends = [ - base base64-bytestring bytestring hspec hspec-wai http-types - reroute stm text time unordered-containers wai wai-extra - ]; - jailbreak = true; - homepage = "http://www.spock.li"; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -16383,27 +15849,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock-digestive_0_2_0_0" = callPackage - ({ mkDerivation, base, digestive-functors, http-types, mtl, Spock - , text, unordered-containers, wai - }: - mkDerivation { - pname = "Spock-digestive"; - version = "0.2.0.0"; - sha256 = "e5571d88d7b9dcafc7f5c364c8499a1d8d698d1698f2615b5f26698c85080260"; - revision = "1"; - editedCabalFile = "040e9c024b49a598fe3fa0a5aa2593e601c1d47b16986d7a52de079c7dac0c35"; - libraryHaskellDepends = [ - base digestive-functors http-types mtl Spock text - unordered-containers wai - ]; - jailbreak = true; - homepage = "https://github.com/agrafix/Spock-digestive"; - description = "Digestive functors support for Spock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock-digestive" = callPackage ({ mkDerivation, base, digestive-functors, http-types, mtl , Spock-core, text, unordered-containers, wai @@ -16435,28 +15880,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock-worker_0_3_0_0" = callPackage - ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl - , Spock, stm, text, time, transformers, vector - }: - mkDerivation { - pname = "Spock-worker"; - version = "0.3.0.0"; - sha256 = "f5ec5c09125a6dd6c6cd0534a1eb7bc0d6bfe9908f7328d999bf14bd785835f3"; - revision = "1"; - editedCabalFile = "4e69af8f88f8afd53d7c02d5fb5171de1f584e039d638b15b223e3e6f1a434c5"; - libraryHaskellDepends = [ - base containers errors lifted-base mtl Spock stm text time - transformers vector - ]; - testHaskellDepends = [ base containers HTF stm vector ]; - jailbreak = true; - homepage = "http://github.com/agrafix/Spock-worker"; - description = "Background workers for Spock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock-worker" = callPackage ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl , Spock, stm, text, time, transformers, vector @@ -18133,25 +17556,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_3_1_0" = callPackage - ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 - , shfolder, user32, winmm - }: - mkDerivation { - pname = "Win32"; - version = "2.3.1.0"; - sha256 = "685a695e9ec86efb06d3a2effb3e18f916c8696e71ca4811cb53befa04323ff9"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ - advapi32 gdi32 shell32 shfolder user32 winmm - ]; - homepage = "https://github.com/haskell/win32"; - description = "A binding to part of the Win32 library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; - }) {advapi32 = null; gdi32 = null; shell32 = null; - shfolder = null; user32 = null; winmm = null;}; - "Win32" = callPackage ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 , shfolder, user32, winmm @@ -19549,26 +18953,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "acid-state_0_14_1" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, extensible-exceptions, filepath, mtl, network - , safecopy, stm, template-haskell, unix - }: - mkDerivation { - pname = "acid-state"; - version = "0.14.1"; - sha256 = "5ae9dde518e2aedbb1650445023ff45049541a18e8ca5e7f1a5269507c034fc2"; - libraryHaskellDepends = [ - array base bytestring cereal containers directory - extensible-exceptions filepath mtl network safecopy stm - template-haskell unix - ]; - homepage = "http://acid-state.seize.it/"; - description = "Add ACID guarantees to any serializable Haskell data structure"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "acid-state" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, extensible-exceptions, filepath, mtl, network @@ -20258,7 +19642,6 @@ self: { transformers ]; testHaskellDepends = [ base directory doctest filepath ]; - doCheck = false; homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -20509,37 +19892,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson_0_11_2_0" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl - , QuickCheck, quickcheck-instances, scientific, syb, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.11.2.0"; - sha256 = "447a454b51b8d6ca9e3b59bc5918115a880a9320afeb9030000fe6c87fd2285e"; - revision = "3"; - editedCabalFile = "eba3349e8834893267f4cd28c153613c8c6ea0acb9775db221ad9532d6f96ce1"; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist fail ghc-prim - hashable mtl scientific syb tagged template-haskell text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base base-orphans bytestring containers ghc-prim - hashable HUnit QuickCheck quickcheck-instances tagged - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aeson" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, bytestring , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl @@ -20679,64 +20031,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson-compat_0_3_5_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans - , bytestring, containers, exceptions, hashable, nats, QuickCheck - , quickcheck-instances, scientific, semigroups, tagged, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson-compat"; - version = "0.3.5.1"; - sha256 = "6ab707c4e4f15d2f55e968a91809ab52c06d0099a58c1255c0f0c382caf3c843"; - revision = "1"; - editedCabalFile = "3cf09a8689292ddb50651736b5e0b197e4d473632965855f265fbe3e91b8be63"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring containers exceptions - hashable nats scientific semigroups tagged text time - time-locale-compat unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat base-orphans bytestring - containers exceptions hashable nats QuickCheck quickcheck-instances - scientific semigroups tagged tasty tasty-hunit tasty-quickcheck - text time time-locale-compat unordered-containers vector - ]; - homepage = "https://github.com/phadej/aeson-compat#readme"; - description = "Compatibility layer for aeson"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aeson-compat" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans - , bytestring, containers, exceptions, hashable, nats, QuickCheck - , quickcheck-instances, scientific, semigroups, tagged, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson-compat"; - version = "0.3.5.2"; - sha256 = "e9bd5a327e086eafe673b2e2f4f04f51f54e23c6c4c261bf30b46d7be8071e90"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring containers exceptions - hashable nats scientific semigroups tagged text time - time-locale-compat unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat base-orphans bytestring - containers exceptions hashable nats QuickCheck quickcheck-instances - scientific semigroups tagged tasty tasty-hunit tasty-quickcheck - text time time-locale-compat unordered-containers vector - ]; - homepage = "https://github.com/phadej/aeson-compat#readme"; - description = "Compatibility layer for aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-compat_0_3_6" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans , bytestring, containers, exceptions, hashable, nats, QuickCheck , quickcheck-instances, scientific, semigroups, tagged, tasty @@ -20761,7 +20056,6 @@ self: { homepage = "https://github.com/phadej/aeson-compat#readme"; description = "Compatibility layer for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-diff" = callPackage @@ -20915,7 +20209,6 @@ self: { aeson base bytestring lens text unordered-containers vector ]; testHaskellDepends = [ base doctest ]; - doCheck = false; description = "Lens of Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21454,40 +20747,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "airship_0_5_0" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, bytestring-trie, case-insensitive, cryptohash - , directory, either, filepath, http-date, http-media, http-types - , lifted-base, microlens, mime-types, mmorph, monad-control, mtl - , network, old-locale, random, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-base, unix - , unordered-containers, wai, wai-extra - }: - mkDerivation { - pname = "airship"; - version = "0.5.0"; - sha256 = "f42e81e118a419125ed559f6041a7c17fd07020d2bb5052d1649301049689951"; - revision = "1"; - editedCabalFile = "ab014ad2f1fe2d23bb67c980755c67622843dd6b1a591470de4f7773668fffd2"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - bytestring-trie case-insensitive cryptohash directory either - filepath http-date http-media http-types lifted-base microlens - mime-types mmorph monad-control mtl network old-locale random text - time transformers transformers-base unix unordered-containers wai - wai-extra - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - transformers wai - ]; - jailbreak = true; - homepage = "https://github.com/helium/airship/"; - description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "airship" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, containers @@ -21710,23 +20969,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openal;}; - "alarmclock_0_2_0_9" = callPackage - ({ mkDerivation, base, stm, time, unbounded-delays }: - mkDerivation { - pname = "alarmclock"; - version = "0.2.0.9"; - sha256 = "606b06d8e037258cdd51a4f0aa9869b33dfa9dc34eb605c2f6a7357778bd676d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base stm time unbounded-delays ]; - executableHaskellDepends = [ base time ]; - jailbreak = true; - homepage = "https://bitbucket.org/davecturner/alarmclock"; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "alarmclock" = callPackage ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: mkDerivation { @@ -22966,7 +22208,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; @@ -23490,7 +22731,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; @@ -23654,7 +22894,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; @@ -23750,36 +22989,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "amqp_0_13_1" = callPackage - ({ mkDerivation, base, binary, bytestring, clock, connection - , containers, data-binary-ieee754, hspec, hspec-expectations - , monad-control, network, network-uri, split, stm, text, vector - , xml - }: - mkDerivation { - pname = "amqp"; - version = "0.13.1"; - sha256 = "3ea6523228f1c2bf0622d52ebf73c9e3c2e2af637a7ea29908c07ff9fa0dd4ae"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 monad-control network network-uri split stm - text vector - ]; - executableHaskellDepends = [ base containers xml ]; - testHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 hspec hspec-expectations network network-uri - split stm text vector - ]; - doCheck = false; - homepage = "https://github.com/hreinhardt/amqp"; - description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amqp" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations @@ -24139,8 +23348,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.0"; sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424"; - revision = "2"; - editedCabalFile = "76329a4d951e443e7d43bc570d6420d03b9a6a0aa337f22efbb5f4ff7006bf22"; + revision = "3"; + editedCabalFile = "f95f677bc3d419b5ad555799a7456684a11612e35ab08e2fe557323ed22d3127"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -24188,12 +23397,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ansigraph_0_3_0_1" = callPackage + "ansigraph_0_3_0_2" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.1"; - sha256 = "fbaa1bdb68753777bb345c834aee316e01698cd3fafc2b9ed9e3b1c77ee8d6c7"; + version = "0.3.0.2"; + sha256 = "d3cefc45710751473685ca621969e04e9bc27218ecc581d3c38164c81df05a20"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -25086,39 +24295,6 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "apply-refact_0_2_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.2.0.0"; - sha256 = "f74abeae9f6ad6e3ab5b00b108e99c4351ff26f691f5a0c1d3662b2b18648d5c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - jailbreak = true; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact @@ -25290,36 +24466,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {arbb_dev = null;}; - "arbtt_0_9_0_9" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 - }: - mkDerivation { - pname = "arbtt"; - version = "0.9.0.9"; - sha256 = "4fdb7d699030c593c25b3a58638988a2c51c122ee49777e644b4a70ea86319a5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 - ]; - executableSystemDepends = [ libXScrnSaver ]; - testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec - pcre-light process-extras tasty tasty-golden tasty-hunit time - transformers unix utf8-string - ]; - homepage = "http://arbtt.nomeata.de/"; - description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXScrnSaver;}; - "arbtt" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath @@ -26084,35 +25230,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asciidiagram_1_3_1_1" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, filepath, FontyFruity, JuicyPixels, lens, linear, mtl - , optparse-applicative, rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; - version = "1.3.1.1"; - sha256 = "7210b71dd14b86286ac874e4de7d042402bca7cb1cff4376269b590c1df0522f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers FontyFruity JuicyPixels lens linear mtl - rasterific-svg svg-tree text vector - ]; - executableHaskellDepends = [ - base bytestring directory filepath FontyFruity JuicyPixels - optparse-applicative rasterific-svg svg-tree text - ]; - testHaskellDepends = [ - base blaze-html containers directory filepath JuicyPixels - rasterific-svg svg-tree text - ]; - doCheck = false; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "asciidiagram" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative @@ -26413,21 +25530,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "async-dejafu_0_1_2_2" = callPackage - ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }: - mkDerivation { - pname = "async-dejafu"; - version = "0.1.2.2"; - sha256 = "ff459f69420e8ef8c26d5c7f2158d49501d1ee06a4c3a664b8826fb90f517db0"; - libraryHaskellDepends = [ base dejafu exceptions ]; - testHaskellDepends = [ base dejafu HUnit hunit-dejafu ]; - jailbreak = true; - homepage = "https://github.com/barrucadu/dejafu"; - description = "Run MonadConc operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "async-dejafu" = callPackage ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit , hunit-dejafu @@ -26689,36 +25791,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "atom-conduit_0_3_1_1" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, data-default - , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers - , quickcheck-instances, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring - , xml-conduit, xml-conduit-parse, xml-types - }: - mkDerivation { - pname = "atom-conduit"; - version = "0.3.1.1"; - sha256 = "d0603a5a726fade01a9fe6c5859d81c6f53d8770dc0db8b889e2717e63a3d2b3"; - revision = "1"; - editedCabalFile = "8ebc45eae1c2408eb475b62923c8801b07abe999d107f3d9b22ec22c2e8c1dad"; - libraryHaskellDepends = [ - base conduit conduit-parse exceptions foldl lens-simple - mono-traversable parsers text time timerep uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default exceptions hlint - lens-simple mono-traversable parsers quickcheck-instances resourcet - tasty tasty-hunit tasty-quickcheck text time uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - jailbreak = true; - description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "atom-conduit" = callPackage ({ mkDerivation, base, conduit, conduit-parse, data-default , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers @@ -27690,42 +26762,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {awesomium = null;}; - "aws_0_13_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-extra, containers - , cryptohash, data-default, directory, errors, filepath - , http-client, http-conduit, http-types, lifted-base, monad-control - , mtl, network, old-locale, QuickCheck, quickcheck-instances - , resourcet, safe, scientific, tagged, tasty, tasty-quickcheck - , text, time, transformers, transformers-base, unordered-containers - , utf8-string, vector, xml-conduit - }: - mkDerivation { - pname = "aws"; - version = "0.13.2"; - sha256 = "998a9ddc9bc3e74a292e733aac1e9af0ec654d17aa1834319f9f6af4d907ff59"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring errors http-client lifted-base monad-control - mtl QuickCheck quickcheck-instances resourcet tagged tasty - tasty-quickcheck text time transformers transformers-base - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/aristidb/aws"; - description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring @@ -28839,21 +27875,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "base-noprelude_4_8_2_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-noprelude"; - version = "4.8.2.0"; - sha256 = "bd4ab7685a14d82f7586074b1af88e22a8401e552a439286710592e3a2d763c7"; - libraryHaskellDepends = [ base ]; - doHaddock = false; - jailbreak = true; - homepage = "https://github.com/hvr/base-noprelude"; - description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "base-noprelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29109,25 +28130,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "basic-prelude_0_5_2" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "basic-prelude"; - version = "0.5.2"; - sha256 = "96666a0ddd6b12eaa4d172cf76e0a4b3846da49d96a2b68d627e949ea7c75752"; - libraryHaskellDepends = [ - base bytestring containers filepath hashable lifted-base ReadArgs - safe text transformers unordered-containers vector - ]; - homepage = "https://github.com/snoyberg/basic-prelude"; - description = "An enhanced core prelude; a common foundation for alternate preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "basic-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , lifted-base, ReadArgs, safe, text, transformers @@ -29177,6 +28179,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "batch-rename" = callPackage + ({ mkDerivation, base, directory, filepath, Glob }: + mkDerivation { + pname = "batch-rename"; + version = "0.1.0.9"; + sha256 = "7b22e7cf6c55eb1f80822a35ff4b0a699767ea38cc0b106f0c3766b1c57653f7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory filepath Glob ]; + homepage = "https://github.com/uppet/batch_rename"; + description = "Make Linux or MacOS do things like \"rename *.mp3 *.mp4\""; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "battlenet" = callPackage ({ mkDerivation, aeson, base, containers, http-conduit, text }: mkDerivation { @@ -29290,18 +28306,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bcrypt_0_0_8" = callPackage - ({ mkDerivation, base, bytestring, entropy, memory }: - mkDerivation { - pname = "bcrypt"; - version = "0.0.8"; - sha256 = "9cd100975d7349190a1d8ed6459d9e2677a74385ce86b35f2da3f5c582e11100"; - libraryHaskellDepends = [ base bytestring entropy memory ]; - description = "Haskell bindings to the bcrypt password hash"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bcrypt" = callPackage ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { @@ -29865,30 +28869,6 @@ self: { license = "LGPL"; }) {}; - "bifunctors_5_2" = callPackage - ({ mkDerivation, base, comonad, containers, hspec, QuickCheck - , semigroups, tagged, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "bifunctors"; - version = "5.2"; - sha256 = "46e173dac5863a7b8404b44ab1ead2de94e743d24a2de571ff086cfb8748de14"; - libraryHaskellDepends = [ - base comonad containers semigroups tagged template-haskell - transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck transformers transformers-compat - ]; - doHaddock = false; - jailbreak = true; - homepage = "http://github.com/ekmett/bifunctors/"; - description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec , QuickCheck, semigroups, tagged, template-haskell, transformers @@ -30302,8 +29282,8 @@ self: { pname = "binary-orphans"; version = "0.1.5.1"; sha256 = "c60442199ad6139654a6a672dc66d321dbe8a23199fb5269ef295b2adc23af4c"; - revision = "2"; - editedCabalFile = "987c5b6812e28ae7ab9b6073cbb6e5db7d4e1f6c286dc5b69d8a1d6bcb51831b"; + revision = "3"; + editedCabalFile = "d983e4991d7753af287d15af9e8b6391662769e8466ddf956fcc0c8c39342233"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -31554,21 +30534,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "biophd_0_0_4" = callPackage - ({ mkDerivation, base, binary, biocore, bytestring, parsec, text }: - mkDerivation { - pname = "biophd"; - version = "0.0.4"; - sha256 = "a31005a449218e3f383ede0a177c48ef8c7ec21ae7bc5d122bd6eb6a9e1bfb82"; - libraryHaskellDepends = [ - base binary biocore bytestring parsec text - ]; - homepage = "https://patch-tag.com/r/dfornika/biophd/home"; - description = "Library for reading phd sequence files"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "biophd" = callPackage ({ mkDerivation, base, binary, biocore, bytestring, parsec, text , time, time-locale-compat @@ -31781,22 +30746,21 @@ self: { "bitcoin-payment-channel" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base58string - , base64-bytestring, binary, bytestring, cereal, errors - , haskoin-core, hexstring, QuickCheck, scientific, text, time + , base64-bytestring, bytestring, cereal, errors, haskoin-core + , hexstring, QuickCheck, scientific, text, time }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "0.2.3.1"; - sha256 = "b987da47e8f1c0d60dacc6b09a07097f6b390e80b0110adc4401974bbc2fd1ad"; + version = "0.3.0.1"; + sha256 = "97bc6dc75c72735f28c84ef90734f2e31bde8693f9c88e216f8a66d3f95ae8c8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary - bytestring cereal errors haskoin-core hexstring scientific text - time + aeson base base16-bytestring base64-bytestring bytestring cereal + errors haskoin-core hexstring scientific text time ]; executableHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary + aeson base base16-bytestring base58string base64-bytestring bytestring cereal haskoin-core hexstring QuickCheck text time ]; homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; @@ -31946,24 +30910,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bits_0_4" = callPackage - ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl - , transformers - }: - mkDerivation { - pname = "bits"; - version = "0.4"; - sha256 = "e626310d69e0808586a9c7cc965a0c2eb3413d643271e523fef8037fc8f4458b"; - libraryHaskellDepends = [ base bytes mtl transformers ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - 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 @@ -32308,25 +31254,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blake2_0_1_0" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, hlint - , QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "blake2"; - version = "0.1.0"; - sha256 = "d4cdb38b973125fdd80a12f335ec536dc5c5d1dfd5611c9ebe46c3bf78841ce5"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base base16-bytestring bytestring hlint QuickCheck tasty - tasty-quickcheck - ]; - homepage = "https://github.com/centromere/blake2"; - description = "A library providing BLAKE2"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blake2" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, hlint , QuickCheck, tasty, tasty-quickcheck @@ -32560,29 +31487,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blaze-html_0_8_1_1" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; - version = "0.8.1.1"; - sha256 = "f8d2e39764b318f5dde33288f9f11a125ac51552c48b981e2b8068002728dcb6"; - libraryHaskellDepends = [ - base blaze-builder blaze-markup bytestring text - ]; - testHaskellDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blaze-html" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework @@ -32675,26 +31579,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "blaze-markup_0_7_0_3" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.7.0.3"; - sha256 = "3e69a0e88dde5a6a3c8b4204d847a545f7872025a2ac4554cd5df2861aa41b20"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blaze-markup" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -33161,20 +32045,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "bmp_1_2_5_2" = callPackage - ({ mkDerivation, base, binary, bytestring }: - mkDerivation { - pname = "bmp"; - version = "1.2.5.2"; - sha256 = "bdd8681204d79176a974100958a020bb65471752ae7819e5fad7856abd700839"; - libraryHaskellDepends = [ base binary bytestring ]; - jailbreak = true; - homepage = "http://code.ouroborus.net/bmp"; - description = "Read and write uncompressed BMP image files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bmp" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -33600,7 +32470,6 @@ self: { base directory doctest filepath prelude-extras transformers vector ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; license = stdenv.lib.licenses.bsd3; @@ -33842,25 +32711,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "brick_0_4_1" = callPackage - ({ mkDerivation, base, containers, contravariant, data-default - , deepseq, lens, template-haskell, text, text-zipper, transformers - , vector, vty - }: - mkDerivation { - pname = "brick"; - version = "0.4.1"; - sha256 = "bea0df7fdcb476fc955f7301e77bfb8845008ab0e36cab2c2dcc1cf679a4595d"; - libraryHaskellDepends = [ - base containers contravariant data-default deepseq lens - template-haskell text text-zipper transformers vector vty - ]; - homepage = "https://github.com/jtdaugherty/brick/"; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default , deepseq, microlens, microlens-mtl, microlens-th, template-haskell @@ -34592,19 +33442,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring-builder_0_10_6_0_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq }: - mkDerivation { - pname = "bytestring-builder"; - version = "0.10.6.0.0"; - sha256 = "9c439987d11150ad3f73158ad3be1f9d1f70572cd2cf8fdf585765403f116fd6"; - libraryHaskellDepends = [ base bytestring deepseq ]; - doHaddock = false; - description = "The new bytestring builder, packaged outside of GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bytestring-builder" = callPackage ({ mkDerivation, base, bytestring, deepseq }: mkDerivation { @@ -34709,7 +33546,6 @@ self: { base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - doCheck = false; homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; @@ -34847,28 +33683,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring-tree-builder_0_2_7" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7"; - sha256 = "1d62f411de750723b3b72bc3b60e288b3d2b52c0e982cff332544e2a7fe7a003"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bytestring-tree-builder" = callPackage ({ mkDerivation, base, base-prelude, bytestring , quickcheck-instances, semigroups, tasty, tasty-hunit @@ -35255,7 +34069,6 @@ self: { base Cabal containers debian Diff directory filepath hsemail HUnit lens pretty process text ]; - doCheck = false; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; @@ -35380,38 +34193,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-helper_0_6_3_1" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory - , extra, filepath, ghc-prim, mtl, process, template-haskell - , temporary, transformers, unix, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.6.3.1"; - sha256 = "c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe"; - revision = "1"; - editedCabalFile = "63136d3d9e1dc39c8fd90687c031727aa7c8c5f38dcf2b26a3b652a44b4d8041"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process transformers - ]; - executableHaskellDepends = [ - base bytestring Cabal directory filepath ghc-prim process - template-haskell temporary transformers utf8-string - ]; - testHaskellDepends = [ - base bytestring Cabal directory extra filepath ghc-prim mtl process - template-haskell temporary transformers unix utf8-string - ]; - testToolDepends = [ cabal-install ]; - jailbreak = true; - doCheck = false; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory , extra, filepath, ghc-prim, mtl, process, template-haskell @@ -35462,42 +34243,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "cabal-install_1_22_9_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers - , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl - , network, network-uri, pretty, process, QuickCheck, random - , regex-posix, stm, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, unix, zlib - }: - mkDerivation { - pname = "cabal-install"; - version = "1.22.9.0"; - sha256 = "874035e5730263653c7aa459f270efbffc06da92ea0c828e09ebc04400e94940"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bytestring Cabal containers directory filepath HTTP mtl - network network-uri pretty process random stm time unix zlib - ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory - extensible-exceptions filepath HTTP HUnit mtl network network-uri - pretty process QuickCheck regex-posix stm test-framework - test-framework-hunit test-framework-quickcheck2 time unix zlib - ]; - jailbreak = true; - doCheck = false; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - "cabal-install" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, directory @@ -35736,25 +34481,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-rpm_0_9_11" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, old-locale - , process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.9.11"; - sha256 = "ba5c748e84cfda23dee92d9381b34f013bf2840452bebe53d3f0c2e1bd31d581"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal directory filepath old-locale process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cabal-rpm" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, old-locale , process, time, unix @@ -36246,27 +34972,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cacophony_0_6_0" = callPackage - ({ mkDerivation, async, base, bytestring, cryptonite, deepseq, free - , hlint, lens, memory, mtl, QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "cacophony"; - version = "0.6.0"; - sha256 = "2a1b2cf962fbf2743efb36439428b89882add585a4877436533b9fc755d98a9c"; - libraryHaskellDepends = [ - base bytestring cryptonite deepseq free lens memory mtl - ]; - testHaskellDepends = [ - async base bytestring hlint mtl QuickCheck tasty tasty-quickcheck - ]; - doCheck = false; - homepage = "https://github.com/centromere/cacophony"; - description = "A library implementing the Noise protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cacophony" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring , cryptonite, deepseq, directory, exceptions, free, hlint, lens @@ -36334,25 +35039,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cairo_0_13_1_1" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, gtk2hs-buildtools - , mtl, text, utf8-string - }: - mkDerivation { - pname = "cairo"; - version = "0.13.1.1"; - sha256 = "58ae22451e7812a88531eaf91ae1250c277f48d0a88d1cae2438bd76f79e89f6"; - libraryHaskellDepends = [ - array base bytestring mtl text utf8-string - ]; - libraryPkgconfigDepends = [ cairo ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo;}; - "cairo" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo , gtk2hs-buildtools, mtl, text, utf8-string @@ -36985,23 +35671,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "carray_0_1_6_4" = callPackage - ({ mkDerivation, array, base, binary, bytestring, ix-shapable - , QuickCheck, syb - }: - mkDerivation { - pname = "carray"; - version = "0.1.6.4"; - sha256 = "52964f076e8f03051f2af5e5cd6e450860dd1623ed67549a9f12f318d6c00c50"; - libraryHaskellDepends = [ - array base binary bytestring ix-shapable QuickCheck syb - ]; - testHaskellDepends = [ array base ix-shapable QuickCheck ]; - description = "A C-compatible array library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "carray" = callPackage ({ mkDerivation, array, base, binary, bytestring, ix-shapable , QuickCheck, syb @@ -37018,27 +35687,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cartel_0_16_0_0" = callPackage - ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck - , random, tasty, tasty-quickcheck, tasty-th, time, transformers - }: - mkDerivation { - pname = "cartel"; - version = "0.16.0.0"; - sha256 = "67594fa408d74553038b677b650863f457309d69d968b01f4dda3bdf46a8b6b3"; - libraryHaskellDepends = [ - base directory filepath time transformers - ]; - testHaskellDepends = [ - base directory filepath multiarg QuickCheck random tasty - tasty-quickcheck tasty-th time transformers - ]; - homepage = "http://www.github.com/massysett/cartel"; - description = "Specify Cabal files in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg , optparse-applicative, pretty-show, process, QuickCheck, random @@ -37829,25 +36477,26 @@ self: { libraryHaskellDepends = [ base bytestring directory filepath unix ]; - doCheck = false; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = stdenv.lib.licenses.bsd3; }) {}; "cayley-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , http-client, http-conduit, lens, lens-aeson, mtl, text + , hspec, http-client, http-conduit, lens, lens-aeson, mtl, text , transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.1.5.1"; - sha256 = "3a2eab27b2aa711141d43248a5505154945e8563d846e1db3379f486b140563c"; + version = "0.2.0.0"; + sha256 = "f42cff8dd066f219c8dca8e43cd2b6e29265d9064c8751873d22db7888e761fb"; libraryHaskellDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers unordered-containers vector ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + doCheck = false; homepage = "https://github.com/MichelBoucey/cayley-client"; description = "A Haskell client for the Cayley graph database"; license = stdenv.lib.licenses.bsd3; @@ -38040,27 +36689,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cereal_0_5_2_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; - version = "0.5.2.0"; - sha256 = "b50e77ad340d672d0f2c53ce526a088ecdf74f1ed34f6bb2f95deab725dd2b14"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - homepage = "https://github.com/GaloisInc/cereal"; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cereal" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 @@ -38448,10 +37076,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "chalk"; - version = "0.1.0.1"; - sha256 = "be7bc5016333d20771b30fb8375af438f92eb1d2c4af7bf6beac702e42b93835"; + version = "0.1.0.2"; + sha256 = "f24e9f7990a72ffcdc2b5a6613780b04c319bdc4151794b8afc3675bf3f8dec7"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/joom/chalk"; description = "Terminal string styling"; license = stdenv.lib.licenses.mit; @@ -39116,27 +37743,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chunked-data_0_2_0" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , mono-traversable, semigroups, text, transformers, vector - }: - mkDerivation { - pname = "chunked-data"; - version = "0.2.0"; - sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272"; - revision = "3"; - editedCabalFile = "8fd1f0e3423794b4389c4741ad6a48297197b96153e002c822c0ea9a5e96a108"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers mono-traversable - semigroups text transformers vector - ]; - jailbreak = true; - homepage = "https://github.com/fpco/chunked-data"; - description = "Typeclasses for dealing with various chunked data representations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "chunked-data" = callPackage ({ mkDerivation, base, bytestring, containers, semigroups, text , transformers, vector @@ -39256,21 +37862,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cipher-aes128_0_7_0_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: - mkDerivation { - pname = "cipher-aes128"; - version = "0.7.0.1"; - sha256 = "18aecff826ca46e188062b972dfbda7360f6f73e2ffe45aa15bdc676debb7662"; - libraryHaskellDepends = [ - base bytestring cereal crypto-api tagged - ]; - homepage = "https://github.com/TomMD/cipher-aes128"; - description = "AES and common modes using AES-NI when available"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cipher-aes128" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: mkDerivation { @@ -39730,34 +38321,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc_0_6_21" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl - , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra - , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl - , process, text, time, transformers, unbound-generics, unix - , unordered-containers - }: - mkDerivation { - pname = "clash-ghc"; - version = "0.6.21"; - sha256 = "46be5b228391132b4bb1b21ed1ab599d14bd89efcd808e3fc20e8d553170cf22"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bifunctors bytestring clash-lib clash-prelude - clash-systemverilog clash-verilog clash-vhdl containers deepseq - directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise - hashable haskeline lens mtl process text time transformers - unbound-generics unix unordered-containers - ]; - jailbreak = true; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl @@ -39788,30 +38351,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib_0_6_19" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, deepseq, directory, errors, fgl - , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process - , template-haskell, text, time, transformers, unbound-generics - , unordered-containers, uu-parsinglib, wl-pprint-text - }: - mkDerivation { - pname = "clash-lib"; - version = "0.6.19"; - sha256 = "71faa79c1241b2f121aa3e4247949c7fb7640cc36cf46099f4f8bcf70721ca44"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers deepseq directory errors fgl filepath ghc hashable - integer-gmp lens mtl pretty process template-haskell text time - transformers unbound-generics unordered-containers uu-parsinglib - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl @@ -39835,28 +38374,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "clash-prelude_0_10_10" = callPackage - ({ mkDerivation, array, base, data-default, doctest, ghc-prim - , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens - , QuickCheck, reflection, singletons, template-haskell - }: - mkDerivation { - pname = "clash-prelude"; - version = "0.10.10"; - sha256 = "64577debc8c970919268374eb0b422a4b8152422df3683ce3b665cc1cfa94d9c"; - libraryHaskellDepends = [ - array base data-default ghc-prim ghc-typelits-extra - ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection - singletons template-haskell - ]; - testHaskellDepends = [ base doctest ]; - jailbreak = true; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-prelude" = callPackage ({ mkDerivation, array, base, data-default, deepseq, doctest , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise @@ -39892,24 +38409,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog_0_6_7" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-systemverilog"; - version = "0.6.7"; - sha256 = "377e57de5f09852b6c2059fc8d114d01b48005f270265092e98251d3c9c4d92b"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-systemverilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -39927,24 +38426,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "clash-verilog_0_6_7" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-verilog"; - version = "0.6.7"; - sha256 = "1794d45c04ce52c6488f970a465861785948e2ffa2ca275678efdb75902945ab"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Verilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-verilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -39962,24 +38443,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "clash-vhdl_0_6_15" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-vhdl"; - version = "0.6.15"; - sha256 = "9472699b6d62804093a2dea8b49da573b750c326963ff9dc4cf1ef2bfde521a8"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-vhdl" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -40024,35 +38487,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "classy-prelude_0_12_8" = callPackage - ({ mkDerivation, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, dlist, enclosed-exceptions, exceptions - , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl - , mutable-containers, primitive, QuickCheck, semigroups, stm, text - , time, time-locale-compat, transformers, transformers-base - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "0.12.8"; - sha256 = "afa89959a687d74b851a2a3fce1b2d397cc40041ff5223ec9317bd723d47ca7f"; - libraryHaskellDepends = [ - base basic-prelude bifunctors bytestring chunked-data containers - dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base - mono-traversable mtl mutable-containers primitive semigroups stm - text time time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim @@ -40083,29 +38517,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-conduit_0_12_8" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; - version = "0.12.8"; - sha256 = "5ba261f04339ea8533abbe760257f9108433c9183c644e87bca5ba637ed1663d"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - jailbreak = true; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "conduit instances for classy-prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -40127,27 +38538,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-yesod_0_12_8" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "0.12.8"; - sha256 = "fa2c5c8407b0b7e10abeb360d237eec9e629cb34098dc1e84a23baf106f85f5e"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - jailbreak = true; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -40167,28 +38557,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "clay_0_10_1" = callPackage - ({ mkDerivation, base, HUnit, mtl, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "clay"; - version = "0.10.1"; - sha256 = "3bb820281b8824055f5a087273f6578ccd5b6f6575891ec88933d9ebdf920a54"; - revision = "1"; - editedCabalFile = "8ecb3c320c9470f2bf250552d7fac738520d90d28e8e90b11922d1c4940a0263"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ - base HUnit mtl test-framework test-framework-hunit text - ]; - jailbreak = true; - doCheck = false; - homepage = "http://fvisser.nl/clay"; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clay" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { @@ -40216,8 +38584,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.18"; - sha256 = "48e6a3093b6c9830f9830952833d95bc1a6de742ffb38f8873b0963f8cf7ebce"; + version = "0.23.19.1"; + sha256 = "37798295b8a227277b4531c9899722fda57b65bf7f191844656a7652b5026e83"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -40235,40 +38603,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; - "clckwrks_0_23_19" = callPackage - ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, cereal, containers, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-jmacro - , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs - , ixset, jmacro, lens, mtl, network, network-uri, old-locale - , openssl, process, random, reform, reform-happstack, reform-hsp - , safecopy, stm, text, time, time-locale-compat - , unordered-containers, userid, utf8-string, uuid-orphans - , uuid-types, vector, web-plugins, web-routes, web-routes-happstack - , web-routes-hsp, web-routes-th, xss-sanitize - }: - mkDerivation { - pname = "clckwrks"; - version = "0.23.19"; - sha256 = "ba92996b4ccde157e6bde7f0a50c921537af450b394773cb306741372cf4896e"; - libraryHaskellDepends = [ - acid-state aeson aeson-qq attoparsec base blaze-html bytestring - cereal containers directory filepath happstack-authenticate - happstack-hsp happstack-jmacro happstack-server - happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl - network network-uri old-locale process random reform - reform-happstack reform-hsp safecopy stm text time - time-locale-compat unordered-containers userid utf8-string - uuid-orphans uuid-types vector web-plugins web-routes - web-routes-happstack web-routes-hsp web-routes-th xss-sanitize - ]; - librarySystemDepends = [ openssl ]; - homepage = "http://www.clckwrks.com/"; - description = "A secure, reliable content management system (CMS) and blogging platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; - "clckwrks-cli" = callPackage ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl , network, parsec @@ -40384,31 +38718,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "clckwrks-plugin-page_0_4_3_3" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks - , containers, directory, filepath, happstack-hsp, happstack-server - , hsp, hsx2hs, ixset, mtl, old-locale, random, reform - , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, time-locale-compat, uuid, web-plugins, web-routes - , web-routes-happstack, web-routes-th - }: - mkDerivation { - pname = "clckwrks-plugin-page"; - version = "0.4.3.3"; - sha256 = "cae111456424fe22eae06a3a0ef1d417d9373b4d09809920a678664b89d7e161"; - libraryHaskellDepends = [ - acid-state aeson attoparsec base clckwrks containers directory - filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl - old-locale random reform reform-happstack reform-hsp safecopy - tagsoup template-haskell text time time-locale-compat uuid - web-plugins web-routes web-routes-happstack web-routes-th - ]; - homepage = "http://www.clckwrks.com/"; - description = "support for CMS/Blogging in clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clckwrks-plugin-page" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks , containers, directory, filepath, happstack-hsp, happstack-server @@ -41436,34 +39745,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "codex_0_4_0_10" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash - , directory, either, filepath, hackage-db, http-client, lens - , machines, machines-directory, MissingH, monad-loops, network - , process, tar, text, transformers, wreq, yaml, zlib - }: - mkDerivation { - pname = "codex"; - version = "0.4.0.10"; - sha256 = "1dd23ef2991b14e6c212b91b86ef2c14de86ece126ab7bcf4ed926d1413ad812"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers cryptohash directory either - filepath hackage-db http-client lens machines machines-directory - process tar text transformers wreq yaml zlib - ]; - executableHaskellDepends = [ - base bytestring Cabal directory either filepath hackage-db MissingH - monad-loops network process transformers wreq yaml - ]; - jailbreak = true; - homepage = "http://github.com/aloiscochard/codex"; - description = "A ctags file generator for cabal project dependencies"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "codex" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash , directory, either, filepath, hackage-db, http-client, lens @@ -42136,27 +40417,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "comonad_4_2_7_2" = callPackage - ({ mkDerivation, base, containers, contravariant, directory - , distributive, doctest, filepath, semigroups, tagged, transformers - , transformers-compat - }: - mkDerivation { - pname = "comonad"; - version = "4.2.7.2"; - sha256 = "b762261ef545a16881b66409398752e249a8e654a34088c66d9fabf9ba5a3b2b"; - libraryHaskellDepends = [ - base containers contravariant distributive semigroups tagged - transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - homepage = "http://github.com/ekmett/comonad/"; - description = "Comonads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "comonad" = callPackage ({ mkDerivation, base, containers, contravariant, directory , distributive, doctest, filepath, semigroups, tagged, transformers @@ -42547,7 +40807,6 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/liamoc/composition-tree"; description = "Composition trees for arbitrary monoids"; license = stdenv.lib.licenses.bsd3; @@ -42908,23 +41167,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "concurrent-output_1_7_6" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.7.6"; - sha256 = "ca3668dad7999dd1366582bff46ef3a50ba8ce9a775a812883094db92adac6a5"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "concurrent-output" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix @@ -43131,29 +41373,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "conduit_1_2_6_6" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, mtl, QuickCheck, resourcet, safe, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit"; - version = "1.2.6.6"; - sha256 = "958fe8636ef49b947493fd23ea1522d51e82e6acc87cb9e5038398e25fa5d188"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph mtl resourcet transformers - transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - transformers - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, mtl, QuickCheck, resourcet, safe, transformers @@ -43251,35 +41470,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "conduit-combinators_1_0_4" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; - version = "1.0.4"; - sha256 = "75a90da15f7bd70748ebb3a3612d50896e421d8fdbaa4879e8aabfbeaf4dc7de"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers @@ -43438,27 +41628,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-parse_0_1_1_1" = callPackage - ({ mkDerivation, base, conduit, dlist, exceptions, hlint, mtl - , parsers, resourcet, tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "conduit-parse"; - version = "0.1.1.1"; - sha256 = "4366a66f5980bd328730c5d44b99f67d7081e5ef76b554bc8284942bf9977f4a"; - libraryHaskellDepends = [ - base conduit dlist exceptions mtl parsers text transformers - ]; - testHaskellDepends = [ - base conduit exceptions hlint mtl parsers resourcet tasty - tasty-hunit - ]; - homepage = "https://github.com/k0ral/conduit-parse"; - description = "Parsing framework based on conduit"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-parse" = callPackage ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text @@ -43808,25 +41977,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "connection_0_2_5" = callPackage - ({ mkDerivation, base, byteable, bytestring, containers - , data-default-class, network, socks, tls, x509, x509-store - , x509-system, x509-validation - }: - mkDerivation { - pname = "connection"; - version = "0.2.5"; - sha256 = "8895d4427985202ac439b884deb4b5675ccba3d9498fce3687f1542b4ba21124"; - libraryHaskellDepends = [ - base byteable bytestring containers data-default-class network - socks tls x509 x509-store x509-system x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-connection"; - description = "Simple and easy network connections API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "connection" = callPackage ({ mkDerivation, base, byteable, bytestring, containers , data-default-class, network, socks, tls, x509, x509-store @@ -43954,8 +42104,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "constraint-classes"; - version = "0.2.0"; - sha256 = "7cc34540b60d0e1a89230d1ea65ea05af49524e102915aa3b3d908158b134580"; + version = "0.3.0"; + sha256 = "369f8b61d20c1f83e6460768a8316b029c32f61c4bfe38e2538c9c075802e8f2"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/guaraqe/constraint-classes#readme"; description = "Prelude classes using ConstraintKinds"; @@ -44287,23 +42437,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "contravariant-extras_0_3_2" = callPackage - ({ mkDerivation, base-prelude, contravariant, template-haskell - , tuple-th - }: - mkDerivation { - pname = "contravariant-extras"; - version = "0.3.2"; - sha256 = "9fd92b6d240f9492c0474ce5261751ed9f01b6fd4292f0bbfc482e19d9012505"; - libraryHaskellDepends = [ - base-prelude contravariant template-haskell tuple-th - ]; - homepage = "https://github.com/nikita-volkov/contravariant-extras"; - description = "Extras for the \"contravariant\" package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "contravariant-extras" = callPackage ({ mkDerivation, base-prelude, contravariant, template-haskell , tuple-th @@ -45192,32 +43325,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "courier_0_1_1_3" = callPackage - ({ mkDerivation, async, base, bytestring, cereal, containers - , directory, hslogger, HUnit, network, stm, test-framework - , test-framework-hunit, text, uuid - }: - mkDerivation { - pname = "courier"; - version = "0.1.1.3"; - sha256 = "0cf44b62c2b134a7bf9aa779ef2b04d91f4b44a46273bb478ecdcbd9d1198e83"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring cereal containers hslogger network stm text - uuid - ]; - executableHaskellDepends = [ base cereal ]; - testHaskellDepends = [ - async base cereal containers directory hslogger HUnit network stm - test-framework test-framework-hunit - ]; - homepage = "http://github.com/hargettp/courier"; - description = "A message-passing library for simplifying network applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "courier" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , directory, hslogger, HUnit, network, stm, test-framework @@ -45336,27 +43443,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs_1_20_1" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.1"; - sha256 = "bd6eab851ec39ed5c5e4b0eb0b956f5892a36dedabcdf127a1ffa84c8e4f6017"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - executableHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cpphs" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: @@ -45492,30 +43578,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {inherit (pkgs) python34;}; - "cql_3_0_7" = callPackage - ({ mkDerivation, base, bytestring, cereal, Decimal, iproute - , network, QuickCheck, tasty, tasty-quickcheck, template-haskell - , text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "cql"; - version = "3.0.7"; - sha256 = "54f8535ac3fe7abeb31557ec560f8135941346fc1ec8eb7922a9e0eda10fea76"; - libraryHaskellDepends = [ - base bytestring cereal Decimal iproute network template-haskell - text time transformers uuid vector - ]; - testHaskellDepends = [ - base bytestring cereal Decimal iproute network QuickCheck tasty - tasty-quickcheck text time uuid - ]; - jailbreak = true; - homepage = "https://github.com/twittner/cql/"; - description = "Cassandra CQL binary protocol"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, Decimal, iproute , network, QuickCheck, tasty, tasty-quickcheck, template-haskell @@ -45539,30 +43601,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cql-io_0_15_2" = callPackage - ({ mkDerivation, async, auto-update, base, bytestring, containers - , cql, cryptohash, data-default-class, exceptions, hashable - , HsOpenSSL, iproute, lens, monad-control, mtl, mwc-random, network - , retry, semigroups, stm, text, time, tinylog, transformers - , transformers-base, uuid, vector - }: - mkDerivation { - pname = "cql-io"; - version = "0.15.2"; - sha256 = "cba9bdaae9056151a413760e5d9dea10604a7ef90867fd2c834ddc1a5b6d5669"; - libraryHaskellDepends = [ - async auto-update base bytestring containers cql cryptohash - data-default-class exceptions hashable HsOpenSSL iproute lens - monad-control mtl mwc-random network retry semigroups stm text time - tinylog transformers transformers-base uuid vector - ]; - jailbreak = true; - homepage = "https://github.com/twittner/cql-io/"; - description = "Cassandra CQL client"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cql-io" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, exceptions, hashable @@ -46741,41 +44779,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptol_2_3_0" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, async, base - , base-compat, bytestring, containers, deepseq, deepseq-generics - , directory, filepath, generic-trie, gitrev, GraphSCC, happy - , haskeline, heredoc, monad-control, monadLib, old-time, presburger - , pretty, process, QuickCheck, random, sbv, simple-smt, smtLib, syb - , template-haskell, text, tf-random, transformers - , transformers-base, utf8-string - }: - mkDerivation { - pname = "cryptol"; - version = "2.3.0"; - sha256 = "403577bb14a3ebb5683b2221d9b424ff53b8e8faddb64b27f47a6b00414138ce"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base base-compat bytestring containers deepseq - deepseq-generics directory filepath generic-trie gitrev GraphSCC - heredoc monad-control monadLib old-time presburger pretty process - QuickCheck random sbv simple-smt smtLib syb template-haskell text - tf-random transformers transformers-base utf8-string - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - ansi-terminal base base-compat containers deepseq directory - filepath haskeline monad-control monadLib process random sbv - tf-random transformers - ]; - jailbreak = true; - homepage = "http://www.cryptol.net/"; - description = "Cryptol: The Language of Cryptography"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, bytestring, containers, deepseq, directory, filepath @@ -46808,28 +44811,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptonite_0_15" = callPackage - ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim - , integer-gmp, memory, tasty, tasty-hunit, tasty-kat - , tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.15"; - sha256 = "aed8fac2bbb87705e1836a27179f85169c559b95d39199aad974d795917ac403"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-prim integer-gmp memory - ]; - testHaskellDepends = [ - base byteable bytestring memory tasty tasty-hunit tasty-kat - tasty-quickcheck - ]; - homepage = "https://github.com/haskell-crypto/cryptonite"; - description = "Cryptography Primitives sink"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cryptonite" = callPackage ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim , integer-gmp, memory, tasty, tasty-hunit, tasty-kat @@ -47097,20 +45078,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "css-text_0_1_2_1" = callPackage - ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: - mkDerivation { - pname = "css-text"; - version = "0.1.2.1"; - sha256 = "dc0291da7ec756e4dda9dfadef303c78750eca63d07a5ad21dc4a3079cb021f6"; - libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - homepage = "http://www.yesodweb.com/"; - description = "CSS parser and renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "css-text" = callPackage ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: mkDerivation { @@ -47897,51 +45864,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "darcs_2_12_0" = callPackage - ({ mkDerivation, array, async, attoparsec, base, base16-bytestring - , binary, bytestring, cmdargs, containers, cryptohash, curl - , data-ordlist, directory, fgl, filepath, FindBin, graphviz - , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network - , network-uri, old-time, parsec, process, QuickCheck, random - , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar - , terminfo, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, unix, unix-compat, utf8-string, vector - , zip-archive, zlib - }: - mkDerivation { - pname = "darcs"; - version = "2.12.0"; - sha256 = "17318d1b49ca4b1aa00a4bffc2ab30a448e7440ce1945eed9bf382d77582308d"; - configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async attoparsec base base16-bytestring binary bytestring - containers cryptohash data-ordlist directory fgl filepath graphviz - hashable haskeline html HTTP mmap mtl network network-uri old-time - parsec process random regex-applicative regex-compat-tdfa sandi tar - terminfo text time transformers transformers-compat unix - unix-compat utf8-string vector zip-archive zlib - ]; - librarySystemDepends = [ curl ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base bytestring cmdargs containers directory filepath FindBin - HUnit mtl QuickCheck shelly split test-framework - test-framework-hunit test-framework-quickcheck2 text zip-archive - ]; - doCheck = false; - postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs - ''; - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) curl;}; - "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, curl @@ -47986,6 +45908,51 @@ self: { license = "GPL"; }) {inherit (pkgs) curl;}; + "darcs_2_12_4" = callPackage + ({ mkDerivation, array, async, attoparsec, base, base16-bytestring + , binary, bytestring, cmdargs, containers, cryptohash, curl + , data-ordlist, directory, fgl, filepath, FindBin, graphviz + , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network + , network-uri, old-time, parsec, process, QuickCheck, random + , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar + , terminfo, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-compat, unix, unix-compat, utf8-string, vector + , zip-archive, zlib + }: + mkDerivation { + pname = "darcs"; + version = "2.12.4"; + sha256 = "48e836a482bd2fcfe0be499fe4f255925ce50bdcf5ce8023bb9aa359288fdc49"; + configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async attoparsec base base16-bytestring binary bytestring + containers cryptohash data-ordlist directory fgl filepath graphviz + hashable haskeline html HTTP mmap mtl network network-uri old-time + parsec process random regex-applicative regex-compat-tdfa sandi tar + terminfo text time transformers transformers-compat unix + unix-compat utf8-string vector zip-archive zlib + ]; + librarySystemDepends = [ curl ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + array base bytestring cmdargs containers directory filepath FindBin + HUnit mtl QuickCheck shelly split test-framework + test-framework-hunit test-framework-quickcheck2 text zip-archive + ]; + doCheck = false; + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv contrib/darcs_completion $out/etc/bash_completion.d/darcs + ''; + homepage = "http://darcs.net/"; + description = "a distributed, interactive, smart revision control system"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) curl;}; + "darcs-benchmark" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, datetime , directory, filepath, hs-gchart, html, HTTP, json, mtl, network @@ -48603,25 +46570,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "data-default_0_5_3" = callPackage - ({ mkDerivation, base, data-default-class - , data-default-instances-base, data-default-instances-containers - , data-default-instances-dlist, data-default-instances-old-locale - }: - mkDerivation { - pname = "data-default"; - version = "0.5.3"; - sha256 = "ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034"; - libraryHaskellDepends = [ - base data-default-class data-default-instances-base - data-default-instances-containers data-default-instances-dlist - data-default-instances-old-locale - ]; - description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default" = callPackage ({ mkDerivation, base, data-default-class , data-default-instances-containers, data-default-instances-dlist @@ -48639,18 +46587,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-default-class_0_0_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-default-class"; - version = "0.0.1"; - sha256 = "adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31"; - libraryHaskellDepends = [ base ]; - description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48712,18 +46648,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-default-instances-base_0_1_0" = callPackage - ({ mkDerivation, base, data-default-class }: - mkDerivation { - pname = "data-default-instances-base"; - version = "0.1.0"; - sha256 = "9e00bc5dc8da3c53a2cb26c3c55d1ffea8272538aec678f65b7c238da09c4636"; - libraryHaskellDepends = [ base data-default-class ]; - description = "Default instances for types in base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default-instances-base" = callPackage ({ mkDerivation, base, data-default-class }: mkDerivation { @@ -50132,29 +48056,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dawg-ord_0_5_0_1" = callPackage - ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers - , vector - }: - mkDerivation { - pname = "dawg-ord"; - version = "0.5.0.1"; - sha256 = "febbe3a465f67931bf1a96069680c862b8cd9a423013f85e21204832626a5dee"; - libraryHaskellDepends = [ - base containers mtl transformers vector - ]; - testHaskellDepends = [ - base containers HUnit mtl smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - jailbreak = true; - homepage = "https://github.com/kawu/dawg-ord"; - description = "Directed acyclic word graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dawg-ord" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers @@ -50267,7 +48168,6 @@ self: { HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple process split template-haskell text time yaml-light ]; - doCheck = false; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50817,26 +48717,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "debian-build_0_9_2_0" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, process, split - , transformers - }: - mkDerivation { - pname = "debian-build"; - version = "0.9.2.0"; - sha256 = "7d911ef9300a073f8e0db17c3480790a8c6da712ed8141c65098fc7ca99da750"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath process split transformers - ]; - executableHaskellDepends = [ base filepath transformers ]; - homepage = "http://twitter.com/khibino/"; - description = "Debian package build sequence tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "debian-build" = callPackage ({ mkDerivation, base, directory, filepath, process, split , transformers @@ -51083,27 +48963,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deepseq-generics_0_1_1_2" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "deepseq-generics"; - version = "0.1.1.2"; - sha256 = "839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06"; - revision = "1"; - editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd"; - libraryHaskellDepends = [ base deepseq ghc-prim ]; - testHaskellDepends = [ - base deepseq ghc-prim HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = "https://github.com/hvr/deepseq-generics"; - description = "GHC.Generics-based Control.DeepSeq.rnf implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "deepseq-generics" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, HUnit, test-framework , test-framework-hunit @@ -51319,26 +49178,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dejafu_0_3_2_1" = callPackage - ({ mkDerivation, array, atomic-primops, base, containers, deepseq - , dpor, exceptions, monad-control, monad-loops, mtl, semigroups - , stm, template-haskell, transformers, transformers-base - }: - mkDerivation { - pname = "dejafu"; - version = "0.3.2.1"; - sha256 = "cf3ed66e7b3cf9b45f42227d45cc6136f36b1a06744de1fba2b3aebe84d0777f"; - libraryHaskellDepends = [ - array atomic-primops base containers deepseq dpor exceptions - monad-control monad-loops mtl semigroups stm template-haskell - transformers transformers-base - ]; - homepage = "https://github.com/barrucadu/dejafu"; - description = "Overloadable primitives for testable, potentially non-deterministic, concurrency"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dejafu" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, dpor , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers @@ -51586,19 +49425,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dependent-map_0_2_2_0" = callPackage - ({ mkDerivation, base, containers, dependent-sum }: - mkDerivation { - pname = "dependent-map"; - version = "0.2.2.0"; - sha256 = "f4d79312f2a584de265339f5a2ca0bfbd1d6383fb24560ca9148f7559727871f"; - libraryHaskellDepends = [ base containers dependent-sum ]; - homepage = "https://github.com/mokus0/dependent-map"; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dependent-map" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { @@ -51905,29 +49731,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deriving-compat_0_2" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-prim, hspec, QuickCheck, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.2"; - sha256 = "763bb09a78ad4ffa00b30a3655bd01a7f2b816ebec8571c7cf059d481998b42a"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck transformers - transformers-compat - ]; - jailbreak = true; - homepage = "https://github.com/haskell-compat/deriving-compat"; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell @@ -52232,36 +50035,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder_0_7_2_3" = callPackage - ({ mkDerivation, base, base-orphans, bytestring, cmdargs - , diagrams-cairo, diagrams-lib, diagrams-postscript - , diagrams-rasterific, diagrams-svg, directory, exceptions - , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens - , lucid-svg, mtl, split, transformers - }: - mkDerivation { - pname = "diagrams-builder"; - version = "0.7.2.3"; - sha256 = "4763a1e795311335dfec6b8f49deaca3b31a6f3d2bec5168a82f849df4b39029"; - configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-orphans cmdargs diagrams-lib directory exceptions - filepath hashable haskell-src-exts hint lens mtl split transformers - ]; - executableHaskellDepends = [ - base bytestring cmdargs diagrams-cairo diagrams-lib - diagrams-postscript diagrams-rasterific diagrams-svg directory - filepath JuicyPixels lens lucid-svg - ]; - jailbreak = true; - homepage = "http://projects.haskell.org/diagrams"; - description = "hint-based build service for the diagrams graphics EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript @@ -52290,28 +50063,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-cairo_1_3_1" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, colour, containers - , data-default-class, diagrams-core, diagrams-lib, filepath - , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango - , split, statestack, transformers, unix, vector - }: - mkDerivation { - pname = "diagrams-cairo"; - version = "1.3.1"; - sha256 = "0c3949f07592ffae838f81ea76fb88639dfbf64a3002a563101330accbadc485"; - libraryHaskellDepends = [ - array base bytestring cairo colour containers data-default-class - diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl - optparse-applicative pango split statestack transformers unix - vector - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Cairo backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-cairo" = callPackage ({ mkDerivation, array, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, filepath @@ -52356,26 +50107,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-canvas_1_3_0_5" = callPackage - ({ mkDerivation, base, blank-canvas, cmdargs, containers - , data-default-class, diagrams-core, diagrams-lib, lens, mtl - , NumInstances, optparse-applicative, statestack, text - }: - mkDerivation { - pname = "diagrams-canvas"; - version = "1.3.0.5"; - sha256 = "624a99f868ff7fbfed123b6c3ddc0a2369d48b472bf7c5ac9cc5c3a38f755de9"; - libraryHaskellDepends = [ - base blank-canvas cmdargs containers data-default-class - diagrams-core diagrams-lib lens mtl NumInstances - optparse-applicative statestack text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-canvas" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl @@ -52417,34 +50148,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-contrib_1_3_0_11" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , data-default, data-default-class, diagrams-core, diagrams-lib - , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom - , mtl, parsec, QuickCheck, random, semigroups, split - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text - }: - mkDerivation { - pname = "diagrams-contrib"; - version = "1.3.0.11"; - sha256 = "076523498a93223d65758e5d89435df362cf488c940048818fde8f8fbee0a6d5"; - libraryHaskellDepends = [ - base circle-packing colour containers data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout lens linear MonadRandom mtl parsec random semigroups - split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-contrib" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , data-default, data-default-class, diagrams-core, diagrams-lib @@ -52574,26 +50277,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-html5_1_3_0_6" = callPackage - ({ mkDerivation, base, cmdargs, containers, data-default-class - , diagrams-core, diagrams-lib, lens, mtl, NumInstances - , optparse-applicative, split, statestack, static-canvas, text - }: - mkDerivation { - pname = "diagrams-html5"; - version = "1.3.0.6"; - sha256 = "92d980c07aa22df32b898ec43c00ed2c5405c6e6d29b6fb152d420d82a4c171d"; - libraryHaskellDepends = [ - base cmdargs containers data-default-class diagrams-core - diagrams-lib lens mtl NumInstances optparse-applicative split - statestack static-canvas text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-html5" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances @@ -52613,35 +50296,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-lib_1_3_1_3" = callPackage - ({ mkDerivation, active, adjunctions, array, base, colour - , containers, data-default-class, diagrams-core, diagrams-solve - , directory, distributive, dual-tree, exceptions, filepath - , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens - , linear, monoid-extras, mtl, optparse-applicative, process - , semigroups, tagged, tasty, tasty-hunit, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.3.1.3"; - sha256 = "0bf7e87e0d60af17ebf57d9d770cadc447da8db38b9f54114dd30e25a68d79e8"; - revision = "2"; - editedCabalFile = "f2c86b960dc6a1d416cd78be2e086f0e9b09b493463c1f00b60fa6e1494a01ae"; - libraryHaskellDepends = [ - active adjunctions array base colour containers data-default-class - diagrams-core diagrams-solve directory distributive dual-tree - exceptions filepath fingertree fsnotify hashable intervals - JuicyPixels lens linear monoid-extras mtl optparse-applicative - process semigroups tagged text transformers unordered-containers - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-lib" = callPackage ({ mkDerivation, active, adjunctions, array, base, colour , containers, data-default-class, diagrams-core, diagrams-solve @@ -52769,27 +50423,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-rasterific_1_3_1_7" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable - , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split - , unix - }: - mkDerivation { - pname = "diagrams-rasterific"; - version = "1.3.1.7"; - sha256 = "3568aab7c5dbf557f5c1a49f5d3c0dcc1b74dcc173e31b5c2f59b9f1c9795646"; - libraryHaskellDepends = [ - base bytestring containers data-default-class diagrams-core - diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl - optparse-applicative Rasterific split unix - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Rasterific backend for diagrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-rasterific" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable @@ -52881,30 +50514,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-svg_1_3_1_10" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, colour - , containers, diagrams-core, diagrams-lib, directory, filepath - , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl - , old-time, optparse-applicative, process, semigroups, split, text - , time - }: - mkDerivation { - pname = "diagrams-svg"; - version = "1.3.1.10"; - sha256 = "a8293856f359d7d9656bb0b5ca5c97cc13b6ab18eaa71ed30112038cfe0a39a7"; - libraryHaskellDepends = [ - base base64-bytestring bytestring colour containers diagrams-core - diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg - monoid-extras mtl old-time optparse-applicative process semigroups - split text time - ]; - jailbreak = true; - homepage = "http://projects.haskell.org/diagrams/"; - description = "SVG backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath @@ -53283,30 +50892,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors_0_8_0_1" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, mtl - , old-locale, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time - }: - mkDerivation { - pname = "digestive-functors"; - version = "0.8.0.1"; - sha256 = "ae3d5cb376c0065a59313424c408f3a81a1d4a1839214d1a60764e3708abf3c6"; - libraryHaskellDepends = [ - base bytestring containers mtl old-locale text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit mtl old-locale QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time - ]; - jailbreak = true; - homepage = "http://github.com/jaspervdj/digestive-functors"; - description = "A practical formlet library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digestive-functors" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl , old-locale, QuickCheck, test-framework, test-framework-hunit @@ -53419,19 +51004,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors-lucid_0_0_0_3" = callPackage - ({ mkDerivation, base, digestive-functors, lucid, text }: - mkDerivation { - pname = "digestive-functors-lucid"; - version = "0.0.0.3"; - sha256 = "15fa8c7a0fb6e8d230cfe9d008101cd72d7eecbcbd1231f0c9982c20a0a73bb9"; - libraryHaskellDepends = [ base digestive-functors lucid text ]; - homepage = "http://github.com/jaspervdj/digestive-functors"; - description = "Lucid frontend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digestive-functors-lucid" = callPackage ({ mkDerivation, base, digestive-functors, lucid, text }: mkDerivation { @@ -53519,18 +51091,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "digits_0_2" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "digits"; - version = "0.2"; - sha256 = "f40437896a7866b210cdb45bfe025d65391ebf9980ea7a92206d6320e79949a3"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Converts integers to lists of digits and back"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digits" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -53883,20 +51443,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "directory-tree_0_12_0" = callPackage - ({ mkDerivation, base, directory, filepath, process }: - mkDerivation { - pname = "directory-tree"; - version = "0.12.0"; - sha256 = "ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5"; - libraryHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://brandon.si/code/directory-tree-module-released/"; - description = "A simple directory-like tree datatype, with useful IO functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "directory-tree" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -54133,7 +51679,6 @@ self: { distributed-static exceptions hashable mtl network-transport random rank1dynamic stm syb template-haskell time transformers ]; - doCheck = false; homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -54219,7 +51764,6 @@ self: { test-framework-hunit transformers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -54272,7 +51816,6 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-execution"; description = "Execution Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -54307,7 +51850,6 @@ self: { transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-extras"; description = "Cloud Haskell Extras"; license = stdenv.lib.licenses.bsd3; @@ -54489,7 +52031,6 @@ self: { unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-supervisor"; description = "Supervisors for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -54528,7 +52069,6 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-task"; description = "Task Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -54813,20 +52353,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dlist_0_7_1_2" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; - version = "0.7.1.2"; - sha256 = "332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dlist" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { @@ -54854,31 +52380,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dns_2_0_4" = callPackage - ({ mkDerivation, attoparsec, base, binary, blaze-builder - , bytestring, conduit, conduit-extra, containers, doctest, hspec - , iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.4"; - sha256 = "2b4fc61f4ccb440aa2b8403bff1ba00a87782e46b4261d34e6c1a5a1f1c71d6d"; - libraryHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - doCheck = false; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dns" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest @@ -55408,28 +52909,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dotenv_0_3_0_1" = callPackage - ({ mkDerivation, base, base-compat, hspec, megaparsec - , optparse-applicative, process, text - }: - mkDerivation { - pname = "dotenv"; - version = "0.3.0.1"; - sha256 = "b83a38f54c0be717bbc86016517a3f1ac0e1d43e6bf1ac9cb318081e9673bb2c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base base-compat megaparsec text ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - ]; - testHaskellDepends = [ base base-compat hspec megaparsec text ]; - jailbreak = true; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dotenv" = callPackage ({ mkDerivation, base, base-compat, hspec, megaparsec , optparse-applicative, process, text @@ -55838,21 +53317,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) dpkg; libdpkg = null;}; - "dpor_0_1_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, random, semigroups }: - mkDerivation { - pname = "dpor"; - version = "0.1.0.1"; - sha256 = "6000f43abf889e08e49bb5966592ad6119393277c2d528a18e5a2602119d6308"; - libraryHaskellDepends = [ - base containers deepseq random semigroups - ]; - homepage = "https://github.com/barrucadu/dejafu"; - description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dpor" = callPackage ({ mkDerivation, base, containers, deepseq, random, semigroups }: mkDerivation { @@ -57054,31 +54518,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ede_0_2_8_4" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors - , bytestring, comonad, directory, filepath, free, lens, mtl - , parsers, scientific, semigroups, tasty, tasty-golden, text - , text-format, text-manipulate, trifecta, unordered-containers - , vector - }: - mkDerivation { - pname = "ede"; - version = "0.2.8.4"; - sha256 = "f7fda7bc2d28b87fe7042adfca9fa9f7484c546142ad649dcae1d2ad4af5ae72"; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base bifunctors bytestring comonad directory - filepath free lens mtl parsers scientific semigroups text - text-format text-manipulate trifecta unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring directory tasty tasty-golden text - ]; - homepage = "http://github.com/brendanhay/ede"; - description = "Templating language with similar syntax and features to Liquid or Jinja2"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ede" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors , bytestring, comonad, directory, filepath, free, lens, mtl @@ -57620,8 +55059,8 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.0.10"; - sha256 = "bbae5b230a5fed82010d012c64fa75f3cf7a31335401df3872d79f3f786d6e90"; + version = "0.4.0.11"; + sha256 = "8cd041f6b7da4f57df1795d619f9140a071ed2adb6ed5ade1c3e899957edb603"; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core snap-server text time transformers unordered-containers @@ -57688,10 +55127,8 @@ self: { }: mkDerivation { pname = "ekg-json"; - version = "0.1.0.2"; - sha256 = "6236904ae6410eca5c0fb77a076dc6dab926178768e554fd6050544658eec7d8"; - revision = "1"; - editedCabalFile = "6e9eafd4bf78bee8fe55eca517a4a8ea0af2cb11cd418538f84edf4d4fdcde39"; + version = "0.1.0.3"; + sha256 = "3c97d423ac85903d0fed400845c29ccd39f1ca80666b09659a0238983b743317"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -57758,24 +55195,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ekg-statsd_0_2_0_4" = callPackage - ({ mkDerivation, base, bytestring, ekg-core, network, text, time - , unordered-containers - }: - mkDerivation { - pname = "ekg-statsd"; - version = "0.2.0.4"; - sha256 = "ebeddf7dd3427268a35b0dad5f716d9009b676326742b7dd005970d9ab6267f7"; - libraryHaskellDepends = [ - base bytestring ekg-core network text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/tibbe/ekg-statsd"; - description = "Push metrics to statsd"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ekg-statsd" = callPackage ({ mkDerivation, base, bytestring, ekg-core, network, text, time , unordered-containers @@ -58946,29 +56365,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "envy_1_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl - , QuickCheck, quickcheck-instances, text, time, transformers - }: - mkDerivation { - pname = "envy"; - version = "1.1.0.0"; - sha256 = "27a2496640ea74ceab5a23a3fe8ef325bfb23d64a851f5dfc18b7c3411beca99"; - revision = "1"; - editedCabalFile = "a3922d3ddac9dd572059abbc0a9af991467cf10c93d6fc579c53faa5d3d22c2e"; - libraryHaskellDepends = [ - base bytestring containers mtl text time transformers - ]; - testHaskellDepends = [ - base bytestring hspec mtl QuickCheck quickcheck-instances text time - transformers - ]; - jailbreak = true; - description = "An environmentally friendly way to deal with environment variables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "epanet-haskell" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -59938,33 +57334,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "eventstore_0_12_0_0" = callPackage - ({ mkDerivation, aeson, array, async, base, bytestring, cereal - , containers, dns, dotnet-timespan, http-client, network, protobuf - , random, semigroups, stm, tasty, tasty-hunit, text, time - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; - version = "0.12.0.0"; - sha256 = "c88c65239fd37b4ede7e291ac714384f89aaff6235d65bd41cdbc7421554fda5"; - libraryHaskellDepends = [ - aeson array async base bytestring cereal containers dns - dotnet-timespan http-client network protobuf random semigroups stm - text time unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base dotnet-timespan stm tasty tasty-hunit text time - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/YoEight/eventstore"; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "eventstore" = callPackage ({ mkDerivation, aeson, array, async, base, bytestring, cereal , connection, containers, dns, dotnet-timespan, http-client @@ -60525,26 +57894,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "expiring-cache-map_0_0_5_4" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, time - , unordered-containers - }: - mkDerivation { - pname = "expiring-cache-map"; - version = "0.0.5.4"; - sha256 = "088ec3c56e23825f8709b185a97c8e3e485f2775d7299c58e62fc5992e4e7d71"; - libraryHaskellDepends = [ - base containers hashable unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers hashable time unordered-containers - ]; - homepage = "https://github.com/elblake/expiring-cache-map"; - description = "General purpose simple caching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "expiring-cache-map" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, time , unordered-containers @@ -61709,6 +59058,7 @@ self: { servant servant-server stm text transformers wai wai-logger warp ]; testHaskellDepends = [ aeson base bytestring filepath hspec text ]; + jailbreak = true; homepage = "https://github.com/mseri/fbmessenger-api-hs#fbmessenger-api"; description = "High-level bindings to Facebook Messenger Platform API"; license = stdenv.lib.licenses.bsd3; @@ -62298,24 +59648,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fft_0_1_8_3" = callPackage - ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable - , QuickCheck, storable-complex, syb, transformers - }: - mkDerivation { - pname = "fft"; - version = "0.1.8.3"; - sha256 = "73f450978f2b1f2d6d549aa5a81aaeeadfe153bd8f3ce935690b149a036a3896"; - libraryHaskellDepends = [ - array base carray ix-shapable storable-complex syb transformers - ]; - libraryPkgconfigDepends = [ fftw fftwFloat ]; - testHaskellDepends = [ base carray QuickCheck storable-complex ]; - description = "Bindings to the FFTW library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; - "fft" = callPackage ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable , QuickCheck, storable-complex, syb, transformers @@ -62579,30 +59911,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "file-modules_0_1_2_3" = callPackage - ({ mkDerivation, async, base, directory, filepath, haskell-src-exts - , MissingH, regex-compat, regex-pcre - }: - mkDerivation { - pname = "file-modules"; - version = "0.1.2.3"; - sha256 = "e932a7087e2de523a2c9bebc4070623e6d87520ea31439377be0b1c0845b8c95"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base directory filepath haskell-src-exts MissingH - regex-compat regex-pcre - ]; - executableHaskellDepends = [ - async base directory filepath haskell-src-exts MissingH - regex-compat regex-pcre - ]; - homepage = "https://github.com/yamadapc/stack-run-auto"; - description = "Takes a Haskell source-code file and outputs its modules"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "file-modules" = callPackage ({ mkDerivation, async, base, directory, filepath, haskell-src-exts , MissingH, regex-compat, regex-pcre @@ -63741,7 +61049,6 @@ self: { sha256 = "f1964913c5bbd81748610c2f66a7aa9750b25953e6940c0933b25d4b2f1b1f62"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - doCheck = false; homepage = "https://github.com/tfausak/flow#readme"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; @@ -68119,28 +65426,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-exactprint_0_5_1_1" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filemanip - , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently - , syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.5.1.1"; - sha256 = "ab88a158b659641a1a940b1ebeaeefe8d41e53f1da2bee139914bbad21f15d8a"; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-boot ghc-paths - HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-exactprint" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filemanip , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently @@ -68238,7 +65523,6 @@ self: { process-streaming safe syb transformers ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/carlohamalainen/ghc-imported-from"; description = "Find the Haddock documentation for a symbol"; license = stdenv.lib.licenses.bsd3; @@ -68275,40 +65559,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-mod_5_5_0_0" = callPackage - ({ mkDerivation, base, binary, bytestring, cabal-helper, containers - , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath - , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec - , monad-control, monad-journal, mtl, old-time, optparse-applicative - , pipes, pretty, process, safe, split, syb, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.5.0.0"; - sha256 = "d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath ghc ghc-paths ghc-syb-utils - haskell-src-exts hlint monad-control monad-journal mtl old-time - pipes pretty process safe split syb temporary text time - transformers transformers-base - ]; - executableHaskellDepends = [ - base binary deepseq directory fclabels filepath ghc monad-control - mtl old-time optparse-applicative pretty process split time - ]; - testHaskellDepends = [ base doctest hspec ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell Programming"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-mod" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper , containers, deepseq, directory, djinn-ghc, doctest, extra @@ -68639,27 +65889,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-typelits-extra_0_1_3" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit - , transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; - version = "0.1.3"; - sha256 = "65c81dd6deca863a313ef121950753797d58affbcf1edb7627559c4ec1411fd7"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit - ]; - homepage = "http://www.clash-lang.org/"; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp @@ -68705,24 +65934,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_4_6" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.4.6"; - sha256 = "24cf8f937c88a6c3a489af8a4f2e23ee8f994eb4e5fa7fecb6942cee71bd160e"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit @@ -68891,36 +66102,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ghcid_0_6_4" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.6.4"; - sha256 = "fc43077955f9e53519b028364da0ec8bbea467b739b89ed7b2fa234a4a4b71db"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cmdargs directory extra filepath process terminal-size time - unix - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - doCheck = false; - homepage = "https://github.com/ndmitchell/ghcid#readme"; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghcid" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit @@ -68974,21 +66155,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ghcjs-dom_0_2_4_0" = callPackage - ({ mkDerivation, base, glib, gtk3, text, transformers, webkitgtk3 - }: - mkDerivation { - pname = "ghcjs-dom"; - version = "0.2.4.0"; - sha256 = "986db6b770c348d7a28368309a648626455d55e7a5705a849fd5a2981eb868a6"; - libraryHaskellDepends = [ - base glib gtk3 text transformers webkitgtk3 - ]; - description = "DOM library that supports both GHCJS and WebKitGTK"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghcjs-dom" = callPackage ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { @@ -70120,25 +67286,6 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) openssl;}; - "gio_0_13_1_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, glib - , gtk2hs-buildtools, mtl, system-glib - }: - mkDerivation { - pname = "gio"; - version = "0.13.1.1"; - sha256 = "d04d9b87b43bf12c5917ea561da403f80fe955adf735785ea8afa0915478113b"; - libraryHaskellDepends = [ - array base bytestring containers glib mtl - ]; - libraryPkgconfigDepends = [ system-glib ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to GIO"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {system-glib = pkgs.glib;}; - "gio" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers, glib , gtk2hs-buildtools, mtl, system-glib @@ -70157,29 +67304,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {system-glib = pkgs.glib;}; - "gipeda_0_2_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, containers - , directory, extra, filepath, gitlib, gitlib-libgit2, scientific - , shake, split, tagged, text, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "gipeda"; - version = "0.2.0.1"; - sha256 = "8b2e6d06a7392b5ce4956a97aa6102213b790e575516c74feeaed371e0f7e12e"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring cassava containers directory extra filepath - gitlib gitlib-libgit2 scientific shake split tagged text - unordered-containers vector yaml - ]; - jailbreak = true; - homepage = "https://github.com/nomeata/gipeda"; - description = "Git Performance Dashboard"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gipeda" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava , concurrent-output, containers, directory, extra, file-embed @@ -70291,75 +67415,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "git-annex_6_20160511" = callPackage - ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus - , directory, disk-free-space, dlist, dns, edit-distance, esqueleto - , exceptions, fdo-notify, feed, filepath, git, gnupg, gnutls - , hinotify, hslogger, http-client, http-conduit, http-types, IfElse - , json, lsof, magic, MissingH, monad-control, monad-logger - , mountpoints, mtl, network, network-info, network-multicast - , network-protocol-xmpp, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, template-haskell, text, time, torrent, transformers - , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp - , warp-tls, wget, which, xml-types, yesod, yesod-core - , yesod-default, yesod-form, yesod-static - }: - mkDerivation { - pname = "git-annex"; - version = "6.20160511"; - sha256 = "85fc8853166fe57d91dc2776d5df4acb5911a91815f8aa12881928a1afe8ba01"; - configureFlags = [ - "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" - "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" - "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" - "-fwebapp-secure" "-fwebdav" "-fxmpp" - ]; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - conduit-extra containers crypto-api cryptonite data-default DAV - dbus directory disk-free-space dlist dns edit-distance esqueleto - exceptions fdo-notify feed filepath gnutls hinotify hslogger - http-client http-conduit http-types IfElse json magic MissingH - monad-control monad-logger mountpoints mtl network network-info - network-multicast network-protocol-xmpp network-uri old-locale - optparse-applicative path-pieces persistent persistent-sqlite - persistent-template process QuickCheck random regex-tdfa resourcet - SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat utf8-string uuid wai wai-extra warp - warp-tls xml-types yesod yesod-core yesod-default yesod-form - yesod-static - ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - jailbreak = true; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; - installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; - checkPhase = "./git-annex test"; - enableSharedExecutables = false; - homepage = "http://git-annex.branchable.com/"; - description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.gpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; - "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive @@ -70777,33 +67832,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "github-backup_1_20160522" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , exceptions, filepath, git, github, hslogger, IfElse, MissingH - , mtl, network, network-uri, optparse-applicative, pretty-show - , process, text, transformers, unix, unix-compat, utf8-string - , vector - }: - mkDerivation { - pname = "github-backup"; - version = "1.20160522"; - sha256 = "da5f7c8458321e039f8634cce7ce539bf5c0464e9487072ab79a68fa074d5aa8"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base hslogger MissingH ]; - executableHaskellDepends = [ - base bytestring containers directory exceptions filepath github - hslogger IfElse MissingH mtl network network-uri - optparse-applicative pretty-show process text transformers unix - unix-compat utf8-string vector - ]; - executableToolDepends = [ git ]; - homepage = "https://github.com/joeyh/github-backup"; - description = "backs up everything github knows about a repository, to the repository"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) git;}; - "github-backup" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, MissingH @@ -71178,29 +68206,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitson_0_5_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , doctest, errors, filepath, flock, Glob, hspec, monad-control - , process, transformers - }: - mkDerivation { - pname = "gitson"; - version = "0.5.1"; - sha256 = "5efabd7b86a7866bb5179a298bccf3492b814e4c69d1b8073c63b1c1e615b29c"; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory errors filepath flock - monad-control process transformers - ]; - testHaskellDepends = [ - aeson base directory doctest Glob hspec process transformers - ]; - doCheck = false; - homepage = "https://github.com/myfreeweb/gitson"; - description = "A document store library for Git + JSON"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , conduit-combinators, conduit-extra, directory, doctest, errors @@ -71401,25 +68406,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glib_0_13_2_2" = callPackage - ({ mkDerivation, base, bytestring, containers, glib - , gtk2hs-buildtools, text, utf8-string - }: - mkDerivation { - pname = "glib"; - version = "0.13.2.2"; - sha256 = "16bc6710ac195778e514c6ba1da3b22a057854d4db0929b4835172ec42e0497f"; - libraryHaskellDepends = [ - base bytestring containers text utf8-string - ]; - libraryPkgconfigDepends = [ glib ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GLIB library for Gtk2Hs"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib;}; - "glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gtk2hs-buildtools, text, utf8-string @@ -73604,22 +70590,6 @@ self: { }) {}; "google-oauth2-jwt" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL - , RSA, text, unix-time - }: - mkDerivation { - pname = "google-oauth2-jwt"; - version = "0.1.1.1"; - sha256 = "dfd2bbee86c1965e8fb06a9933f090464c2432a2e5e0daaefa5093fd37084d12"; - libraryHaskellDepends = [ - base base64-bytestring bytestring HsOpenSSL RSA text unix-time - ]; - homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; - description = "Get a signed JWT for Google Service Accounts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "google-oauth2-jwt_0_1_2_0" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL , RSA, text, unix-time }: @@ -73633,7 +70603,6 @@ self: { homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; description = "Get a signed JWT for Google Service Accounts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-search" = callPackage @@ -73660,6 +70629,7 @@ self: { aeson base bytestring http-api-data http-client servant servant-client text transformers ]; + jailbreak = true; description = "Google Translate API bindings"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -75322,26 +72292,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk_0_14_2" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers, gio - , glib, gtk2, gtk2hs-buildtools, mtl, pango, text - }: - mkDerivation { - pname = "gtk"; - version = "0.14.2"; - sha256 = "58f780c51fe2f3e25939a048bbe7d0b880e6aeb412df2648438f926a2b7b7eb5"; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk2 ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - doHaddock = false; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; - "gtk" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text @@ -75491,27 +72441,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; - "gtk2hs-buildtools_0_13_0_5" = callPackage - ({ mkDerivation, alex, array, base, containers, directory, filepath - , happy, hashtables, pretty, process, random - }: - mkDerivation { - pname = "gtk2hs-buildtools"; - version = "0.13.0.5"; - sha256 = "d95811a505ec10e4c82f3ca81c06b317eb9d345e73b6eda7aeaebd1e868f0a93"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base containers directory filepath hashtables pretty process - random - ]; - executableToolDepends = [ alex happy ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory , filepath, happy, hashtables, pretty, process, random @@ -75665,26 +72594,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk3_0_14_2" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers, gio - , glib, gtk2hs-buildtools, gtk3, mtl, pango, text - }: - mkDerivation { - pname = "gtk3"; - version = "0.14.2"; - sha256 = "da198906bf3807e61c6d3c85c8537f424d9073d517d511d38197c569a1cb3d1d"; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk3 ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - doHaddock = false; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gtk3;}; - "gtk3" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text @@ -75796,25 +72705,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) gtksourceview;}; - "gtksourceview3_0_13_2_1" = callPackage - ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools - , gtk3, gtksourceview, mtl, text - }: - mkDerivation { - pname = "gtksourceview3"; - version = "0.13.2.1"; - sha256 = "61542fc063d948a0487c0fe784f8154d4a9ca66df3e29bbff0047843bb006ceb"; - libraryHaskellDepends = [ - array base containers glib gtk3 mtl text - ]; - libraryPkgconfigDepends = [ gtksourceview ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GtkSourceView library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gtksourceview;}; - "gtksourceview3" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib , gtk2hs-buildtools, gtk3, gtksourceview, mtl, text @@ -76145,47 +73035,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hOpenPGP_2_4_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib - , conduit, conduit-extra, containers, crypto-cipher-types - , cryptonite, data-default-class, errors, hashable - , incremental-parser, ixset-typed, lens, memory, monad-loops - , nettle, network, network-uri, newtype, openpgp-asciiarmor - , QuickCheck, quickcheck-instances, resourcet, securemem - , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text - , time, time-locale-compat, transformers, unordered-containers - , wl-pprint-extras, zlib - }: - mkDerivation { - pname = "hOpenPGP"; - version = "2.4.4"; - sha256 = "6d137b38a2a60f711fd34612849f34a1731271c6a2cc83aa57c37cfea1f5a806"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors binary - binary-conduit byteable bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite data-default-class errors - hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype openpgp-asciiarmor resourcet - securemem semigroups split text time time-locale-compat - transformers unordered-containers wl-pprint-extras zlib - ]; - testHaskellDepends = [ - aeson attoparsec base bifunctors binary binary-conduit byteable - bytestring bzlib conduit conduit-extra containers - crypto-cipher-types cryptonite data-default-class errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype QuickCheck quickcheck-instances - resourcet securemem semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unordered-containers wl-pprint-extras zlib - ]; - homepage = "http://floss.scru.org/hOpenPGP/"; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hOpenPGP" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib @@ -77451,25 +74300,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library_1_2_1" = callPackage - ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , QuickCheck, transformers - }: - mkDerivation { - pname = "haddock-library"; - version = "1.2.1"; - sha256 = "0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056"; - libraryHaskellDepends = [ base bytestring deepseq transformers ]; - testHaskellDepends = [ - base base-compat bytestring deepseq hspec QuickCheck transformers - ]; - jailbreak = true; - homepage = "http://www.haskell.org/haddock/"; - description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haddock-library" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec , QuickCheck, transformers @@ -77503,32 +74333,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddocset_0_4_1" = callPackage - ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory - , exceptions, filepath, ghc, haddock-api, http-types, mtl - , optparse-applicative, process, resourcet, sqlite-simple, tagsoup - , text, transformers - }: - mkDerivation { - pname = "haddocset"; - version = "0.4.1"; - sha256 = "b2e17cb5fc695b28cb036e524e1f58fce30953cf4f3de6fdac88e61142ae9c3e"; - revision = "1"; - editedCabalFile = "8d1369b8ba3da5fcb6661f5fc34ec23de02b79c96ed268f0db946a9ff8b5951b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal conduit conduit-extra directory exceptions filepath ghc - haddock-api http-types mtl optparse-applicative process resourcet - sqlite-simple tagsoup text transformers - ]; - jailbreak = true; - homepage = "https://github.com/philopon/haddocset"; - description = "Generate docset of Dash by Haddock haskell documentation tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haddocset" = callPackage ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory , exceptions, filepath, ghc, haddock-api, http-types, mtl @@ -78831,36 +75635,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "happstack-authenticate_2_3_4_3" = callPackage - ({ mkDerivation, acid-state, aeson, authenticate, base - , base64-bytestring, boomerang, bytestring, containers - , data-default, email-validate, filepath, happstack-hsp - , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs - , http-conduit, http-types, ixset-typed, jmacro, jwt, lens - , mime-mail, mtl, pwstore-purehaskell, random, safecopy - , shakespeare, text, time, unordered-containers, userid, web-routes - , web-routes-boomerang, web-routes-happstack, web-routes-hsp - , web-routes-th - }: - mkDerivation { - pname = "happstack-authenticate"; - version = "2.3.4.3"; - sha256 = "6029d43f6cf78e68cd88c28a8c9aefacfc6062cc4f7e798a72302ac43abecc30"; - libraryHaskellDepends = [ - acid-state aeson authenticate base base64-bytestring boomerang - bytestring containers data-default email-validate filepath - happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro - hsx2hs http-conduit http-types ixset-typed jmacro jwt lens - mime-mail mtl pwstore-purehaskell random safecopy shakespeare text - time unordered-containers userid web-routes web-routes-boomerang - web-routes-happstack web-routes-hsp web-routes-th - ]; - homepage = "http://www.happstack.com/"; - description = "Happstack Authentication Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "happstack-authenticate" = callPackage ({ mkDerivation, acid-state, aeson, authenticate, base , base64-bytestring, boomerang, bytestring, containers @@ -80629,34 +77403,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-gi_0_17_4" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , file-embed, filepath, glib, gobjectIntrospection, haskell-gi-base - , mtl, pretty-show, process, safe, text, transformers, xdg-basedir - , xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.17.4"; - sha256 = "e3c306c877f3b28e66f49b1187671233d4a3e15d0d0ed7931213624b67fb733b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers directory file-embed filepath - haskell-gi-base mtl pretty-show process safe text transformers - xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - jailbreak = true; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "haskell-gi" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl @@ -80683,20 +77429,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "haskell-gi-base_0_17" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.17"; - sha256 = "fba8d755d1772cd0e01f7e8e7ac939d5bde9646d6493516c561484853ff77b76"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - homepage = "https://github.com/haskell-gi/haskell-gi-base"; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib;}; - "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -80817,18 +77549,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lexer_1_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "haskell-lexer"; - version = "1.0"; - sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86"; - libraryHaskellDepends = [ base ]; - description = "A fully compliant Haskell 98 lexer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-lexer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -82252,38 +78972,6 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable - , bytestring, conduit, containers, cryptohash, deepseq, either - , entropy, HUnit, largeword, mtl, murmur3, network, pbkdf - , QuickCheck, safe, scientific, secp256k1, split - , string-conversions, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "haskoin-core"; - version = "0.3.1"; - sha256 = "3257afb81053b70a4740fb483653ce23bf6d7824d2eafc4f6747dfaf2aa9f32b"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary byteable bytestring conduit - containers cryptohash deepseq either entropy largeword mtl murmur3 - network pbkdf QuickCheck secp256k1 split string-conversions text - time vector - ]; - testHaskellDepends = [ - aeson base binary bytestring containers HUnit largeword mtl - QuickCheck safe scientific secp256k1 split string-conversions - test-framework test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector - ]; - doCheck = false; - homepage = "http://github.com/haskoin/haskoin"; - description = "Implementation of the core Bitcoin protocol features"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskoin-core_0_4_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable , bytestring, cereal, conduit, containers, cryptohash, deepseq , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf @@ -82308,6 +78996,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; + doCheck = false; homepage = "http://github.com/haskoin/haskoin"; description = "Implementation of the core Bitcoin protocol features"; license = stdenv.lib.licenses.publicDomain; @@ -82724,37 +79413,6 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) aspell;}; - "hasql_0_19_14" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, contravariant-extras - , data-default-class, dlist, either, hashable, hashtables, loch-th - , mtl, placeholders, postgresql-binary, postgresql-libpq - , profunctors, QuickCheck, quickcheck-instances, rebase, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "hasql"; - version = "0.19.14"; - sha256 = "e30cfa9d2d037927937ffabf489acef88412f30e3b122de6324e09503c957a35"; - libraryHaskellDepends = [ - aeson attoparsec base base-prelude bytestring - bytestring-tree-builder contravariant contravariant-extras - data-default-class dlist either hashable hashtables loch-th mtl - placeholders postgresql-binary postgresql-libpq profunctors - scientific semigroups text time transformers uuid vector - ]; - testHaskellDepends = [ - data-default-class QuickCheck quickcheck-instances rebase tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - doCheck = false; - homepage = "https://github.com/nikita-volkov/hasql"; - description = "A very efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hasql" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras @@ -83424,28 +80082,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haxr_3000_11_1_6" = callPackage - ({ mkDerivation, array, base, base-compat, base64-bytestring - , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams - , http-types, io-streams, mtl, mtl-compat, network, network-uri - , old-locale, old-time, template-haskell, time, utf8-string - }: - mkDerivation { - pname = "haxr"; - version = "3000.11.1.6"; - sha256 = "25b758d83061f35e90a07ad296f827762b61639a5eb81e60326a9de96d63351d"; - libraryHaskellDepends = [ - array base base-compat base64-bytestring blaze-builder bytestring - HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat - network network-uri old-locale old-time template-haskell time - utf8-string - ]; - homepage = "http://www.haskell.org/haskellwiki/HaXR"; - description = "XML-RPC client and server library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haxr" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams @@ -83936,24 +80572,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {bluetooth = null; inherit (pkgs) cwiid;}; - "hdaemonize_0_5_0_2" = callPackage - ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog - , mtl, unix - }: - mkDerivation { - pname = "hdaemonize"; - version = "0.5.0.2"; - sha256 = "55cd4ff1dd4ca4fd00f450db3964639c5cc5e98f33f1b3d45c8c3f2d485953ae"; - libraryHaskellDepends = [ - base extensible-exceptions filepath hsyslog mtl unix - ]; - jailbreak = true; - homepage = "http://github.com/greydot/hdaemonize"; - description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hdaemonize" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions, filepath , hsyslog, mtl, unix @@ -84154,27 +80772,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hdevtools_0_1_3_2" = callPackage - ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc - , ghc-boot, ghc-paths, network, process, syb, time, transformers - , unix - }: - mkDerivation { - pname = "hdevtools"; - version = "0.1.3.2"; - sha256 = "f35932f3846badcd06a98beb62533bce20518b2ba52c0898ba120d46b32f9c48"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths - network process syb time transformers unix - ]; - homepage = "https://github.com/hdevtools/hdevtools/"; - description = "Persistent GHC powered background server for FAST haskell development tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hdevtools" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc , ghc-boot, ghc-paths, network, process, syb, time, transformers @@ -84517,30 +81114,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hedis_0_6_10" = callPackage - ({ mkDerivation, attoparsec, base, BoundedChan, bytestring - , bytestring-lexing, HUnit, mtl, network, resource-pool - , test-framework, test-framework-hunit, time, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.6.10"; - sha256 = "31974bfd8e891a4b54a444dcc86dfdac83875e0c3c5933648884230db72a895d"; - libraryHaskellDepends = [ - attoparsec base BoundedChan bytestring bytestring-lexing mtl - network resource-pool time vector - ]; - testHaskellDepends = [ - base bytestring HUnit mtl test-framework test-framework-hunit time - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/informatikr/hedis"; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hedis" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, HUnit, mtl, network, resource-pool, scanner @@ -84713,30 +81286,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "heist_0_14_1_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, containers, directory, directory-tree, dlist, either - , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl - , process, random, text, time, transformers, unordered-containers - , vector, xmlhtml - }: - mkDerivation { - pname = "heist"; - version = "0.14.1.4"; - sha256 = "debf008e68310d7e494560ebf7226693e5bc6820be39b6dae91f965805cf5fc9"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - containers directory directory-tree dlist either filepath hashable - map-syntax MonadCatchIO-transformers mtl process random text time - transformers unordered-containers vector xmlhtml - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "An Haskell template system supporting both HTML5 and XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "heist" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder , blaze-html, bytestring, containers, criterion, directory @@ -86961,28 +83510,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hint_0_5_2" = callPackage - ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-paths, HUnit, mtl, random, unix - }: - mkDerivation { - pname = "hint"; - version = "0.5.2"; - sha256 = "b988ddf97c01dcfe21d3db97e4de94f8a9eeed645cc89ed0471f977b1fa22c0f"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-paths mtl random unix - ]; - testHaskellDepends = [ - base directory exceptions extensible-exceptions filepath HUnit - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/mvdan/hint"; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hint" = callPackage ({ mkDerivation, base, directory, exceptions, extensible-exceptions , filepath, ghc, ghc-paths, HUnit, mtl, random, unix @@ -87466,29 +83993,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hjsmin_0_2_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , language-javascript, optparse-applicative, text - }: - mkDerivation { - pname = "hjsmin"; - version = "0.2.0.1"; - sha256 = "333e13cfd2b00f0ebeddf08aa9f0ed5ca689dcc21224cd0d9e6416e50fe1acae"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers language-javascript text - ]; - executableHaskellDepends = [ - base blaze-builder bytestring containers language-javascript - optparse-applicative text - ]; - homepage = "http://github.com/erikd/hjsmin"; - description = "Haskell implementation of a javascript minifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hjsmin" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , language-javascript, optparse-applicative, text @@ -87677,48 +84181,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hledger_0_27" = callPackage - ({ mkDerivation, base, base-compat, cmdargs, containers, csv - , directory, filepath, haskeline, hledger-lib, HUnit, mtl - , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , safe, shakespeare, split, tabular, terminfo, test-framework - , test-framework-hunit, text, time, unordered-containers - , utf8-string, wizards - }: - mkDerivation { - pname = "hledger"; - version = "0.27"; - sha256 = "0aecdf586a46c24d6d67659157d1edbfc0d78afb50ea7cfbec1a01bf86b792b0"; - revision = "2"; - editedCabalFile = "11f159f1c15ef44a6989491ab9fb921163fdf6107ef5f2dd6046ee143a42909a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - executableHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - testHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string wizards - ]; - jailbreak = true; - homepage = "http://hledger.org"; - description = "Command-line interface for the hledger accounting tool"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger" = callPackage ({ mkDerivation, base, base-compat, cmdargs, containers, csv , directory, filepath, haskeline, hledger-lib, HUnit, mtl @@ -87827,37 +84289,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hledger-lib_0_27" = callPackage - ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring - , cmdargs, containers, csv, Decimal, deepseq, directory, filepath - , HUnit, mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa - , safe, split, test-framework, test-framework-hunit, time - , transformers, uglymemo, utf8-string - }: - mkDerivation { - pname = "hledger-lib"; - version = "0.27"; - sha256 = "77c47900106e65411743097cd0855b5484e1439b0de4c5ee6d2a0c5748672606"; - revision = "3"; - editedCabalFile = "6b734f07bdc0e658c035d982fdbb6fc2e8cf27b76fdf52485c230f146e51feb1"; - libraryHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split time transformers - uglymemo utf8-string - ]; - testHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split test-framework - test-framework-hunit time transformers uglymemo utf8-string - ]; - homepage = "http://hledger.org"; - description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger-lib" = callPackage ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, Decimal, deepseq, directory, filepath @@ -87886,31 +84317,6 @@ self: { license = "GPL"; }) {}; - "hledger-ui_0_27_4" = callPackage - ({ mkDerivation, base, base-compat, brick, cmdargs, containers - , data-default, filepath, hledger, hledger-lib, HUnit, lens - , pretty-show, safe, split, time, transformers, vector, vty - }: - mkDerivation { - pname = "hledger-ui"; - version = "0.27.4"; - sha256 = "c99544721f630fb561f5f44e9b0295db991b59a6222b66f38696fef90fec377d"; - revision = "1"; - editedCabalFile = "81550a378ff933ffa25d68417b3d62f895197c7b36b363a0e95fb25bf35dbdcd"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base base-compat brick cmdargs containers data-default filepath - hledger hledger-lib HUnit lens pretty-show safe split time - transformers vector vty - ]; - jailbreak = true; - homepage = "http://hledger.org"; - description = "Curses-style user interface for the hledger accounting tool"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger-ui" = callPackage ({ mkDerivation, base, base-compat, brick, cmdargs, containers , data-default, filepath, hledger, hledger-lib, HUnit, lens @@ -89544,7 +85950,6 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; - doCheck = false; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -89733,37 +86138,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {OpenCL = null;}; - "hopenpgp-tools_0_18" = callPackage - ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec - , base, base16-bytestring, binary, binary-conduit, bytestring - , conduit, conduit-extra, containers, crypto-pubkey, cryptohash - , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset-typed - , lens, monad-loops, openpgp-asciiarmor, optparse-applicative - , resourcet, text, time, time-locale-compat, transformers - , unordered-containers, wl-pprint-extras, wl-pprint-terminfo, yaml - }: - mkDerivation { - pname = "hopenpgp-tools"; - version = "0.18"; - sha256 = "e13fa9cbf0f725f026e781c8d4d83b05a5b4bd126d276085152adc0a88c93f76"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson ansi-wl-pprint array attoparsec base base16-bytestring binary - binary-conduit bytestring conduit conduit-extra containers - crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP - ixset-typed lens monad-loops openpgp-asciiarmor - optparse-applicative resourcet text time time-locale-compat - transformers unordered-containers wl-pprint-extras - wl-pprint-terminfo yaml - ]; - executableToolDepends = [ alex happy ]; - homepage = "http://floss.scru.org/hopenpgp-tools"; - description = "hOpenPGP-based command-line tools"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hopenpgp-tools" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec , base, base16-bytestring, binary, binary-conduit, bytestring @@ -90553,33 +86927,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpc-coveralls_1_0_4" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs - , containers, curl, directory, directory-tree, hpc, HUnit, process - , pureMD5, regex-posix, retry, safe, split, transformers - }: - mkDerivation { - pname = "hpc-coveralls"; - version = "1.0.4"; - sha256 = "32f3f4104044a8ec16efe0a0846baf6eba48672eb9302e6dd9463e94b522fe00"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal cmdargs containers curl directory - directory-tree hpc process pureMD5 retry safe split transformers - ]; - executableHaskellDepends = [ - aeson async base bytestring Cabal cmdargs containers curl directory - directory-tree hpc process pureMD5 regex-posix retry safe split - transformers - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; - description = "Coveralls.io support for Haskell."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -90800,36 +87147,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hprotoc_2_2_0" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, filepath, haskell-src-exts, mtl, parsec - , protocol-buffers, protocol-buffers-descriptor, utf8-string - }: - mkDerivation { - pname = "hprotoc"; - version = "2.2.0"; - sha256 = "12461b7b11b90486f7b40cd21d3839f089695341e090eeac3a6fb85e715b50be"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - executableToolDepends = [ alex ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hprotoc" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec @@ -91086,27 +87403,6 @@ self: { }) {}; "hruby" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck - , ruby, scientific, stm, text, unordered-containers, vector - }: - mkDerivation { - pname = "hruby"; - version = "0.3.4.1"; - sha256 = "97407042cf3dc2a7c9310c4040a5ab599e03709ad70cc5d2bcfcf866a6120be6"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring scientific stm text - unordered-containers vector - ]; - librarySystemDepends = [ ruby ]; - testHaskellDepends = [ - aeson attoparsec base QuickCheck text vector - ]; - description = "Embed a Ruby intepreter in your Haskell program !"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) ruby;}; - - "hruby_0_3_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck , ruby, scientific, stm, text, unordered-containers, vector }: @@ -92508,8 +88804,6 @@ self: { aeson aeson-lens async base containers data-default deepseq directory filepath hformat hspec lens mtl text ]; - doHaddock = false; - doCheck = false; homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; @@ -93605,23 +89899,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-megaparsec_0_1_1" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "0.1.1"; - sha256 = "4ff4683bdff9a3b0ba8a6ee1adfce01f30f8515f9db487b062e5e00e5a2795c5"; - revision = "1"; - editedCabalFile = "b5268defe9e8230440bef693c63fb7a22e1ff53b39373a040fb511714056cfb8"; - libraryHaskellDepends = [ base hspec-expectations megaparsec ]; - testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; - jailbreak = true; - homepage = "https://github.com/mrkkrp/hspec-megaparsec"; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-megaparsec" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec @@ -93784,31 +90061,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-snap_0_4_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , digestive-functors, directory, HandsomeSoup, hspec, hspec-core - , hxt, lens, mtl, snap, snap-core, text, transformers - }: - mkDerivation { - pname = "hspec-snap"; - version = "0.4.0.1"; - sha256 = "42fead47290131c3072453aee3883b7c4a7a34d5dde989ca6e0b9df8b3e08d3a"; - libraryHaskellDepends = [ - aeson base bytestring containers digestive-functors HandsomeSoup - hspec hspec-core hxt lens mtl snap snap-core text transformers - ]; - testHaskellDepends = [ - aeson base bytestring containers digestive-functors directory - HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text - transformers - ]; - jailbreak = true; - homepage = "https://github.com/dbp/hspec-snap"; - description = "A library for testing with Hspec and the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core @@ -93943,25 +90195,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-webdriver_1_1_0" = callPackage - ({ mkDerivation, base, data-default, hashable, hspec, hspec-core - , HUnit, lifted-base, stm, text, transformers, unordered-containers - , webdriver - }: - mkDerivation { - pname = "hspec-webdriver"; - version = "1.1.0"; - sha256 = "42c890d5f5c20f1e4eb7c21a5c33cab13adcc609e17f71495a136710186a6e69"; - libraryHaskellDepends = [ - base data-default hashable hspec hspec-core HUnit lifted-base stm - text transformers unordered-containers webdriver - ]; - homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; - description = "Write end2end web application tests using webdriver and hspec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-webdriver" = callPackage ({ mkDerivation, aeson, base, data-default, hashable, hspec , hspec-core, HUnit, lifted-base, stm, text, transformers @@ -94691,21 +90924,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hsyslog_2_0" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "hsyslog"; - version = "2.0"; - sha256 = "f80e8cbab80388941588836e58dbb355898eb44f3f628867dc6b109b1f4a660b"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/peti/hsyslog"; - description = "FFI interface to syslog(3) from POSIX.1-2001"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - "hsyslog" = callPackage ({ mkDerivation, base, bytestring, QuickCheck }: mkDerivation { @@ -94750,25 +90968,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {com_err = null; zephyr = null;}; - "htaglib_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, HUnit - , taglib, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "htaglib"; - version = "1.0.3"; - sha256 = "b6e1a3d8e93c01fc626dea3a020b5ad4418eb8dede2210491eee43a85a99ea9b"; - libraryHaskellDepends = [ base bytestring text ]; - librarySystemDepends = [ taglib ]; - testHaskellDepends = [ - base directory filepath HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/mrkkrp/htaglib"; - description = "Bindings to TagLib, audio meta-data library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) taglib;}; - "htaglib" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , taglib, text @@ -95248,37 +91447,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client_0_4_31" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, exceptions, filepath - , ghc-prim, hspec, http-types, mime-types, monad-control, network - , network-uri, random, streaming-commons, text, time, transformers - , zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.4.31"; - sha256 = "3f3693508bd4099159f183d6bb8432d6b7a654f1d7ddf9b167a3372a91463b74"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - exceptions filepath ghc-prim http-types mime-types network - network-uri random streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie @@ -95309,7 +91477,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_1" = callPackage + "http-client_0_5_3_2" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -95318,8 +91486,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.1"; - sha256 = "0d012a1278b2f2014f0198e38b658fb414e5dafd37388008198ac7a553f84d96"; + version = "0.5.3.2"; + sha256 = "cda16be6802d2b65b410090225e5143e4516527e4732b3664dd416297aef5292"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -95418,6 +91586,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-openssl_0_2_0_4" = callPackage + ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types + , network + }: + mkDerivation { + pname = "http-client-openssl"; + version = "0.2.0.4"; + sha256 = "28dddd694ed91174c2544dd388d3550df5c79d5cc4be7e4b260a825ebde1afed"; + libraryHaskellDepends = [ base HsOpenSSL http-client network ]; + testHaskellDepends = [ + base HsOpenSSL hspec http-client http-types + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the OpenSSL library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-request-modifiers" = callPackage ({ mkDerivation, base, bytestring, exceptions, http-client , http-media, http-types, network, network-uri @@ -95489,15 +91676,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client-tls_0_3_1" = callPackage + "http-client-tls_0_3_1_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , cryptonite, data-default-class, hspec, http-client, http-types , memory, network, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.1"; - sha256 = "681aab193582fee5da6cd2e278b8e2ac9e3fc1d24cacc4834307b97f4d6de552"; + version = "0.3.1.1"; + sha256 = "a724fd0dfca81c1454834a888e637c27aeb77a3efc26de06718080cb3cc52af3"; libraryHaskellDepends = [ base bytestring case-insensitive connection cryptonite data-default-class http-client http-types memory network tls @@ -95560,7 +91747,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-conduit_2_2_1" = callPackage + "http-conduit_2_2_2" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -95570,8 +91757,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.1"; - sha256 = "95bf2c3bd641f5e8bbd4bc639618c44a39765f990231d9c1a02b9f76d1600754"; + version = "2.2.2"; + sha256 = "220fd5f41fa8b91479ed9480402a4cf92cd2ae569811f2b8ac81cb11e2808f04"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -95761,28 +91948,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-link-header_1_0_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-conversion, errors, hspec, hspec-attoparsec - , network-uri, QuickCheck, text - }: - mkDerivation { - pname = "http-link-header"; - version = "1.0.1"; - sha256 = "908bb3356d3fe24615f5498c6dca1075f76f01e034838538a3c4b0ccc342e9b7"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion errors network-uri - text - ]; - testHaskellDepends = [ - base hspec hspec-attoparsec QuickCheck text - ]; - homepage = "https://github.com/myfreeweb/http-link-header"; - description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-link-header" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, errors, hspec, hspec-attoparsec @@ -95926,34 +92091,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-reverse-proxy_0_4_3" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, containers - , data-default-class, hspec, http-client, http-conduit, http-types - , lifted-base, monad-control, network, resourcet, streaming-commons - , text, transformers, wai, wai-logger, warp, word8 - }: - mkDerivation { - pname = "http-reverse-proxy"; - version = "0.4.3"; - sha256 = "4776b8bc59dfc889ce932223f07f236be89840c3c47cb91b7fd3fb47d1cddf45"; - libraryHaskellDepends = [ - async base blaze-builder bytestring case-insensitive conduit - conduit-extra containers data-default-class http-client http-types - lifted-base monad-control network resourcet streaming-commons text - transformers wai wai-logger word8 - ]; - testHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra hspec - http-conduit http-types lifted-base network resourcet - streaming-commons transformers wai warp - ]; - homepage = "https://github.com/fpco/http-reverse-proxy"; - description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-reverse-proxy" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, containers @@ -96009,40 +92146,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-streams_0_8_3_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations - , http-common, HUnit, io-streams, MonadCatchIO-transformers, mtl - , network, network-uri, openssl-streams, snap-core, snap-server - , system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.3.3"; - sha256 = "3f4597936490ab1ca12af71578a7c6fe6c4aa9f3d0936de88c7f83475593e232"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory HsOpenSSL http-common io-streams mtl - network network-uri openssl-streams text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams - MonadCatchIO-transformers mtl network network-uri openssl-streams - snap-core snap-server system-fileio system-filepath text - transformers unordered-containers - ]; - jailbreak = true; - homepage = "http://research.operationaldynamics.com/projects/http-streams/"; - description = "An HTTP client using io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-streams" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, blaze-builder, bytestring, case-insensitive @@ -96150,30 +92253,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http2_1_6_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , bytestring-builder, case-insensitive, containers, directory - , doctest, filepath, Glob, hex, hspec, psqueues, stm, text - , unordered-containers, vector, word8 - }: - mkDerivation { - pname = "http2"; - version = "1.6.1"; - sha256 = "0f69321514c5de49a0a796dcf40decc5781bcb4d53618f4e977be4eb05a88055"; - libraryHaskellDepends = [ - array base bytestring bytestring-builder case-insensitive - containers psqueues stm - ]; - testHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - case-insensitive containers directory doctest filepath Glob hex - hspec psqueues stm text unordered-containers vector word8 - ]; - description = "HTTP/2.0 library including frames and HPACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, case-insensitive, containers, directory @@ -96505,20 +92584,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_0_3_0_1" = callPackage - ({ mkDerivation, base, dejafu, exceptions, HUnit }: - mkDerivation { - pname = "hunit-dejafu"; - version = "0.3.0.1"; - sha256 = "77fbda0fe00b5463fcc59fb3402169679294aab30fa8a57d57e667fefa64eb33"; - libraryHaskellDepends = [ base dejafu exceptions HUnit ]; - jailbreak = true; - homepage = "https://github.com/barrucadu/dejafu"; - description = "Deja Fu support for the HUnit test framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hunit-dejafu" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { @@ -96818,27 +92883,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hw-bits_0_0_0_6" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap - , parsec, QuickCheck, resourcet, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.0.0.6"; - sha256 = "8cfe76cdfe568fb392abe90e1f362c340d32729baa47c113d027657c85ef6c37"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; - executableHaskellDepends = [ - base criterion mmap resourcet vector - ]; - testHaskellDepends = [ base hspec QuickCheck vector ]; - homepage = "http://github.com/haskell-works/hw-bits#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap , parsec, QuickCheck, resourcet, vector @@ -96883,23 +92927,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-diagnostics_0_0_0_2" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.2"; - sha256 = "f90d28865ebd4fd0116270a47ed13f6b2a91255b8ec71c6d04a1cd5675237569"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-diagnostics" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -96916,37 +92943,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json_0_0_0_2" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, conduit - , containers, criterion, hspec, hw-bits, hw-conduit, hw-diagnostics - , hw-parser, hw-prim, hw-rankselect, mmap, mono-traversable, parsec - , QuickCheck, resourcet, text, transformers, vector, word8 - }: - mkDerivation { - pname = "hw-json"; - version = "0.0.0.2"; - sha256 = "b1205920d0b1ef4046a0d5ff4513d9d6b4ca952e080b7608b9de85b67d38b3fa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array attoparsec base bytestring conduit containers hw-bits - hw-conduit hw-parser hw-prim hw-rankselect mono-traversable - resourcet text vector word8 - ]; - executableHaskellDepends = [ - base bytestring conduit criterion hw-bits hw-conduit hw-diagnostics - hw-prim hw-rankselect mmap resourcet vector - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit hspec hw-bits hw-conduit hw-prim - hw-rankselect mmap parsec QuickCheck resourcet transformers vector - ]; - homepage = "http://github.com/haskell-works/hw-json#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, conduit, containers, criterion, errors, hspec @@ -97012,27 +93008,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_0_0_10" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, random - , vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.0.0.10"; - sha256 = "641a1da0488664d12438f396f08577e02f9ca43b53a6f00e52085f63a5ab776e"; - revision = "1"; - editedCabalFile = "6d483e45f5a7b11173cfe33c92acfd22e54c715378d7bd56ccf509b9110ac6f4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring random vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-prim" = callPackage ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck , random, vector @@ -97053,26 +93028,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_0_0_2" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.0.0.2"; - sha256 = "ad79b1fca42093c3db8c7196ab144a2a618c22e4368cc5ccf0d548a15fdc186a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hw-bits hw-prim vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-rankselect#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-rankselect" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector }: @@ -97380,19 +93335,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hxt-css_0_1_0_2" = callPackage - ({ mkDerivation, base, hxt, parsec, split }: - mkDerivation { - pname = "hxt-css"; - version = "0.1.0.2"; - sha256 = "c3adfe73846b1274249835c142174dfc88167029be350761ec46cd97dc39c672"; - libraryHaskellDepends = [ base hxt parsec split ]; - homepage = "https://github.com/redneb/hxt-css"; - description = "CSS selectors for HXT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hxt-css" = callPackage ({ mkDerivation, base, hxt, parsec, split }: mkDerivation { @@ -98242,6 +94184,8 @@ self: { pname = "i18n"; version = "0.4.0.0"; sha256 = "7e0df375883fb3428b0cd20aac1163ea38de80fd3499ec3007979b36fe2f93fa"; + revision = "1"; + editedCabalFile = "af77b0f384e54fb72e7c4e757cff397ab4b6743c982c6f2349e2844aac8bb1eb"; libraryHaskellDepends = [ base containers directory filepath mtl parsec text transformers ]; @@ -98423,7 +94367,6 @@ self: { test-framework test-framework-hunit text unix utf8-string ]; jailbreak = true; - doCheck = false; description = "An IDE backend library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -98646,50 +94589,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "idris_0_11_2" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal - , ansi-wl-pprint, async, base, base64-bytestring, binary - , blaze-html, blaze-markup, bytestring, cheapskate, containers - , deepseq, directory, filepath, fingertree, fsnotify, gmp - , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, safe, split, terminal-size, text, time - , transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector - , vector-binary-instances, zip-archive - }: - mkDerivation { - pname = "idris"; - version = "0.11.2"; - sha256 = "4120eec85e07dc9e96835fc5226f4d8044b2401c0c007987465d906db7773fad"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint async base - base64-bytestring binary blaze-html blaze-markup bytestring - cheapskate containers deepseq directory filepath fingertree - fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process safe split terminal-size text time - transformers transformers-compat trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances - zip-archive - ]; - librarySystemDepends = [ gmp ]; - executableHaskellDepends = [ - base directory filepath haskeline transformers - ]; - testHaskellDepends = [ - base containers directory filepath haskeline process time - transformers - ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gmp;}; - "idris" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary @@ -98837,30 +94736,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ig_0_7" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, crypto-api, cryptohash - , cryptohash-cryptoapi, data-default, http-conduit, http-types - , lifted-base, monad-control, resourcet, text, time, transformers - , transformers-base, unordered-containers - }: - mkDerivation { - pname = "ig"; - version = "0.7"; - sha256 = "31763aae55c9cfa47a8f3f8e04ba0b91adb4b6aa5f92e3401208205b873d5c55"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - crypto-api cryptohash cryptohash-cryptoapi data-default - http-conduit http-types lifted-base monad-control resourcet text - time transformers transformers-base unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/prowdsponsor/ig"; - description = "Bindings to Instagram's API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ig" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, crypto-api, cryptohash @@ -98994,7 +94869,6 @@ self: { utf8-string uuid vector ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -100321,31 +96195,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "inline-c_0_5_5_5" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring - , containers, cryptohash, directory, filepath, hashable, hspec, mtl - , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix - , template-haskell, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "inline-c"; - version = "0.5.5.5"; - sha256 = "f3d142647eaa89b6fc4833fbb5722172ab950f6ef17f186659e947b1958c7230"; - libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring containers cryptohash - directory filepath hashable mtl parsec parsers QuickCheck - template-haskell transformers unordered-containers vector - ]; - testHaskellDepends = [ - ansi-wl-pprint base containers hashable hspec parsers QuickCheck - raw-strings-qq regex-posix template-haskell transformers - unordered-containers vector - ]; - description = "Write Haskell source files including C code inline. No FFI required."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "inline-c" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, hashable, hspec, mtl @@ -100418,38 +96267,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {jvm = null;}; - "inline-r_0_8_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, c2hs, containers - , data-default-class, deepseq, directory, exceptions, filepath - , ieee754, mtl, pretty, primitive, process, quickcheck-assertions - , R, reflection, setenv, silently, singletons, strict, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, th-lift - , th-orphans, transformers, unix, vector - }: - mkDerivation { - pname = "inline-r"; - version = "0.8.0.1"; - sha256 = "4ce2363046cb3173e00e1f60fe666e539d88ab61a4a3d5eb06d550dba0f41e61"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default-class deepseq - exceptions mtl pretty primitive process reflection setenv - singletons template-haskell text th-lift th-orphans transformers - unix vector - ]; - libraryPkgconfigDepends = [ R ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bytestring directory filepath ieee754 mtl process - quickcheck-assertions silently singletons strict tasty - tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck - template-haskell temporary text unix vector - ]; - description = "Seamlessly call R from Haskell and vice versa. No FFI required."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) R;}; - "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, c2hs, containers , data-default-class, deepseq, directory, exceptions, filepath @@ -101128,28 +96945,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "invariant_0_3_1" = callPackage - ({ mkDerivation, array, base, bifunctors, containers, contravariant - , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar - , stm, tagged, template-haskell, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.3.1"; - sha256 = "db88ce3955ba99cec99dd1da2d917ce26c204837a6779712dd55f79cc873fdff"; - libraryHaskellDepends = [ - array base bifunctors containers contravariant ghc-prim profunctors - semigroups StateVar stm tagged template-haskell transformers - transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/nfrisby/invariant-functors"; - description = "Haskell 98 invariant functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, profunctors, QuickCheck @@ -101697,25 +97492,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "irc-client_0_3_0_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.3.0.0"; - sha256 = "ddc97ede9d741130d9ee0ff5128550ae9a5f6f4a04f4cb3b0d5c05c887314e0c"; - 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 = stdenv.lib.platforms.none; - }) {}; - "irc-client" = callPackage ({ mkDerivation, base, bytestring, conduit, irc-conduit, irc-ctcp , old-locale, stm, stm-conduit, text, time, transformers @@ -101744,25 +97520,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "irc-conduit_0_1_2_0" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls - , transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.1.2.0"; - sha256 = "77aea49a8efdbd8dc405d8a9ed4afddb11c906136bd3c8ec3bd32e981d0a84d7"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls text time tls transformers x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-conduit" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls @@ -101811,31 +97568,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-dcc_1_2_1" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, errors - , hspec-attoparsec, io-streams, iproute, irc-ctcp, network, path - , tasty, tasty-hspec, transformers, utf8-string - }: - mkDerivation { - pname = "irc-dcc"; - version = "1.2.1"; - sha256 = "b348e0b921c27e2f29188b5604e0185cec9b0f0da36e24cad920ec1a33f5c512"; - revision = "1"; - editedCabalFile = "cf27bbf57c87862fc6c854c916815a72633983daf6405a77abe8979704a4e76b"; - libraryHaskellDepends = [ - attoparsec base binary bytestring errors io-streams iproute - irc-ctcp network path transformers utf8-string - ]; - testHaskellDepends = [ - attoparsec base binary bytestring hspec-attoparsec iproute irc-ctcp - network path tasty tasty-hspec utf8-string - ]; - homepage = "https://github.com/JanGe/irc-dcc"; - description = "A DCC message parsing and helper library for IRC clients"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-dcc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, errors , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network @@ -102767,7 +98499,6 @@ self: { testHaskellDepends = [ base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103418,7 +99149,6 @@ self: { aeson aeson-qq base bytestring cryptonite doctest either hspec HUnit memory mtl QuickCheck text unordered-containers vector ]; - doCheck = false; homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; @@ -103461,21 +99191,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "js-jquery_1_12_4" = callPackage - ({ mkDerivation, base, HTTP }: - mkDerivation { - pname = "js-jquery"; - version = "1.12.4"; - sha256 = "6038b72113932bec21c89293fb5f7e23621d03e315596986d9feab34a159ffdb"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HTTP ]; - doCheck = false; - homepage = "https://github.com/ndmitchell/js-jquery#readme"; - description = "Obtain minified jQuery code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "js-jquery" = callPackage ({ mkDerivation, base, HTTP }: mkDerivation { @@ -103490,30 +99205,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jsaddle_0_3_0_3" = callPackage - ({ mkDerivation, base, doctest, glib, gtk3, lens, QuickCheck - , template-haskell, text, transformers, vector, webkitgtk3 - , webkitgtk3-javascriptcore - }: - mkDerivation { - pname = "jsaddle"; - version = "0.3.0.3"; - sha256 = "8dcb54c32c281409da90e7d155913bfae5da1a2f4c71b409f70290c5f5ba2c89"; - libraryHaskellDepends = [ - base glib gtk3 lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore - ]; - testHaskellDepends = [ - base doctest glib gtk3 QuickCheck text vector webkitgtk3 - webkitgtk3-javascriptcore - ]; - jailbreak = true; - doCheck = false; - description = "High level interface for webkit-javascriptcore"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "jsaddle" = callPackage ({ mkDerivation, base, doctest, gi-glib, gi-gtk, gi-javascriptcore , gi-webkit, haskell-gi-base, lens, QuickCheck, template-haskell @@ -104608,26 +100299,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "kan-extensions_4_2_3" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, mtl, semigroupoids, tagged - , transformers - }: - mkDerivation { - pname = "kan-extensions"; - version = "4.2.3"; - sha256 = "334f0edbbf08ebf93c9f7db5473086dcababc6a72d75fa9d8e43237f9b5adc47"; - libraryHaskellDepends = [ - adjunctions array base comonad containers contravariant - distributive free mtl semigroupoids tagged transformers - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/kan-extensions/"; - description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "kan-extensions" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , contravariant, distributive, free, mtl, semigroupoids, tagged @@ -104802,38 +100473,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_2_0_0" = callPackage - ({ mkDerivation, aeson, auto-update, base, bytestring, containers - , directory, either, exceptions, hostname, microlens, microlens-th - , monad-control, mtl, old-locale, quickcheck-instances - , regex-tdfa-rc, resourcet, string-conv, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.2.0.0"; - sha256 = "bd947874e92da876603c1cbb3bc521e8f33cd08a59c2714d0e35e8dd15ad53b9"; - libraryHaskellDepends = [ - aeson auto-update base bytestring containers either exceptions - hostname microlens microlens-th monad-control mtl old-locale - resourcet string-conv template-haskell text time time-locale-compat - transformers transformers-base transformers-compat unix - unordered-containers - ]; - testHaskellDepends = [ - aeson base directory quickcheck-instances regex-tdfa-rc tasty - tasty-hunit tasty-quickcheck template-haskell temporary text time - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "katip" = callPackage ({ mkDerivation, aeson, auto-update, base, bytestring, containers , directory, either, exceptions, hostname, microlens, microlens-th @@ -104865,34 +100504,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "katip-elasticsearch_0_2_1_0" = callPackage - ({ mkDerivation, aeson, async, base, bloodhound, containers - , enclosed-exceptions, exceptions, http-client, http-types, katip - , lens, lens-aeson, quickcheck-instances, retry, scientific, stm - , stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "katip-elasticsearch"; - version = "0.2.1.0"; - sha256 = "e00a3d10cf1b7ed9f2f4346c59a992bc5955d1da90d4cc93f9edacc56ccce984"; - libraryHaskellDepends = [ - aeson async base bloodhound enclosed-exceptions exceptions - http-client http-types katip retry scientific stm stm-chans text - time transformers unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bloodhound containers http-client http-types katip lens - lens-aeson quickcheck-instances scientific stm tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - description = "ElasticSearch scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, containers , enclosed-exceptions, exceptions, http-client, http-types, katip @@ -105475,44 +101086,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keter_1_4_3_1" = callPackage - ({ mkDerivation, aeson, array, async, attoparsec, base - , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, containers, data-default, directory, filepath - , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy - , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, tar, template-haskell, text, time, transformers - , unix, unix-compat, unordered-containers, vector, wai - , wai-app-static, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "keter"; - version = "1.4.3.1"; - sha256 = "1111d0f97dc36e84c041f34176d652911a1e7b9c48943533835ac73ccf37582f"; - revision = "2"; - editedCabalFile = "aebe235523c4b1c4a4c3bf091ba46349881fcc3ca5d69d3304dc395542b82adb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async attoparsec base blaze-builder bytestring - case-insensitive conduit conduit-extra containers data-default - directory filepath fsnotify http-client http-conduit - http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm tar template-haskell text time transformers - unix unix-compat unordered-containers vector wai wai-app-static - wai-extra warp warp-tls yaml zlib - ]; - executableHaskellDepends = [ base data-default filepath ]; - testHaskellDepends = [ - base bytestring conduit hspec HUnit transformers unix - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Web application deployment manager, focusing on Haskell web frameworks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit @@ -105568,21 +101141,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keycode_0_2" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "keycode"; - version = "0.2"; - sha256 = "93f09542fa79993e46a263ff11c3a3c5368c00aa5a11e53bdccf7fbe885459ae"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - homepage = "https://github.com/RyanGlScott/keycode"; - description = "Maps web browser keycodes to their corresponding keyboard keys"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "keycode" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { @@ -106332,21 +101890,6 @@ self: { }) {}; "lackey" = callPackage - ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec - , text - }: - mkDerivation { - pname = "lackey"; - version = "0.3.2"; - sha256 = "0da7478ee80d29eb96efaf8d3df9acc24f037b062c743a6c987765d00abf84e1"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base servant tasty tasty-hspec text ]; - homepage = "https://github.com/tfausak/lackey#readme"; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lackey_0_4_0" = callPackage ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec , text }: @@ -106356,11 +101899,9 @@ self: { sha256 = "34fa0c06eac9c6039aa704e7f64bfd0ed058e36088bef338459b4118e21a7fbb"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; - jailbreak = true; homepage = "https://github.com/tfausak/lackey#readme"; description = "Generate Ruby clients from Servant APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lagrangian" = callPackage @@ -107234,32 +102775,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote_0_11_6_2" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , exception-mtl, exception-transformers, filepath, happy - , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb - , symbol, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "language-c-quote"; - version = "0.11.6.2"; - sha256 = "bcfe78f7debd225d8a24e369fa593a8670d6c6db782e753fd3aa4cb72130a1ce"; - libraryHaskellDepends = [ - array base bytestring containers exception-mtl - exception-transformers filepath haskell-src-meta mainland-pretty - mtl srcloc syb symbol template-haskell - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base bytestring HUnit mainland-pretty srcloc symbol test-framework - test-framework-hunit - ]; - homepage = "http://www.drexel.edu/~mainland/"; - description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-c-quote" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy @@ -107791,51 +103306,6 @@ self: { }) {}; "language-puppet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hslua, hspec, hspec-megaparsec - , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec - , memory, mtl, operational, optparse-applicative, parallel-io - , parsec, pcre-utils, process, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.2"; - sha256 = "c093b8c4586c6d8b63aa02ed905c74f4238cae9c6d32b0140ba47fefff1cda48"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory either exceptions - filecache formatting hashable hruby hslogger hslua hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process random regex-pcre-builtin - scientific semigroups servant servant-client split stm - strict-base-types text time transformers unix unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "language-puppet_1_3_1_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -107873,7 +103343,6 @@ self: { megaparsec mtl scientific strict-base-types temporary text transformers unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -108022,27 +103491,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-thrift_0_8_0_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover - , megaparsec, QuickCheck, text, transformers - }: - mkDerivation { - pname = "language-thrift"; - version = "0.8.0.1"; - sha256 = "defc67a406403425a6fcdb4fcdd735e2bc6309ec1a999debdf3139cd04e0bcb6"; - libraryHaskellDepends = [ - ansi-wl-pprint base megaparsec text transformers - ]; - testHaskellDepends = [ - ansi-wl-pprint base hspec hspec-discover megaparsec QuickCheck text - ]; - jailbreak = true; - homepage = "https://github.com/abhinav/language-thrift#readme"; - description = "Parser and pretty printer for the Thrift IDL format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-thrift" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, hspec , hspec-discover, megaparsec, QuickCheck, scientific, semigroups @@ -108880,45 +104328,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens_4_13" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , comonad, containers, contravariant, deepseq, directory - , distributive, doctest, exceptions, filepath, free - , generic-deriving, ghc-prim, hashable, hlint, HUnit - , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-compat, unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.13"; - sha256 = "3556e7bf69d13fca0e73c5e429c8d25a876931c24ae5aa1f4755acac67078f3c"; - revision = "1"; - editedCabalFile = "4e3ac486c3ffd2166eb8affe3b28e7cd86437031c7e3c72018377871b6c02a1f"; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring comonad containers - contravariant distributive exceptions filepath free ghc-prim - hashable kan-extensions mtl parallel profunctors reflection - semigroupoids semigroups tagged template-haskell text transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lens" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , comonad, containers, contravariant, distributive, exceptions @@ -109035,22 +104444,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-family-th_0_4_1_0" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "lens-family-th"; - version = "0.4.1.0"; - sha256 = "754fdc4c7c292b160a87974ec3690b755fb93f3877c8080d331cfa6ec4b39e20"; - revision = "2"; - editedCabalFile = "978c149edc250ed1c91c03be304b752415e93ab5eb76aacb194bbe94135c356a"; - libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; - homepage = "http://github.com/DanBurton/lens-family-th#readme"; - description = "Generate lens-family style lenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lens-family-th" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -109222,32 +104615,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lentil_0_1_12_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip - , filepath, hspec, natural-sort, optparse-applicative, parsec - , regex-tdfa - }: - mkDerivation { - pname = "lentil"; - version = "0.1.12.0"; - sha256 = "a49c806f024ba30197a85f043c84d8ad1ca5aaca3b6d96ebb8727a4e438380fb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath natural-sort - optparse-applicative parsec regex-tdfa - ]; - testHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath hspec - natural-sort optparse-applicative parsec regex-tdfa - ]; - jailbreak = true; - homepage = "http://www.ariis.it/static/articles/lentil/page.html"; - description = "frugal issue tracker"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lentil" = callPackage ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip , filepath, hspec, natural-sort, optparse-applicative, parsec @@ -109856,19 +105223,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "libnotify_0_1_1_0" = callPackage - ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: - mkDerivation { - pname = "libnotify"; - version = "0.1.1.0"; - sha256 = "206ff7bb29530cd1cfabd417a9ae1aa38bf9f1a834a0f8db914d3d45c24e81f1"; - libraryHaskellDepends = [ base bytestring glib gtk ]; - librarySystemDepends = [ libnotify ]; - description = "Bindings to libnotify library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libnotify;}; - "libnotify" = callPackage ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: mkDerivation { @@ -110319,7 +105673,6 @@ self: { base HUnit monad-control test-framework test-framework-hunit transformers transformers-base transformers-compat ]; - doCheck = false; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; @@ -110573,7 +105926,6 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - doCheck = false; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -111394,26 +106746,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "list-t_0_4_7" = callPackage - ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control - , mtl, mtl-prelude, transformers, transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "0.4.7"; - sha256 = "6b5900d4570bef59b5ebdc25317a032314f738adacc742d19d9c5078bb48a6c9"; - libraryHaskellDepends = [ - base base-prelude mmorph monad-control mtl transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - doCheck = false; - homepage = "https://github.com/nikita-volkov/list-t"; - description = "ListT done right"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "list-t" = callPackage ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control , mtl, mtl-prelude, transformers, transformers-base @@ -113214,33 +108546,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ltext_0_0_2_1" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, deepseq - , directory, hspec, mtl, mtl-compat, optparse-applicative, parsec - , pretty, template-haskell, text, transformers, yaml - }: - mkDerivation { - pname = "ltext"; - version = "0.0.2.1"; - sha256 = "2e0d10a71d59a59218f7e501fc53d6de05ee4e123c2e89bed2f12f4df34d2937"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers deepseq mtl mtl-compat parsec pretty - template-haskell text transformers - ]; - executableHaskellDepends = [ - aeson base containers data-default deepseq directory mtl mtl-compat - optparse-applicative parsec pretty template-haskell text - transformers yaml - ]; - testHaskellDepends = [ base hspec mtl ]; - jailbreak = true; - description = "Higher-order file applicator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ltext" = callPackage ({ mkDerivation, attoparsec, base, directory, exceptions, extra , mtl, optparse-applicative, pretty, QuickCheck @@ -113407,28 +108712,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lucid_2_9_5" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.5"; - sha256 = "ae73ed5490f11f23252e98b3b8c4aa4b86acc0019370e1a54e5957ebf948cbb8"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lucid" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text @@ -113466,22 +108749,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lucid-svg_0_6_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: - mkDerivation { - pname = "lucid-svg"; - version = "0.6.0.1"; - sha256 = "a8cff758914de95defca5640a1f6c3ddf995078063fb8553da02249510db67cc"; - libraryHaskellDepends = [ - base blaze-builder lucid text transformers - ]; - jailbreak = true; - homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; - description = "DSL for SVG using lucid for HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lucid-svg" = callPackage ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { @@ -113576,25 +108843,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {objc = null;}; - "luminance_0_11_0_2" = callPackage - ({ mkDerivation, base, containers, contravariant, dlist, gl, linear - , mtl, resourcet, semigroups, transformers, vector, void - }: - mkDerivation { - pname = "luminance"; - version = "0.11.0.2"; - sha256 = "615050be1e296178ca22d13a5ad6787d648aa75760a24ce0b4c9bd9c679e506b"; - libraryHaskellDepends = [ - base containers contravariant dlist gl linear mtl resourcet - semigroups transformers vector void - ]; - jailbreak = true; - homepage = "https://github.com/phaazon/luminance"; - description = "Type-safe, type-level and stateless graphics framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "luminance" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void @@ -113956,30 +109204,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "machines_0_5_1" = callPackage - ({ mkDerivation, base, comonad, containers, directory, doctest - , filepath, free, mtl, pointed, profunctors, semigroups - , transformers, void - }: - mkDerivation { - pname = "machines"; - version = "0.5.1"; - sha256 = "6229f4ff600fe2db87f43220d42089abd64dc0a0d959e15c5010a7ed81f7dbb7"; - revision = "1"; - editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d"; - libraryHaskellDepends = [ - base comonad containers free mtl pointed profunctors semigroups - transformers void - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/machines/"; - description = "Networked stream transducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "machines" = callPackage ({ mkDerivation, adjunctions, base, comonad, containers, directory , distributive, doctest, filepath, free, mtl, pointed, profunctors @@ -114014,24 +109238,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "machines-directory_0_2_0_8" = callPackage - ({ mkDerivation, base, directory, filepath, machines, machines-io - , transformers - }: - mkDerivation { - pname = "machines-directory"; - version = "0.2.0.8"; - sha256 = "65b712af8b3ecbd91618233e811170d9d7537982440005e3cc8e00284ecda4db"; - libraryHaskellDepends = [ - base directory filepath machines machines-io transformers - ]; - jailbreak = true; - homepage = "http://github.com/aloiscochard/machines-directory"; - description = "Directory (system) utilities for the machines library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "machines-directory" = callPackage ({ mkDerivation, base, directory, filepath, machines, machines-io , transformers @@ -114048,24 +109254,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "machines-io_0_2_0_12" = callPackage - ({ mkDerivation, base, bytestring, chunked-data, machines - , transformers - }: - mkDerivation { - pname = "machines-io"; - version = "0.2.0.12"; - sha256 = "375cf1c4529df84a085cb9c5d2625805e1d947cf4d444c3eeb66e7d0ffbd617d"; - libraryHaskellDepends = [ - base bytestring chunked-data machines transformers - ]; - jailbreak = true; - homepage = "http://github.com/aloiscochard/machines-io"; - description = "IO utilities for the machines library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "machines-io" = callPackage ({ mkDerivation, base, bytestring, chunked-data, machines , transformers @@ -114308,6 +109496,7 @@ self: { aeson attoparsec base bytestring http-client http-client-tls servant servant-client text transformers ]; + jailbreak = true; homepage = "https://github.com/jpvillaisaza/mailchimp-haskell"; description = "Bindings for the MailChimp API"; license = stdenv.lib.licenses.mit; @@ -114866,31 +110055,6 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; - "mandrill_0_5_2_2" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, containers, email-validate, http-client - , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck - , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time - , unordered-containers - }: - mkDerivation { - pname = "mandrill"; - version = "0.5.2.2"; - sha256 = "99031db2a5406c4fe2f3523af6220d793d57f3e75d106e75bfa1bdac9eb77582"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-html bytestring containers - email-validate http-client http-client-tls http-types lens mtl - old-locale QuickCheck text time unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Library for interfacing with the Mandrill JSON API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mandrill" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client @@ -115023,26 +110187,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "map-syntax_0_2" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit, mtl, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers - }: - mkDerivation { - pname = "map-syntax"; - version = "0.2"; - sha256 = "395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b"; - libraryHaskellDepends = [ base containers mtl ]; - testHaskellDepends = [ - base containers deepseq HUnit mtl QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 transformers - ]; - jailbreak = true; - description = "Syntax sugar for defining maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "map-syntax" = callPackage ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl , QuickCheck, transformers @@ -115475,32 +110619,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) pcre;}; - "math-functions_0_1_7_0" = callPackage - ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.1.7.0"; - sha256 = "f3faa070947829fb56a5563f474bfe41237b4b5e8c88c37cac42d208f4a6bea6"; - revision = "1"; - editedCabalFile = "c7e7287e2206d4bc8020141fc9a2b2f1ee09dd8c11f4e2eacbd24e68b99852f5"; - libraryHaskellDepends = [ - base deepseq erf primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base deepseq erf HUnit primitive QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector - vector-th-unbox - ]; - doCheck = false; - homepage = "https://github.com/bos/math-functions"; - description = "Special functions and Chebyshev polynomials"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "math-functions" = callPackage ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -116178,26 +111296,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "megaparsec_4_4_0" = callPackage - ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers - }: - mkDerivation { - pname = "megaparsec"; - version = "4.4.0"; - sha256 = "93addf2a1cf14cb88fd67ea9951d8dd76bcb75960936a517b13787ed0e26f310"; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - base HUnit mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "megaparsec" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, exceptions , HUnit, mtl, QuickCheck, scientific, test-framework @@ -116293,6 +111391,7 @@ self: { servant-lucid servant-server text time transformers wai wai-extra warp ]; + jailbreak = true; homepage = "https://github.com/dhess/mellon/"; description = "A REST web service for Mellon controllers"; license = stdenv.lib.licenses.bsd3; @@ -116412,7 +111511,6 @@ self: { base bytestring data-default-class hspec HUnit network process ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; @@ -116474,21 +111572,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "memoize_0_7" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "memoize"; - version = "0.7"; - sha256 = "04dbd6e367132c477342a3a7271438a9d2ec55cd433e1d01807a6091934d11eb"; - revision = "1"; - editedCabalFile = "4dccaf9fbeff4ff6207a78541ec3a6592db9c732fc65aa8bef1c5d8ff9c1f9f2"; - libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; - description = "A memoization library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "memoize" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -116601,26 +111684,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "messagepack_0_5_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th - }: - mkDerivation { - pname = "messagepack"; - version = "0.5.1"; - sha256 = "e12c22991bd4265e3a52642d0e5970182ecd931afdf8552088d49a524c49625d"; - libraryHaskellDepends = [ base bytestring cereal containers ]; - testHaskellDepends = [ - base bytestring cereal containers QuickCheck test-framework - test-framework-quickcheck2 test-framework-th - ]; - doCheck = false; - homepage = "https://github.com/rodrigosetti/messagepack"; - description = "Serialize instance for Message Pack Object"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "messagepack" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2, test-framework-th @@ -116634,7 +111697,6 @@ self: { base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - doCheck = false; homepage = "https://github.com/rodrigosetti/messagepack"; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; @@ -116953,19 +112015,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens_0_4_5_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "microlens"; - version = "0.4.5.0"; - sha256 = "93cbdb35aa3a653aaee6ec39f895a5c12a663adc120ecb4978b31b034fd69e19"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/aelve/microlens"; - description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -116978,29 +112027,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-aeson_2_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, directory - , doctest, filepath, generic-deriving, microlens, scientific - , semigroups, simple-reflect, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.1.1"; - sha256 = "5b43bcdc52d4b86b8c74040f754209efa95f5983d5d114d2af6709949614acda"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring microlens scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect - ]; - homepage = "http://github.com/fosskers/microlens-aeson/"; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers @@ -117049,24 +112075,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-ghc_0_4_5_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, microlens - , transformers - }: - mkDerivation { - pname = "microlens-ghc"; - version = "0.4.5.0"; - sha256 = "331c1851cfb398faf67e6956a64cf7dc06c85d95ccd4638e3d2ae5c59199212a"; - libraryHaskellDepends = [ - array base bytestring containers microlens transformers - ]; - jailbreak = true; - homepage = "http://github.com/aelve/microlens"; - description = "microlens + array, bytestring, containers, transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-ghc" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers @@ -117083,23 +112091,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-mtl_0_1_9_0" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.1.9.0"; - sha256 = "cf6dfd8c069eed3361952e8db75a065ab94072c430ed2a43a7a7383344726ac8"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - homepage = "http://github.com/aelve/microlens"; - description = "microlens support for Reader/Writer/State from mtl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat @@ -117116,25 +112107,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-platform_0_3_3_0" = callPackage - ({ mkDerivation, base, hashable, microlens, microlens-ghc - , microlens-mtl, microlens-th, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-platform"; - version = "0.3.3.0"; - sha256 = "174c87afcb0d3004e52b4283773aa16d2a6f0a3b819b362a36f75d7e72433ca8"; - libraryHaskellDepends = [ - base hashable microlens microlens-ghc microlens-mtl microlens-th - text unordered-containers vector - ]; - jailbreak = true; - homepage = "http://github.com/aelve/microlens"; - description = "Feature-complete microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-platform" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector @@ -117152,21 +112124,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th_0_4_0_0" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.0.0"; - sha256 = "66972dfd673bce055e22487fde172471b50659125068438330d54732cfc2c1ce"; - libraryHaskellDepends = [ - base containers microlens template-haskell - ]; - homepage = "http://github.com/aelve/microlens"; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-th" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { @@ -117187,8 +112144,8 @@ self: { }: mkDerivation { pname = "micrologger"; - version = "0.3.1.0"; - sha256 = "d0371c5056b7f68bb2b1f1157c162b2d084fa8d6e316b005b1e75200edbd9d96"; + version = "0.3.1.1"; + sha256 = "6c523c9c967dffa3024f0160c78aa56b8d1cadc37d6065912bad0b98a59e01e7"; libraryHaskellDepends = [ aeson base containers text text-format time transformers ]; @@ -117940,21 +112897,15 @@ self: { }) {}; "mios" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc-prim, primitive - , vector - }: + ({ mkDerivation, base, bytestring, ghc-prim, vector }: mkDerivation { pname = "mios"; - version = "1.3.0"; - sha256 = "975fa3ce06cdbd03956dbd238f344f71cd4021b8e4eacd615cf1898013eb157e"; + version = "1.4.0"; + sha256 = "3cc891fd9849f2853ce2f19325fac3eb7c6adb2b684aa4922c2ae66638ac3c2d"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers ghc-prim primitive vector - ]; - executableHaskellDepends = [ - base bytestring containers ghc-prim primitive vector - ]; + libraryHaskellDepends = [ base bytestring ghc-prim vector ]; + executableHaskellDepends = [ base bytestring ghc-prim vector ]; homepage = "https://github.com/shnarazk/mios"; description = "A Minisat-based SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -119719,30 +114670,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mongoDB_2_0_10" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, containers, cryptohash, hashtables - , hspec, lifted-base, monad-control, mtl, network, nonce - , old-locale, parsec, random, random-shuffle, text, time - , transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.0.10"; - sha256 = "8986956648874ce70c0bc4682d7856ea20c1477895405c532e6de34573f5b0df"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - homepage = "https://github.com/mongodb-haskell/mongodb"; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mongoDB" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, containers, cryptohash @@ -119860,31 +114787,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mono-traversable_0_10_2" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers, dlist - , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck - , semigroupoids, semigroups, split, text, transformers - , unordered-containers, vector, vector-algorithms, vector-instances - }: - mkDerivation { - pname = "mono-traversable"; - version = "0.10.2"; - sha256 = "379ee5a7f9fc2a5c4fb11522fe28654d130c044265643122c8b3163e8e0452b8"; - libraryHaskellDepends = [ - base bytestring comonad containers dlist dlist-instances hashable - semigroupoids semigroups split text transformers - unordered-containers vector vector-algorithms vector-instances - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mono-traversable" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , hspec, HUnit, QuickCheck, semigroups, split, text, transformers @@ -119986,27 +114888,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoid-subclasses_0_4_2" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "0.4.2"; - sha256 = "38257132ebd3dca4d1d95252a928ca183171ae0ba3aefd133f3c564fa3bfee2b"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - homepage = "https://github.com/blamario/monoid-subclasses/"; - description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monoid-subclasses" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector @@ -120038,23 +114919,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_1_2_5" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype - , unordered-containers - }: - mkDerivation { - pname = "monoidal-containers"; - version = "0.1.2.5"; - sha256 = "c82124b1e867a271bafeffb6fb8fb1febb1887154bf28225b174180babc9d438"; - libraryHaskellDepends = [ - base containers deepseq hashable lens newtype unordered-containers - ]; - homepage = "http://github.com/bgamari/monoidal-containers"; - description = "Containers with monoidal accumulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monoidal-containers" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype , unordered-containers @@ -120312,35 +115176,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "morte_1_6_1" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, deepseq - , Earley, http-client, http-client-tls, microlens, microlens-mtl - , mtl, optparse-applicative, pipes, QuickCheck, system-fileio - , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text - , text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.1"; - sha256 = "84874884eda53f75ba1b9ab8ed85151839c41de54e9ab999de429f00d319a703"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "morte" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq , Earley, http-client, http-client-tls, microlens, microlens-mtl @@ -121859,37 +116694,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mustache_1_0_2" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , cmdargs, containers, directory, either, filepath, hspec, mtl - , parsec, process, scientific, temporary, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "mustache"; - version = "1.0.2"; - sha256 = "77d43c251883fc5dd5afdd05ea3b6757f37b7c4aa76950418386b8e9098d0927"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-unicode-symbols bytestring containers directory - either filepath mtl parsec scientific text unordered-containers - vector - ]; - executableHaskellDepends = [ - aeson base base-unicode-symbols bytestring cmdargs filepath text - yaml - ]; - testHaskellDepends = [ - aeson base base-unicode-symbols directory filepath hspec process - temporary text unordered-containers yaml - ]; - homepage = "https://github.com/JustusAdam/mustache"; - description = "A mustache template parser library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mustache" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, lens @@ -123237,36 +118041,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nested-routes_7_0_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, composition-extra - , errors, exceptions, hashable, hspec, hspec-wai, http-types, mtl - , poly-arity, pred-trie, regex-compat, semigroups, text - , transformers, tries, unordered-containers - , wai-middleware-content-type, wai-middleware-verbs - , wai-transformers - }: - mkDerivation { - pname = "nested-routes"; - version = "7.0.0"; - sha256 = "eac01cd730d3cbcafab4a0ac2b6b8c3ca8cdcd31f996379092f2f60bc31c21a2"; - libraryHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable mtl poly-arity pred-trie regex-compat semigroups text - transformers tries unordered-containers wai-middleware-content-type - wai-middleware-verbs wai-transformers - ]; - testHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable hspec hspec-wai http-types mtl poly-arity pred-trie - regex-compat semigroups text transformers tries - unordered-containers wai-middleware-content-type - wai-middleware-verbs wai-transformers - ]; - description = "Declarative, compositional Wai responses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "nested-routes" = callPackage ({ mkDerivation, attoparsec, base, bytestring, composition-extra , errors, exceptions, hashable, hashtables, HSet, hspec, hspec-wai @@ -123655,25 +118429,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "network_2_6_2_1" = callPackage - ({ mkDerivation, base, bytestring, HUnit, test-framework - , test-framework-hunit, unix - }: - mkDerivation { - pname = "network"; - version = "2.6.2.1"; - sha256 = "a3fda15c9bbe2c7274d97f40398c6cf8d1d3a9fe896fbf6531e1bfc849bb1bfa"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - ]; - doCheck = false; - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "network" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix @@ -124451,7 +119206,6 @@ self: { testHaskellDepends = [ base network network-transport network-transport-tests ]; - doCheck = false; homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; @@ -124716,7 +119470,6 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; jailbreak = true; - doCheck = false; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -126249,32 +121002,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "octane_0_4_24" = callPackage - ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary - , binary-bits, bytestring, containers, data-binary-ieee754, deepseq - , newtype-generics, tasty, tasty-hspec, text - }: - mkDerivation { - pname = "octane"; - version = "0.4.24"; - sha256 = "2c74c33a03f90c141da3ffc94c5434e24b6c7cf8c426927480ce0f278eb6802a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty autoexporter base binary binary-bits bytestring - containers data-binary-ieee754 deepseq newtype-generics text - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base binary bytestring containers tasty tasty-hspec - ]; - jailbreak = true; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "octane" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, data-default-class @@ -126747,24 +121474,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "once_0_1_0_0" = callPackage - ({ mkDerivation, base, containers, hashable, template-haskell - , unordered-containers - }: - mkDerivation { - pname = "once"; - version = "0.1.0.0"; - sha256 = "9a59a79946079ea2d00469f9c4a6a319ad96425f38f4b90093789109c268a7ab"; - libraryHaskellDepends = [ - base containers hashable template-haskell unordered-containers - ]; - jailbreak = true; - homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-once.git"; - description = "memoization for IO actions and functions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "once" = callPackage ({ mkDerivation, base, containers, hashable, template-haskell , unordered-containers @@ -126879,37 +121588,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "opaleye_0_4_2_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.4.2.0"; - sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20"; - revision = "7"; - editedCabalFile = "b3d11eb291ac042615847b8ce614cfa31d54055f7344e44a8f21b3556d92fa93"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups time - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "opaleye" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset @@ -127687,22 +122365,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "operational_0_2_3_2" = callPackage - ({ mkDerivation, base, mtl, random }: - mkDerivation { - pname = "operational"; - version = "0.2.3.2"; - sha256 = "ed02d521b86b6791104a489b6225baf92f8a1641e6fa8ac1022990ef239443aa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ random ]; - homepage = "http://haskell.org/haskellwiki/Operational"; - description = "Implementation of difficult monads made easy with operational semantics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "operational" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { @@ -128853,19 +123515,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "palette_0_1_0_3" = callPackage - ({ mkDerivation, array, base, colour, containers }: - mkDerivation { - pname = "palette"; - version = "0.1.0.3"; - sha256 = "f75a713245af54d86cd34ce79f2b6d2d8c35aa7d56c28c07e33465227cdedea1"; - libraryHaskellDepends = [ array base colour containers ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Utilities for choosing and creating color schemes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "palette" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { @@ -129023,40 +123672,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc-citeproc_0_9_1_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.9.1.1"; - sha256 = "15c89a9aa6bce4efd6b728ea16151eb6390cad0495eb82c50cbac490591c8f86"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl @@ -129117,6 +123732,8 @@ self: { pname = "pandoc-crossref"; version = "0.2.3.0"; sha256 = "b6b4200023da4835cf50a2c9a247a837282ccf16e1684336b5a15d17b9ad085e"; + revision = "1"; + editedCabalFile = "d2e8585033cbfcb5d232c01e6df4f9ba073d1249613847c238d433b011015693"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129247,23 +123864,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-types_1_16_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , ghc-prim, syb - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.16.1"; - sha256 = "846054157d7072ca3f7260b988a6752536b42bbd32c051400e55f46229b8179e"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim syb - ]; - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, syb @@ -129294,25 +123894,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pango_0_13_1_1" = callPackage - ({ mkDerivation, array, base, cairo, containers, directory, glib - , gtk2hs-buildtools, mtl, pango, pretty, process, text - }: - mkDerivation { - pname = "pango"; - version = "0.13.1.1"; - sha256 = "3c22f339fe2e30cb6d6cbc5906e1064c5fdabfbc56d2a2c015ac70b4aa5165ad"; - libraryHaskellDepends = [ - array base cairo containers directory glib mtl pretty process text - ]; - libraryPkgconfigDepends = [ pango ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Pango text rendering engine"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) pango;}; - "pango" = callPackage ({ mkDerivation, array, base, Cabal, cairo, containers, directory , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process @@ -129848,7 +124429,6 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/aslatter/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -130124,7 +124704,6 @@ self: { 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; @@ -130403,29 +124982,11 @@ self: { base criterion doctest hspec QuickCheck vector ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/liamoc/patches-vector"; description = "Patches (diffs) on vectors: composable, mergeable, and invertible"; license = stdenv.lib.licenses.bsd3; }) {}; - "path_0_5_8" = callPackage - ({ mkDerivation, aeson, base, deepseq, exceptions, filepath, hspec - , HUnit, mtl, template-haskell - }: - mkDerivation { - pname = "path"; - version = "0.5.8"; - sha256 = "aa85f40a40ce8c96de260481501b1884c0d86c37ad58505bda011b803fdcefd8"; - libraryHaskellDepends = [ - aeson base deepseq exceptions filepath template-haskell - ]; - testHaskellDepends = [ aeson base hspec HUnit mtl ]; - description = "Support for well-typed paths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "path" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , filepath, hspec, HUnit, mtl, template-haskell @@ -130453,24 +125014,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_1_0" = callPackage - ({ mkDerivation, base, directory, exceptions, filepath, hspec, path - , temporary, time, transformers - }: - mkDerivation { - pname = "path-io"; - version = "1.1.0"; - sha256 = "b94af45683e0c39d259fac8cad906957b97991a3cdac45e067fd1dc9baebe59f"; - libraryHaskellDepends = [ - base directory exceptions filepath path temporary time transformers - ]; - testHaskellDepends = [ base exceptions hspec path ]; - homepage = "https://github.com/mrkkrp/path-io"; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "path-io" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , hspec, path, temporary, time, transformers, unix-compat @@ -131473,41 +126016,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistent_2_2_4_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, hspec, http-api-data, lifted-base - , monad-control, monad-logger, mtl, old-locale, path-pieces - , resource-pool, resourcet, scientific, silently, tagged - , template-haskell, text, time, transformers, transformers-base - , unordered-containers, vector - }: - mkDerivation { - pname = "persistent"; - version = "2.2.4.1"; - sha256 = "1473bdd952854d7f5fdb5896d2df07ef1ecf301c7fdb136054f49625329d50db"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger http-api-data - lifted-base monad-control monad-logger mtl old-locale path-pieces - resource-pool resourcet scientific silently tagged template-haskell - text time transformers transformers-base unordered-containers - vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data lifted-base - monad-control monad-logger mtl old-locale path-pieces resource-pool - resourcet scientific tagged template-haskell text time transformers - unordered-containers vector - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -131683,27 +126191,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "persistent-mongoDB_2_1_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal - , conduit, containers, http-api-data, monad-control, mongoDB - , network, path-pieces, persistent, resource-pool, resourcet, text - , time, transformers - }: - mkDerivation { - pname = "persistent-mongoDB"; - version = "2.1.4"; - sha256 = "06b9d86c6f6b68025a86bd9cc62595bda303007f4da721764241d160f23766a2"; - libraryHaskellDepends = [ - aeson attoparsec base bson bytestring cereal conduit containers - http-api-data monad-control mongoDB network path-pieces persistent - resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using mongoDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "persistent-mongoDB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal , conduit, containers, http-api-data, monad-control, mongoDB @@ -131724,26 +126211,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql_2_3_0_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resourcet, text, transformers - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.3.0.2"; - sha256 = "7e1c21ee07df97172528c83709a4435040e477e46e1d558f3dd5bcda84c4f033"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent resourcet - text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, mysql, mysql-simple @@ -131797,28 +126264,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistent-postgresql_2_2_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resourcet, text, time - , transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.2.2"; - sha256 = "7ec31242349f8ea7da149991fbe3366a6a83f3e3915392c997b3c34fc27671cd"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent-postgresql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent @@ -131913,29 +126358,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistent-sqlite_2_2_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, monad-control, monad-logger, old-locale, persistent - , persistent-template, resourcet, text, time, transformers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.2.1"; - sha256 = "bac71080bb25ad20b9116e42df463bbe230bacb2d963a5b101a501cff7fffc5e"; - libraryHaskellDepends = [ - aeson base bytestring conduit containers monad-control monad-logger - old-locale persistent resourcet text time transformers - ]; - testHaskellDepends = [ - base hspec persistent persistent-template time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, monad-control, monad-logger, old-locale, persistent @@ -131961,31 +126383,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_1_8_1" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.1.8.1"; - sha256 = "34911f40028357567717f6724abae4e6fc905567ffc8ba8ee5042e9680b2f168"; - libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -132846,29 +127243,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pinch_0_2_0_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pinch"; - version = "0.2.0.2"; - sha256 = "be722c513c696845e2a04758639b661b065cd821d4e5f608fc1ec74fe18a0e0f"; - libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim hashable text - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck text - unordered-containers vector - ]; - homepage = "https://github.com/abhinav/pinch#readme"; - description = "An alternative implementation of Thrift for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pinch" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text @@ -132891,24 +127265,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pinchot_0_18_2_0" = callPackage - ({ mkDerivation, base, containers, Earley, lens, ListLike - , semigroups, template-haskell, transformers - }: - mkDerivation { - pname = "pinchot"; - version = "0.18.2.0"; - sha256 = "a32dfa0aff4761bca3c9d99755814a3acc2962197dff5b07b565c77e90bb4ed6"; - libraryHaskellDepends = [ - base containers Earley lens ListLike semigroups template-haskell - transformers - ]; - homepage = "http://www.github.com/massysett/pinchot"; - description = "Write grammars, not parsers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pinchot" = callPackage ({ mkDerivation, base, containers, Earley, lens, ListLike , non-empty-sequence, pretty-show, semigroups, template-haskell @@ -133148,20 +127504,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; - "pipes-cacophony_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: - mkDerivation { - pname = "pipes-cacophony"; - version = "0.2.1"; - sha256 = "c112376b75e744e15006b81ecd9b60bee10be6a54cca6c2fd6b7f5f7e8d99041"; - libraryHaskellDepends = [ base bytestring cacophony pipes ]; - testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/centromere/pipes-cacophony"; - description = "Pipes for Noise-secured network connections"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-cacophony" = callPackage ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: mkDerivation { @@ -133236,23 +127578,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-cliff_0_10_0_4" = callPackage - ({ mkDerivation, async, base, bytestring, pipes, pipes-safe - , process, stm - }: - mkDerivation { - pname = "pipes-cliff"; - version = "0.10.0.4"; - sha256 = "3d92b54e773e98996cbc1c753892e7400540d925f913d187b940e7425dfdef33"; - libraryHaskellDepends = [ - async base bytestring pipes pipes-safe process stm - ]; - homepage = "http://www.github.com/massysett/pipes-cliff"; - description = "Streaming to and from subprocesses using Pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-cliff" = callPackage ({ mkDerivation, async, base, bytestring, pipes, pipes-safe , process, stm, unix @@ -133463,22 +127788,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-http_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, http-client, http-client-tls - , pipes - }: - mkDerivation { - pname = "pipes-http"; - version = "1.0.3"; - sha256 = "a8a2f0babb5348e6cb6bde375e7af47ebe808d4e333e0dd5c7e0ace3c600d58a"; - libraryHaskellDepends = [ - base bytestring http-client http-client-tls pipes - ]; - description = "HTTP client with pipes interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -134591,27 +128900,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pointed_4_2_0_2" = callPackage - ({ mkDerivation, base, comonad, containers, data-default-class - , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged - , transformers, transformers-compat, unordered-containers - }: - mkDerivation { - pname = "pointed"; - version = "4.2.0.2"; - sha256 = "4b8a8a5ad5a54715f6a58090d820657a2f2de4176d899ad736ebd0e54de7da7a"; - libraryHaskellDepends = [ - base comonad containers data-default-class hashable kan-extensions - semigroupoids semigroups stm tagged transformers - transformers-compat unordered-containers - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/pointed/"; - description = "Pointed and copointed data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged @@ -135596,37 +129884,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-binary_0_9_0_1" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, conversion, conversion-bytestring, conversion-text - , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq - , QuickCheck, quickcheck-instances, rebase, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time - , transformers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.9.0.1"; - sha256 = "77f4dcf7b09961b5db11d3db753e27a5116d27d3e88661a58e6e742de94b5cf7"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring foldl loch-th - placeholders scientific text time transformers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring conversion conversion-bytestring - conversion-text either json-ast loch-th placeholders - postgresql-libpq QuickCheck quickcheck-instances rebase scientific - tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time - transformers uuid vector - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/postgresql-binary"; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "postgresql-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text @@ -135727,20 +129984,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-libpq_0_9_1_1" = callPackage - ({ mkDerivation, base, bytestring, postgresql }: - mkDerivation { - pname = "postgresql-libpq"; - version = "0.9.1.1"; - sha256 = "e483aed7fe8628cee17342a1bd0a315d998488609ad08a833c01785a88785871"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ postgresql ]; - homepage = "http://github.com/lpsmith/postgresql-libpq"; - description = "low-level binding to libpq"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) postgresql;}; - "postgresql-libpq" = callPackage ({ mkDerivation, base, bytestring, postgresql }: mkDerivation { @@ -137202,23 +131445,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "process-extras_0_3_3_8" = callPackage - ({ mkDerivation, base, bytestring, deepseq, generic-deriving - , ListLike, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.3.3.8"; - sha256 = "d9e26f829d5eab2e2df113383b814bf71c835ff874fdecdc5a125115da485ec3"; - libraryHaskellDepends = [ - base bytestring deepseq generic-deriving ListLike process text - ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "process-extras" = callPackage ({ mkDerivation, base, bytestring, deepseq, generic-deriving , ListLike, process, text @@ -138170,27 +132396,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "protocol-buffers_2_2_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.2.0"; - sha256 = "069a9ded2e9f7840ec51aef66eaabcdb428ceed8eee2b913590d5ee245506967"; - revision = "1"; - editedCabalFile = "23ebda7ea74075546a5ab75c567f97efe8ef0b6c0d7d994196e7286351659ee4"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protocol-buffers" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string @@ -138208,22 +132413,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "protocol-buffers-descriptor_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; - version = "2.2.0"; - sha256 = "62b6d996c8ee7e11fad73744b3267c92b60ec4ddb59f4c37a53b97ce9836c09a"; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -138273,24 +132462,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protolude_0_1_6" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , ghc-prim, mtl, safe, stm, text, transformers - }: - mkDerivation { - pname = "protolude"; - version = "0.1.6"; - sha256 = "daddf3511ec1a971f53aecc4b198c008e89ab035736dbb453440d1d2b0733cbd"; - libraryHaskellDepends = [ - async base bytestring containers deepseq ghc-prim mtl safe stm text - transformers - ]; - homepage = "https://github.com/sdiehl/protolude"; - description = "A sensible set of defaults for writing custom Preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protolude" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , ghc-prim, mtl, safe, stm, text, transformers @@ -138492,25 +132663,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "psqueues_0_2_2_1" = callPackage - ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit - , QuickCheck, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "psqueues"; - version = "0.2.2.1"; - sha256 = "1428771180a34c2258bc9ca0f0c12f1df530be018e870c91348975cc7d33ae9b"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "psqueues" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit @@ -138566,21 +132718,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "publicsuffix_0_20160522" = callPackage - ({ mkDerivation, base, filepath, hspec, template-haskell }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20160522"; - sha256 = "1ae1ae02b3c317d421de31490cbd4b83a306f6be53103a5b1438aa170703f529"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - jailbreak = true; - homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "publicsuffix" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { @@ -139016,52 +133153,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "purescript_0_8_5_0" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base - , base-compat, bower-json, boxes, bytestring, containers, directory - , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec - , hspec-discover, http-types, HUnit, language-javascript - , lifted-base, monad-control, monad-logger, mtl, network - , optparse-applicative, parallel, parsec, pattern-arrows, pipes - , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap - , spdx, split, stm, syb, text, time, transformers - , transformers-base, transformers-compat, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "purescript"; - version = "0.8.5.0"; - sha256 = "75a253d113b33e79abceff9d280988c1a4cb46eb84547a82eda1ec4bdad60d04"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-better-errors base base-compat bower-json boxes - bytestring containers directory dlist edit-distance filepath - fsnotify Glob http-types language-javascript lifted-base - monad-control monad-logger mtl parallel parsec pattern-arrows pipes - pipes-http process regex-tdfa safe semigroups sourcemap spdx split - stm syb text time transformers transformers-base - transformers-compat unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base base-compat boxes bytestring containers - directory filepath Glob haskeline monad-logger mtl network - optparse-applicative parsec process split stm text time - transformers transformers-compat utf8-string - ]; - testHaskellDepends = [ - aeson aeson-better-errors base base-compat boxes bytestring - containers directory filepath Glob haskeline hspec hspec-discover - HUnit mtl optparse-applicative parsec process stm text time - transformers transformers-compat utf8-string vector - ]; - doCheck = false; - homepage = "http://www.purescript.org/"; - description = "PureScript Programming Language Compiler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "purescript" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring @@ -139249,38 +133340,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_0_3_0_2" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , containers, cryptohash, hashable, hspec, http-client, http-types - , mtl, QuickCheck, snap-core, snap-server, text, time, transformers - , unordered-containers, yaml - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "0.3.0.2"; - sha256 = "72ce2a76a802d6c866ea0630fde7711b0298929113609998e0ec1dd733fb8098"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptohash hashable - http-client http-types mtl QuickCheck text time transformers - unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring containers mtl snap-core snap-server text - transformers unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types mtl QuickCheck - text transformers unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pusher-http-haskell" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptohash, hashable, hspec, http-client, http-types, QuickCheck @@ -139858,28 +133917,6 @@ self: { }) {}; "quantum-random" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansigraph, base, bytestring - , directory, haskeline, hspec, http-conduit, mtl, QuickCheck - , regex-posix, terminal-size, text - }: - mkDerivation { - pname = "quantum-random"; - version = "0.6.1"; - sha256 = "ebaeac863914541fd39d82073ce2223fe4583faa046bafb8632162d3b8790d2f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal ansigraph base bytestring directory - http-conduit regex-posix terminal-size text - ]; - executableHaskellDepends = [ base haskeline mtl ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/BlackBrane/quantum-random/"; - description = "Retrieve, store and manage real quantum random data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "quantum-random_0_6_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansigraph, base, bytestring , directory, haskeline, hspec, http-conduit, mtl, QuickCheck , regex-posix, terminal-size, text @@ -139899,7 +133936,6 @@ self: { homepage = "http://github.com/BlackBrane/quantum-random/"; description = "Retrieve, store and manage real quantum random data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qudb" = callPackage @@ -141429,26 +135465,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ratel_0_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, http-client, http-client-tls, http-types, tasty - , tasty-hspec, text, uuid - }: - mkDerivation { - pname = "ratel"; - version = "0.1.3"; - sha256 = "49fee52e108c70551438f75f997b8c0a3053ee15476422c77509918bfb3ca9b3"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ratel" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, http-client, http-client-tls, http-types, tasty @@ -141468,24 +135484,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ratel-wai_0_1_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "0.1.2"; - sha256 = "f8aad4c4f57e58bda51edc56521e095e03810c825ef2333069e9151f51e1468e"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - jailbreak = true; - homepage = "https://github.com/tfausak/ratel-wai#readme"; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -141713,20 +135711,19 @@ self: { "rdf4h" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, fgl, hashable, hgal, HTTP, HUnit, hxt, network - , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit - , tasty-quickcheck, text, text-binary, unordered-containers - , utf8-string + , directory, hashable, hgal, HTTP, HUnit, hxt, network, network-uri + , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck + , text, text-binary, unordered-containers, utf8-string }: mkDerivation { pname = "rdf4h"; - version = "2.0.0"; - sha256 = "2c6eb2a15590931e0646731c688b010d75186a2d1ce38eabb27fdbc19647a23a"; + version = "3.0.0"; + sha256 = "aa50b95e37655e3abdfb4f83679096bd6c188750a8cb3a61132e2e8399e928db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers deepseq directory fgl hashable - hgal HTTP hxt network network-uri parsec text text-binary + base binary bytestring containers deepseq directory hashable hgal + HTTP hxt network network-uri parsec text text-binary unordered-containers utf8-string ]; executableHaskellDepends = [ @@ -142161,20 +136158,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "read-env-var_0_1_0_0" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "read-env-var"; - version = "0.1.0.0"; - sha256 = "fb70be65ea0889032ac0cef9890370a7c4229602744c1cb67482cfd0dc6b4e5d"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/read-env-var#readme"; - description = "Functions for safely reading environment variables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "read-env-var" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -143993,30 +137976,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_8_3_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, quickcheck-simple, sql-words - , template-haskell, text, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.8.3.0"; - sha256 = "8935e9b1f9dfbc7f7c34737db669ebfcbe352beac00ddc45a8b67420f93001ee"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - sql-words template-haskell text th-reify-compat time - time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers quickcheck-simple transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-query" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words @@ -144060,24 +138019,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-record_0_1_5_0" = callPackage - ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query - , relational-query-HDBC - }: - mkDerivation { - pname = "relational-record"; - version = "0.1.5.0"; - sha256 = "dab27172c9307773eaf27c49c969670828998aa469279572e1873aeadaff7a6e"; - libraryHaskellDepends = [ - base persistable-types-HDBC-pg relational-query - relational-query-HDBC - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Meta package of Relational Record"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-record" = callPackage ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query , relational-query-HDBC @@ -144200,7 +138141,6 @@ self: { sha256 = "f996de29c0e7a47484a16113129166f7df12567d3ca3ea24c5c97e98a8225c51"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; - doCheck = false; description = "A simple api for matchers"; license = stdenv.lib.licenses.mit; }) {}; @@ -144927,28 +138867,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "reroute_0_3_1_0" = callPackage - ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, hvect - , mtl, path-pieces, regex-compat, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "reroute"; - version = "0.3.1.0"; - sha256 = "5e31044f054305e119f80aa2625ecd4b7453e383d67dc44b8fdd9d64fa476fe9"; - libraryHaskellDepends = [ - base deepseq graph-core hashable hvect mtl path-pieces regex-compat - text transformers unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hvect mtl text unordered-containers vector - ]; - homepage = "http://github.com/agrafix/reroute"; - description = "abstract implementation of typed and untyped web routing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "reroute" = callPackage ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl , path-pieces, text, unordered-containers, vector @@ -145132,26 +139050,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resourcet_1_1_7_4" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "resourcet"; - version = "1.1.7.4"; - sha256 = "a757d3a4d17373dc48a7072c2d98574934a53eb0ac98a32642952beb751e8f85"; - libraryHaskellDepends = [ - base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base hspec lifted-base transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "resourcet" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base @@ -145532,35 +139430,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "rethinkdb-client-driver_0_0_22" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , hashable, hspec, hspec-smallcheck, mtl, network, old-locale - , scientific, smallcheck, stm, template-haskell, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "rethinkdb-client-driver"; - version = "0.0.22"; - sha256 = "4a192e989e1f1b60398123ad2c74701203b66a33a220f1b5c47ad495e98575bb"; - revision = "1"; - editedCabalFile = "cd3c49b103352e43c82641e8d61f7ea048e3b5e2308274024d421739b1180a46"; - libraryHaskellDepends = [ - aeson base binary bytestring containers hashable mtl network - old-locale scientific stm template-haskell text time - unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hspec-smallcheck smallcheck text time - unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; - description = "Client driver for RethinkDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , hashable, hspec, hspec-smallcheck, mtl, network, old-locale @@ -145641,7 +139510,6 @@ self: { base data-default-class exceptions ghc-prim hspec HUnit mtl QuickCheck random stm time transformers ]; - doCheck = false; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; @@ -145850,39 +139718,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "riak_1_0_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder - , bytestring, containers, data-default-class, deepseq - , enclosed-exceptions, exceptions, hashable, HUnit - , mersenne-random-pure64, monad-control, mtl, network - , protocol-buffers, pureMD5, QuickCheck, random, random-shuffle - , resource-pool, riak-protobuf, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "riak"; - version = "1.0.1.1"; - sha256 = "d35e67fdcb397eedd3cddeae13dcbfa397b3ce36e7e76bb0c49d5a74f8bfc13f"; - libraryHaskellDepends = [ - aeson attoparsec base binary blaze-builder bytestring containers - data-default-class deepseq enclosed-exceptions exceptions hashable - mersenne-random-pure64 monad-control network protocol-buffers - pureMD5 random random-shuffle resource-pool riak-protobuf - semigroups text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers data-default-class HUnit mtl QuickCheck - semigroups tasty tasty-hunit tasty-quickcheck text - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/markhibberd/riak-haskell-client"; - description = "A Haskell client for the Riak decentralized data store"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "riak" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder , bytestring, containers, data-default-class, deepseq @@ -145914,24 +139749,6 @@ self: { license = "unknown"; }) {}; - "riak-protobuf_0_21_0_0" = callPackage - ({ mkDerivation, array, base, parsec, protocol-buffers - , protocol-buffers-descriptor - }: - mkDerivation { - pname = "riak-protobuf"; - version = "0.21.0.0"; - sha256 = "cfa49952f54a80ebb4fdc9cc35190b8226b01b0a21b50c9da309548fa367e39a"; - libraryHaskellDepends = [ - array base parsec protocol-buffers protocol-buffers-descriptor - ]; - jailbreak = true; - homepage = "http://github.com/markhibberd/riak-haskell-client"; - description = "Haskell types for the Riak protocol buffer API"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "riak-protobuf" = callPackage ({ mkDerivation, array, base, parsec, protocol-buffers , protocol-buffers-descriptor @@ -146718,6 +140535,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rosmsg-bin" = callPackage + ({ mkDerivation, base, filepath, monad-logger, rosmsg, rospkg + , stack, temporary, text + }: + mkDerivation { + pname = "rosmsg-bin"; + version = "0.1.0.0"; + sha256 = "74552be16ec2c8b261b09e494fe08cc4b212c6514015b4e56b573c91f4a12524"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath monad-logger rosmsg rospkg stack temporary text + ]; + homepage = "https://github.com/RoboticsHS/rosmsg-bin#readme"; + description = "ROS message management tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rospkg" = callPackage ({ mkDerivation, async, base, bytestring, directory, fast-tagsoup , filepath, split, tagsoup, text @@ -148075,25 +141910,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sandi_0_3_6" = callPackage - ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit - , tasty, tasty-hunit, tasty-quickcheck, tasty-th - }: - mkDerivation { - pname = "sandi"; - version = "0.3.6"; - sha256 = "fafcb3501b8a17238de44239ef62c3051f9a33010424ef91dd76057257bf2284"; - libraryHaskellDepends = [ base bytestring conduit exceptions ]; - testHaskellDepends = [ - base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th - ]; - jailbreak = true; - homepage = "http://hackage.haskell.org/package/sandi"; - description = "Data encoding library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sandi" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit , stringsearch, tasty, tasty-hunit, tasty-quickcheck, tasty-th @@ -148395,34 +142211,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sbv_5_11" = callPackage - ({ mkDerivation, array, async, base, base-compat, containers - , crackNum, data-binary-ieee754, deepseq, directory, filepath - , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb - }: - mkDerivation { - pname = "sbv"; - version = "5.11"; - sha256 = "9ede93f41cdbdfb73638f25eec9c201190d049163ad503202ebefa2d18cfc90d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base base-compat containers crackNum - data-binary-ieee754 deepseq directory filepath mtl old-time pretty - process QuickCheck random syb - ]; - executableHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit process syb - ]; - testHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit syb - ]; - homepage = "http://leventerkok.github.com/sbv/"; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sbv" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc @@ -149538,24 +143326,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "sdl2_2_1_2_1" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.1.2.1"; - sha256 = "a30a40495313cc40efd88d72f89e17c18354090fa1764e8217b8ee4d9884d439"; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.2)."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) SDL2;}; - "sdl2" = callPackage ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 , StateVar, text, transformers, vector @@ -150105,30 +143875,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semigroupoids_5_0_1" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , containers, contravariant, directory, distributive, doctest - , filepath, semigroups, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "semigroupoids"; - version = "5.0.1"; - sha256 = "0ce989b8b0dc02ebe9aa19c47982a6bc802b8dc973c39c7ac40ea7a21cdbd616"; - revision = "1"; - editedCabalFile = "94d9167b701f148cb429e6746dd2bbb3b6559521b7fc2e98ce47339ad09af9f2"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive semigroups tagged transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/semigroupoids"; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "semigroupoids" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , containers, contravariant, directory, distributive, doctest @@ -150171,21 +143917,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "semigroups_0_18_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "semigroups"; - version = "0.18.1"; - sha256 = "ae7607fb2b497a53192c378dc84c00b45610fdc5de0ac8c1ac3234ec7acee807"; - revision = "1"; - editedCabalFile = "7dd2b3dcc9517705391c1c6a0b51eba1da605b554f9817255c4a1a1df4d4ae3d"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/ekmett/semigroups/"; - description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "semigroups" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -150682,7 +144413,6 @@ self: { sha256 = "077c210212ff92611b3d8a3578f3ea1f78586c094057ccc5d1dcc3170fcf4dfc"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; - doCheck = false; homepage = "https://github.com/jputcu/serialport"; description = "Cross platform serial port library"; license = stdenv.lib.licenses.bsd3; @@ -150750,32 +144480,6 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , bytestring-conversion, case-insensitive, directory, doctest - , filemanip, filepath, hspec, http-api-data, http-media, http-types - , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances - , string-conversions, text, url, vault - }: - mkDerivation { - pname = "servant"; - version = "0.7.1"; - sha256 = "e4e847df340f76172f719d7570cbf2cc59e4045aa994bb764f0ca5fd11c6126c"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring bytestring-conversion - case-insensitive http-api-data http-media http-types mmorph mtl - network-uri string-conversions text vault - ]; - testHaskellDepends = [ - aeson attoparsec base bytestring directory doctest filemanip - filepath hspec QuickCheck quickcheck-instances string-conversions - text url - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-api-data, http-media, http-types @@ -150799,7 +144503,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -150914,6 +144617,7 @@ self: { hspec-wai http-types random servant servant-server string-class time transformers wai wai-extra with-location ]; + jailbreak = true; description = "Authentication via HMAC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150973,21 +144677,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-cassava_0_7_1" = callPackage - ({ mkDerivation, base, cassava, http-media, servant, vector }: - mkDerivation { - pname = "servant-cassava"; - version = "0.7.1"; - sha256 = "385bf6187f86c0fb9ba39578eb132118d2ada5dd17f1d0abd6235e4e9113623d"; - revision = "2"; - editedCabalFile = "1bbf4a02f60f2b0d01fa94b6570ff75c1391562f13ea1a1418bd2a1227e9e37a"; - libraryHaskellDepends = [ base cassava http-media servant vector ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Servant CSV content-type for cassava"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-cassava" = callPackage ({ mkDerivation, base, cassava, http-media, servant, vector }: mkDerivation { @@ -151001,36 +144690,6 @@ self: { }) {}; "servant-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, deepseq, exceptions, hspec, http-api-data - , http-client, http-client-tls, http-media, http-types, HUnit - , network, network-uri, QuickCheck, safe, servant, servant-server - , string-conversions, text, transformers, transformers-compat, wai - , warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.7.1"; - sha256 = "1aecf3d0d573900bc0b20e3ecadd0561d8cbaaf461efb40b213341d36396661d"; - revision = "1"; - editedCabalFile = "2e5c2301bb98e655edb4e6be3a9b9a814330fcd559faba130a2798bf229800c3"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring exceptions - http-api-data http-client http-client-tls http-media http-types - network-uri safe servant string-conversions text transformers - transformers-compat - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hspec http-client http-media - http-types HUnit network QuickCheck servant servant-server text - transformers transformers-compat wai warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, deepseq, exceptions, hspec, http-api-data , http-client, http-client-tls, http-media, http-types, HUnit @@ -151053,11 +144712,9 @@ self: { http-types HUnit network QuickCheck servant servant-server text transformers transformers-compat wai warp ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-csharp" = callPackage @@ -151083,36 +144740,6 @@ self: { }) {}; "servant-docs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , bytestring-conversion, case-insensitive, control-monad-omega - , hashable, hspec, http-media, http-types, lens, servant - , string-conversions, text, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; - version = "0.7.1"; - sha256 = "cd1a9fbcba479a9086fb562ad5c5d5921d2e4d1d079f7922ef0f3d2c75701964"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring bytestring-conversion - case-insensitive control-monad-omega hashable http-media http-types - lens servant string-conversions text unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring-conversion lens servant string-conversions - text - ]; - testHaskellDepends = [ - aeson base hspec lens servant string-conversions - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-docs_0_8_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , bytestring-conversion, case-insensitive, control-monad-omega , hashable, hspec, http-media, http-types, lens, servant @@ -151136,7 +144763,6 @@ self: { testHaskellDepends = [ aeson base hspec lens servant string-conversions ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; @@ -151164,6 +144790,7 @@ self: { executableHaskellDepends = [ base ede http-media servant-server warp ]; + jailbreak = true; homepage = "http://github.com/alpmestan/servant-ede"; description = "Combinators for rendering EDE templates in servant web applications"; license = stdenv.lib.licenses.bsd3; @@ -151216,18 +144843,6 @@ self: { }) {}; "servant-foreign" = callPackage - ({ mkDerivation, base, hspec, http-types, lens, servant, text }: - mkDerivation { - pname = "servant-foreign"; - version = "0.7.1"; - sha256 = "93ee994eeb20b28a00fea5092ec34223c4826c4db6da71f4150d8a91950fb578"; - libraryHaskellDepends = [ base http-types lens servant text ]; - testHaskellDepends = [ base hspec ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_8_1" = callPackage ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; @@ -151235,10 +144850,8 @@ self: { sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-github" = callPackage @@ -151270,8 +144883,8 @@ self: { }: mkDerivation { pname = "servant-github-webhook"; - version = "0.2.0.0"; - sha256 = "41e1b67d3fd0716da36d78124b479b09678887af5996845ead2a3c2ed445e4b7"; + version = "0.2.0.1"; + sha256 = "cbb483255f179414e2131492067f4e9b2177ff778280ed35153e09a07c03ed9b"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Crypto github http-types servant servant-server string-conversions text wai @@ -151335,27 +144948,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, servant - , servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.7.1"; - sha256 = "15f4f26ffe2e9613defe30c028c43bc685f1582a6a0d97186dea5867c5cd5e89"; - libraryHaskellDepends = [ - base base-compat charset lens servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - servant text - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_8_1" = callPackage ({ mkDerivation, base, base-compat, charset, hspec , hspec-expectations, language-ecmascript, lens, servant , servant-foreign, text @@ -151371,11 +144963,9 @@ self: { base base-compat hspec hspec-expectations language-ecmascript lens servant text ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -151413,33 +145003,6 @@ self: { }) {}; "servant-mock" = callPackage - ({ mkDerivation, aeson, base, bytestring, bytestring-conversion - , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server - , transformers, wai, warp - }: - mkDerivation { - pname = "servant-mock"; - version = "0.7.1"; - sha256 = "e9bec220198a9c9ae67782d88870ea4002562ad20eb6302b5f5a4d6f9752a169"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring http-types QuickCheck servant servant-server - transformers wai - ]; - executableHaskellDepends = [ - aeson base QuickCheck servant-server warp - ]; - testHaskellDepends = [ - aeson base bytestring-conversion hspec hspec-wai QuickCheck servant - servant-server wai - ]; - homepage = "http://github.com/haskell-servant/servant"; - description = "Derive a mock server for free from your servant API types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-mock_0_8_1" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server , transformers, wai, warp @@ -151461,11 +145024,9 @@ self: { aeson base bytestring-conversion hspec hspec-wai QuickCheck servant servant-server wai ]; - jailbreak = true; homepage = "http://github.com/haskell-servant/servant"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pandoc" = callPackage @@ -151528,8 +145089,8 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.3.1.4"; - sha256 = "3453c63c53bdea6476df27486d207efb382a5ffcb4efd5cbb739c373a5cd380a"; + version = "0.3.1.5"; + sha256 = "3bf4363b2154c7fb3e6da4eb9f5ef227c5e15d4cc6048342086d77426f74b9d5"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -151555,8 +145116,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.1.1"; - sha256 = "e200e569feb68818c3a3cf64b3e9279e50b7ac3ead8e1702be866e4140d69673"; + version = "0.0.2.0"; + sha256 = "27ea056c0193268a987e7a07700afe754d5bf2027a71244988c2b125b308a055"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive data-default-class hspec http-client http-media http-types mtl @@ -151568,7 +145129,6 @@ self: { quickcheck-io servant servant-client servant-server transformers warp ]; - jailbreak = true; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -151602,6 +145162,7 @@ self: { testHaskellDepends = [ base blaze-html servant servant-blaze servant-server warp ]; + jailbreak = true; homepage = "https://github.com/ElvishJerricco/servant-router"; description = "Servant router for non-server applications"; license = stdenv.lib.licenses.bsd3; @@ -151629,41 +145190,6 @@ self: { }) {}; "servant-server" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, bytestring-conversion, containers - , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-wai, http-api-data, http-types, mtl, network, network-uri - , parsec, QuickCheck, safe, servant, should-not-typecheck, split - , string-conversions, system-filepath, temporary, text - , transformers, transformers-compat, wai, wai-app-static, wai-extra - , warp, word8 - }: - mkDerivation { - pname = "servant-server"; - version = "0.7.1"; - sha256 = "ba4f10cc14c216cf27e08cae7e7cbb717930400e46dbecc9b8354751584909eb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - containers filepath http-api-data http-types mtl network - network-uri safe servant split string-conversions system-filepath - text transformers transformers-compat wai wai-app-static warp word8 - ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring - bytestring-conversion directory doctest exceptions filemanip - filepath hspec hspec-wai http-types mtl network parsec QuickCheck - safe servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, bytestring-conversion, containers , directory, doctest, exceptions, filemanip, filepath, hspec @@ -151693,11 +145219,9 @@ self: { safe servant should-not-typecheck string-conversions temporary text transformers transformers-compat wai wai-extra warp ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-smsc-ru" = callPackage @@ -151752,32 +145276,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-swagger_1_0_3" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob - , hspec, http-media, lens, QuickCheck, servant, swagger2, text - , time, unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.0.3"; - sha256 = "ea1b3c7f33ae1c788ef33858c9c74849f450155c1bd81dcd472a36389aa17597"; - revision = "2"; - editedCabalFile = "9277b2e27decd3ec1b02132a8963a70dd8c3624087bf1a7bbad42da95030f85b"; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media lens QuickCheck servant - swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base doctest Glob hspec lens QuickCheck servant - swagger2 text time - ]; - jailbreak = true; - homepage = "https://github.com/haskell-servant/servant-swagger"; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-swagger" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory , doctest, filepath, hspec, http-media, insert-ordered-containers @@ -151786,8 +145284,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.1"; - sha256 = "c6d8a62e495cd72a42f2ae600c4e523cf3337bb3cd24426f4cc54141a9600445"; + version = "1.1.2"; + sha256 = "1aa55cdf092189fed02e5d5bddf052eafafd23df54e0671ec32adc5ac4c8c47e"; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers lens QuickCheck servant swagger2 text unordered-containers @@ -151960,7 +145458,6 @@ self: { transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; @@ -152639,26 +146136,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shake-language-c_0_9_1" = callPackage - ({ mkDerivation, base, data-default-class, directory, doctest - , fclabels, hspec, process, shake, split, unordered-containers - }: - mkDerivation { - pname = "shake-language-c"; - version = "0.9.1"; - sha256 = "827d4225d9c52ab784793831a41f5f594ece21113ad0e5da540505a42842db70"; - libraryHaskellDepends = [ - base data-default-class fclabels process shake split - unordered-containers - ]; - testHaskellDepends = [ base directory doctest hspec shake ]; - doCheck = false; - homepage = "https://github.com/samplecount/shake-language-c"; - description = "Utilities for cross-compiling with Shake"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "shake-language-c" = callPackage ({ mkDerivation, base, data-default-class, directory, doctest , fclabels, hspec, process, shake, split, unordered-containers @@ -152756,33 +146233,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shakespeare_2_0_9" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.9"; - sha256 = "d3ba75e105a367781d22e75826e07eddd4d0074e9db325722e92bdcaead48d45"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - homepage = "http://www.yesodweb.com/book/shakespearean-templates"; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "shakespeare" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec @@ -154135,7 +147585,6 @@ self: { 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; }) {}; @@ -154329,7 +147778,6 @@ self: { base bytestring connection containers network old-locale time ]; testHaskellDepends = [ base bytestring hspec HUnit knob ]; - doCheck = false; homepage = "http://github.com/dom96/SimpleIRC"; description = "Simple IRC Library"; license = stdenv.lib.licenses.bsd3; @@ -154549,28 +147997,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_0_1" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl - , process, syb, tasty, tasty-golden, template-haskell, th-desugar - }: - mkDerivation { - pname = "singletons"; - version = "2.0.1"; - sha256 = "fd149d3da367eebe81728a7a61389f18bb18b3cddd611b7aed6c0b265110ba41"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-desugar - ]; - testHaskellDepends = [ - base Cabal directory filepath process tasty tasty-golden - ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.github.com/goldfirere/singletons"; - description = "A framework for generating singleton types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "singletons" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, th-desugar @@ -154994,30 +148420,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "slave-thread_1_0_1_1" = callPackage - ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph - , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore - , stm-containers, transformers - }: - mkDerivation { - pname = "slave-thread"; - version = "1.0.1.1"; - sha256 = "2ebab4f5f49b75fb41cfe9514e1ad5de2c118125dd549e6d7ce318e425d4575f"; - libraryHaskellDepends = [ - base base-prelude list-t mmorph partial-handler stm-containers - transformers - ]; - testHaskellDepends = [ - base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/slave-thread"; - description = "A principal solution to ghost threads and silent exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "slave-thread" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore @@ -155158,27 +148560,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "slug_0_1_4" = callPackage - ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent - , QuickCheck, test-framework, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "slug"; - version = "0.1.4"; - sha256 = "1a9635014b4310bfa8ed75edd4a5d34d708ec72be5aa33358fbd2fce5e68c461"; - libraryHaskellDepends = [ - aeson base exceptions path-pieces persistent text - ]; - testHaskellDepends = [ - base exceptions path-pieces QuickCheck test-framework - test-framework-quickcheck2 text - ]; - homepage = "https://github.com/mrkkrp/slug"; - description = "Type-safe slugs for Yesod ecosystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "slug" = callPackage ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent , QuickCheck, test-framework, test-framework-quickcheck2, text @@ -155447,19 +148828,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie_0_4_2_2" = callPackage - ({ mkDerivation, aeson, base, linear, text, vector }: - mkDerivation { - pname = "smoothie"; - version = "0.4.2.2"; - sha256 = "be4f9b24ca5a1dc99165b2a1f5484b48b6baf16e5700514689875dbb2a0e4133"; - libraryHaskellDepends = [ aeson base linear text vector ]; - homepage = "https://github.com/phaazon/smoothie"; - description = "Smooth curves via several interpolation modes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "smoothie" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { @@ -155634,40 +149002,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "snap_0_14_0_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , clientsession, comonad, configurator, containers, directory - , directory-tree, dlist, either, filepath, hashable, heist, lens - , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time - , pwstore-fast, regex-posix, snap-core, snap-server, stm - , template-haskell, text, time, transformers, unordered-containers - , vector, vector-algorithms, xmlhtml - }: - mkDerivation { - pname = "snap"; - version = "0.14.0.7"; - sha256 = "98c853d2efa8104f89567a69ad271196e034b30ec13dd71051e6ce6119d15709"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal clientsession comonad - configurator containers directory directory-tree dlist either - filepath hashable heist lens logict MonadCatchIO-transformers mtl - mwc-random pwstore-fast regex-posix snap-core snap-server stm text - time transformers unordered-containers vector vector-algorithms - xmlhtml - ]; - executableHaskellDepends = [ - base bytestring containers directory directory-tree filepath - hashable old-time snap-server template-haskell text - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "Top-level package for the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal , clientsession, configurator, containers, deepseq, directory @@ -155791,33 +149125,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "snap-core_0_9_8_0" = callPackage - ({ mkDerivation, attoparsec, attoparsec-enumerator, base - , blaze-builder, blaze-builder-enumerator, bytestring - , bytestring-mmap, case-insensitive, containers, deepseq, directory - , enumerator, filepath, hashable, HUnit, MonadCatchIO-transformers - , mtl, old-locale, random, regex-posix, text, time, unix - , unix-compat, unordered-containers, vector, zlib-enum - }: - mkDerivation { - pname = "snap-core"; - version = "0.9.8.0"; - sha256 = "47310fcd9c347883f5985c27c1fbcfac8c5783472a01afcc720bcc850622d2db"; - libraryHaskellDepends = [ - attoparsec attoparsec-enumerator base blaze-builder - blaze-builder-enumerator bytestring bytestring-mmap - case-insensitive containers deepseq directory enumerator filepath - hashable HUnit MonadCatchIO-transformers mtl old-locale random - regex-posix text time unix unix-compat unordered-containers vector - zlib-enum - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath @@ -156027,33 +149334,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "snap-server_0_9_5_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-enumerator, base - , blaze-builder, blaze-builder-enumerator, bytestring - , case-insensitive, containers, enumerator, HsOpenSSL - , MonadCatchIO-transformers, mtl, network, old-locale, snap-core - , text, time, unix, unix-compat - }: - mkDerivation { - pname = "snap-server"; - version = "0.9.5.1"; - sha256 = "af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3"; - revision = "1"; - editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c"; - configureFlags = [ "-fopenssl" ]; - libraryHaskellDepends = [ - attoparsec attoparsec-enumerator base blaze-builder - blaze-builder-enumerator bytestring case-insensitive containers - enumerator HsOpenSSL MonadCatchIO-transformers mtl network - old-locale snap-core text time unix unix-compat - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap-server" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock @@ -157127,6 +150407,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snorkels" = callPackage + ({ mkDerivation, ansi-terminal, base, bimap, containers + , monad-loops, optparse-applicative, parsec, random + }: + mkDerivation { + pname = "snorkels"; + version = "0.2.0.0"; + sha256 = "3b9d7f7c50279153dbb6b9f066d88a32178dc52e30ad95293cfbf965a7a6c251"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bimap containers monad-loops + optparse-applicative parsec random + ]; + executableHaskellDepends = [ + ansi-terminal base bimap containers monad-loops + optparse-applicative parsec random + ]; + jailbreak = true; + description = "Strategic board game of medium complexity"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "snow-white" = callPackage ({ mkDerivation, base, binary, bytestring, mps }: mkDerivation { @@ -157221,31 +150524,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "soap_0_2_3_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, configurator - , data-default, exceptions, hspec, http-client, http-types, HUnit - , iconv, mtl, resourcet, text, unordered-containers, xml-conduit - , xml-conduit-writer, xml-types - }: - mkDerivation { - pname = "soap"; - version = "0.2.3.0"; - sha256 = "9d249967e3e6394749397a89c70c9aba5e5454ea4c2592ffd00aaa0ca2e98fd1"; - libraryHaskellDepends = [ - base bytestring conduit configurator data-default exceptions - http-client http-types iconv mtl resourcet text - unordered-containers xml-conduit xml-conduit-writer xml-types - ]; - testHaskellDepends = [ - base bytestring hspec HUnit text unordered-containers xml-conduit - xml-conduit-writer - ]; - homepage = "https://bitbucket.org/dpwiz/haskell-soap"; - description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "soap" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit @@ -157335,20 +150613,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "socket_0_6_0_1" = callPackage - ({ mkDerivation, async, base, bytestring }: - mkDerivation { - pname = "socket"; - version = "0.6.0.1"; - sha256 = "d6b2a2bbb331997314a4b94a21530ea36d00888cbc86ab59c9a33e8ed1f03d20"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ async base bytestring ]; - homepage = "https://github.com/lpeterse/haskell-socket"; - description = "An extensible socket library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "socket" = callPackage ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }: mkDerivation { @@ -157657,19 +150921,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sorted-list_0_1_6_1" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "sorted-list"; - version = "0.1.6.1"; - sha256 = "07eda22facb55bd2c135a8a2ada96e5d7f0a2d86f471cdeb4eb3fd3ab37ce0b4"; - libraryHaskellDepends = [ base deepseq ]; - homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; - description = "Type-enforced sorted lists and related functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sorted-list" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -159453,7 +152704,6 @@ self: { stackage-install stackage-sandbox stackage-setup stackage-update stackage-upload ]; - doCheck = false; homepage = "https://www.stackage.org/"; description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; @@ -159527,55 +152777,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stackage-curator_0_14_0" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, binary, binary-orphans, binary-tagged - , blaze-html, byteable, bytestring, Cabal, classy-prelude-conduit - , conduit, conduit-extra, containers, cryptohash - , cryptohash-conduit, data-default-class, directory, exceptions - , filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale - , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stackage-cli, stackage-install, stm - , streaming-commons, syb, system-fileio, system-filepath, tar - , temporary, text, time, transformers, unix-compat - , unordered-containers, utf8-string, vector, xml-conduit, xml-types - , yaml, zlib - }: - mkDerivation { - pname = "stackage-curator"; - version = "0.14.0"; - sha256 = "13ad2b94821402f533d0e5b4ac38ea1107fa015ab1a5d997f03f0ae05d38fa67"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring binary binary-orphans binary-tagged blaze-html - byteable bytestring Cabal classy-prelude-conduit conduit - conduit-extra containers cryptohash cryptohash-conduit - data-default-class directory exceptions filepath hashable - html-conduit http-client http-client-tls http-conduit lucid - mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stackage-install stm - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib - ]; - executableHaskellDepends = [ - aeson base http-client http-client-tls optparse-applicative - optparse-simple stackage-cli system-filepath text - ]; - testHaskellDepends = [ - base Cabal classy-prelude-conduit containers directory hspec - http-client http-client-tls QuickCheck text yaml - ]; - homepage = "https://github.com/fpco/stackage"; - description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stackage-curator" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal @@ -159748,30 +152949,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stackage-upload_0_1_0_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , http-client, http-client-tls, http-types, optparse-applicative - , process, stackage-cli, temporary, text - }: - mkDerivation { - pname = "stackage-upload"; - version = "0.1.0.5"; - sha256 = "f1353781fc12b09682620c6629ee4edeca3c8ca16001109080d7d0fb3dd3b33b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring directory filepath http-client - http-client-tls http-types process temporary text - ]; - executableHaskellDepends = [ - base optparse-applicative stackage-cli - ]; - homepage = "https://github.com/fpco/stackage-upload"; - description = "A more secure version of cabal upload which uses HTTPS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stackage-upload" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-client, http-client-tls, http-types, optparse-applicative @@ -160511,35 +153688,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm-conduit_2_8_0" = callPackage - ({ mkDerivation, async, base, cereal, cereal-conduit, conduit - , conduit-combinators, conduit-extra, directory, doctest, ghc-prim - , HUnit, lifted-async, lifted-base, monad-control, monad-loops - , QuickCheck, resourcet, stm, stm-chans, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - , void - }: - mkDerivation { - pname = "stm-conduit"; - version = "2.8.0"; - sha256 = "0bad21541ac28765802468c71b61f464daf1fca4b2adf1c66bab006d0a7d3128"; - libraryHaskellDepends = [ - async base cereal cereal-conduit conduit conduit-combinators - conduit-extra directory ghc-prim lifted-async lifted-base - monad-control monad-loops resourcet stm stm-chans transformers void - ]; - testHaskellDepends = [ - base conduit conduit-combinators directory doctest HUnit QuickCheck - resourcet stm stm-chans test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - jailbreak = true; - homepage = "https://github.com/cgaebel/stm-conduit"; - description = "Introduces conduits to channels, and promotes using conduits concurrently"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stm-conduit" = callPackage ({ mkDerivation, async, base, cereal, cereal-conduit, conduit , conduit-combinators, conduit-extra, directory, doctest, ghc-prim @@ -160567,31 +153715,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stm-containers_0_2_14" = callPackage - ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF - , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive - , QuickCheck, transformers, unordered-containers - }: - mkDerivation { - pname = "stm-containers"; - version = "0.2.14"; - sha256 = "6d415061d23cee818cd3c879c828809d177c28a1c4d36fdfc408867c3bbe8e6f"; - libraryHaskellDepends = [ - base base-prelude focus hashable list-t primitive transformers - ]; - testHaskellDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/stm-containers"; - description = "Containers for STM"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stm-containers" = callPackage ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive @@ -160998,48 +154121,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, base, base-orphans, base64-bytestring - , bytestring, cereal, cereal-vector, conduit, containers, criterion - , cryptohash, deepseq, directory, fail, filepath, ghc-prim - , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base - , monad-control, mono-traversable, primitive, resourcet, safe - , semigroups, smallcheck, store-core, syb, template-haskell, text - , th-lift, th-lift-instances, th-orphans, th-reify-many - , th-utilities, time, transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.2.1.1"; - sha256 = "e61242e5309d4efa9c7a676465dcc57a78b6b34b019bf053b6cfa5e38a449cd1"; - revision = "1"; - editedCabalFile = "12fe7b5c31b015214596f7b077529d55ac52a6589481b4eb1feea71b042aee6e"; - libraryHaskellDepends = [ - array base base-orphans base64-bytestring bytestring conduit - containers cryptohash deepseq directory fail filepath ghc-prim - hashable hspec hspec-smallcheck integer-gmp lifted-base - monad-control mono-traversable primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector void - ]; - testHaskellDepends = [ - array base base-orphans base64-bytestring bytestring cereal - cereal-vector conduit containers criterion cryptohash deepseq - directory fail filepath ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable primitive - resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector vector-binary-instances void weigh - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "store_0_2_1_2" = callPackage ({ mkDerivation, array, base, base-orphans, base64-bytestring , bytestring, cereal, cereal-vector, conduit, containers, criterion , cryptohash, deepseq, directory, fail, filepath, ghc-prim @@ -161073,7 +154154,6 @@ self: { th-reify-many th-utilities time transformers unordered-containers vector vector-binary-instances void weigh ]; - jailbreak = true; homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; @@ -161081,22 +154161,6 @@ self: { }) {}; "store-core" = callPackage - ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text - , transformers - }: - mkDerivation { - pname = "store-core"; - version = "0.2.0.1"; - sha256 = "f4945175ef4342e6d6cc51a67d11ad1109b757f0876dc70ca4fb645c2458fa94"; - libraryHaskellDepends = [ - base bytestring fail ghc-prim primitive text transformers - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast and lightweight binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store-core_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text , transformers }: @@ -161110,7 +154174,6 @@ self: { homepage = "https://github.com/fpco/store#readme"; description = "Fast and lightweight binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "str" = callPackage @@ -161131,35 +154194,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_1_2_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.1.2.1"; - sha256 = "70948036bc62ee5d77d01efa674fcfd762e2bf95d04a94e55dde1339940d471c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - testHaskellDepends = [ - 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"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stratosphere" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hlint, lens, tasty, tasty-hspec, template-haskell, text @@ -161519,24 +154553,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "streams_3_2_1" = callPackage - ({ mkDerivation, adjunctions, base, comonad, distributive - , semigroupoids, semigroups - }: - mkDerivation { - pname = "streams"; - version = "3.2.1"; - sha256 = "44edcc8bda54c0c356e606896756af5e61dab0070c021df31dfbbc56cad2d9f7"; - libraryHaskellDepends = [ - adjunctions base comonad distributive semigroupoids semigroups - ]; - jailbreak = true; - 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 @@ -161933,25 +154949,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stripe-core_2_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, mtl, text, time - , transformers, unordered-containers - }: - mkDerivation { - pname = "stripe-core"; - version = "2.0.3"; - sha256 = "1c3d319ef29bb3e2863838e553a44a23449dafc8f244c62a7f3ffc7b8305e3a8"; - libraryHaskellDepends = [ - aeson base bytestring mtl text time transformers - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/dmjio/stripe-haskell"; - description = "Stripe API for Haskell - Pure Core"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers @@ -161969,20 +154966,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stripe-haskell_2_0_3" = callPackage - ({ mkDerivation, base, stripe-core, stripe-http-streams }: - mkDerivation { - pname = "stripe-haskell"; - version = "2.0.3"; - sha256 = "225b6b5671181a8349b952bf98a30c40bf0ee24ab53cc720f02d7979ad7cd5bb"; - libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; - jailbreak = true; - homepage = "https://github.com/dmjio/stripe"; - description = "Stripe API for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stripe-haskell" = callPackage ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { @@ -161995,28 +154978,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stripe-http-streams_2_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec - , http-streams, io-streams, stripe-core, stripe-tests, text - }: - mkDerivation { - pname = "stripe-http-streams"; - version = "2.0.3"; - sha256 = "c6423451c388e3006012b01932b3fdd23d344a5d8dd73755ef00cb74b7c736f6"; - libraryHaskellDepends = [ - aeson base bytestring HsOpenSSL http-streams io-streams stripe-core - text - ]; - testHaskellDepends = [ - base free HsOpenSSL hspec http-streams stripe-core stripe-tests - ]; - jailbreak = true; - doCheck = false; - description = "Stripe API for Haskell - http-streams backend"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {stripe-tests = null;}; - "stripe-http-streams" = callPackage ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec , http-streams, io-streams, stripe-core, stripe-tests, text @@ -162038,27 +154999,6 @@ self: { license = stdenv.lib.licenses.mit; }) {stripe-tests = null;}; - "strive_2_2_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-conduit, http-types, markdown-unlit, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; - version = "2.2.2"; - sha256 = "cf1b8b89a234798947931c874e9a48598737fb41d8971e5c1eed87d9fb75beb0"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-conduit - http-types template-haskell text time transformers - ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - jailbreak = true; - homepage = "https://github.com/tfausak/strive#readme"; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit @@ -162254,36 +155194,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stylish-haskell_0_5_17_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative - , strict, syb, test-framework, test-framework-hunit, yaml - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.5.17.0"; - sha256 = "374ad1e8206ae9b41b94b95fef55ad8d439c006fa650e6315ef04eca38e53b78"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl syb yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl optparse-applicative strict syb yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts HUnit mtl syb test-framework test-framework-hunit - yaml - ]; - homepage = "https://github.com/jaspervdj/stylish-haskell"; - description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative @@ -162753,6 +155663,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "supermonad" = callPackage + ({ mkDerivation, base, containers, fgl, ghc, mtl, transformers }: + mkDerivation { + pname = "supermonad"; + version = "0.1"; + sha256 = "ed9647eae9e5b3431bf320db78c6878b6f21487ba659faf18a1f4597a91a8e62"; + libraryHaskellDepends = [ + base containers fgl ghc mtl transformers + ]; + description = "Plugin and base library to support supermonads in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "supero" = callPackage ({ mkDerivation, base, containers, cpphs, directory, filepath , haskell-src-exts, mtl, process, time, uniplate @@ -162836,23 +155759,6 @@ self: { }) {}; "svg-tree" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , JuicyPixels, lens, linear, mtl, scientific, text, transformers - , vector, xml - }: - mkDerivation { - pname = "svg-tree"; - version = "0.5.1.1"; - sha256 = "cf75c195759bc114722e43aad05442ca002aa34a72aa2457c4444873945fab5e"; - libraryHaskellDepends = [ - attoparsec base bytestring containers JuicyPixels lens linear mtl - scientific text transformers vector xml - ]; - description = "SVG file loader and serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "svg-tree_0_5_1_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , JuicyPixels, lens, linear, mtl, scientific, text, transformers , vector, xml @@ -162867,7 +155773,6 @@ self: { ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg2q" = callPackage @@ -163002,32 +155907,6 @@ self: { license = "unknown"; }) {}; - "swagger2_2_0_2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers - , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl - , network, QuickCheck, scientific, template-haskell, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.0.2"; - sha256 = "a9d2d65793e2c6767e06effd8e947f0072b2d6dd414e85012b73a2574167649b"; - libraryHaskellDepends = [ - aeson base base-compat containers hashable http-media lens mtl - network scientific template-haskell text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat containers doctest Glob hashable - hspec HUnit lens mtl QuickCheck text time unordered-containers - vector - ]; - homepage = "https://github.com/GetShopTV/swagger2"; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "swagger2" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , containers, doctest, generics-sop, Glob, hashable, hspec @@ -164494,19 +157373,6 @@ self: { license = "GPL"; }) {}; - "tagged_0_8_4" = callPackage - ({ mkDerivation, base, deepseq, template-haskell }: - mkDerivation { - pname = "tagged"; - version = "0.8.4"; - sha256 = "20c861d299445ea810ba39d9d0529fb0b3862f4d0271a4fb168ccd493a234d5e"; - libraryHaskellDepends = [ base deepseq template-haskell ]; - homepage = "http://github.com/ekmett/tagged"; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tagged" = callPackage ({ mkDerivation, base, deepseq, template-haskell, transformers , transformers-compat @@ -164734,19 +157600,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tagsoup_0_13_10" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: - mkDerivation { - pname = "tagsoup"; - version = "0.13.10"; - sha256 = "ac838eeed18118423220716855c2bfd71dcc4a7a455893d8c4ad627828f57d58"; - libraryHaskellDepends = [ base bytestring containers text ]; - homepage = "https://github.com/ndmitchell/tagsoup#readme"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tagsoup" = callPackage ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { @@ -165200,27 +158053,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_0_11_0_3" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays - }: - mkDerivation { - pname = "tasty"; - version = "0.11.0.3"; - sha256 = "ca51533c3b6fb36a63b7a6062d71024e3a823ae173779c1c81850959e29e7efa"; - revision = "1"; - editedCabalFile = "65ddea88e2f32a40483dc873704a8b6b684548b5c61400440c4dda1bdbcbd5f3"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays - ]; - homepage = "http://documentup.com/feuerbach/tasty"; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged @@ -165256,20 +158088,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-dejafu_0_3_0_1" = callPackage - ({ mkDerivation, base, dejafu, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; - version = "0.3.0.1"; - sha256 = "9794201798e3afdfd84f22a6bd89fd869db3105ec33d406d6d4df742d5d0b683"; - libraryHaskellDepends = [ base dejafu tagged tasty ]; - jailbreak = true; - homepage = "https://github.com/barrucadu/dejafu"; - description = "Deja Fu support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { @@ -165311,30 +158129,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-golden_2_3_1" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, mtl, optparse-applicative, process, tagged - , tasty, tasty-hunit, temporary, temporary-rc - }: - mkDerivation { - pname = "tasty-golden"; - version = "2.3.1"; - sha256 = "f292a57dc63afdd5607cca82bcc5ad606c5e1c59bb6fabc7fe48a26d816dcbf1"; - revision = "1"; - editedCabalFile = "ecec40232352129f5e7cf7ec06a93800c7eb76ef42a7b9fa5439ab8434513860"; - libraryHaskellDepends = [ - async base bytestring containers deepseq directory filepath mtl - optparse-applicative process tagged tasty temporary - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary-rc - ]; - homepage = "https://github.com/feuerbach/tasty-golden"; - description = "Golden tests support for tasty"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty-golden" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged @@ -165566,31 +158360,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-silver_3_1_8_1" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit - , temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; - version = "3.1.8.1"; - sha256 = "0dc1bcced319abc9984aa8e61c4bb88c30279f1b87d4d4e0f368eade99525fb0"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - homepage = "https://github.com/phile314/tasty-silver"; - description = "A fancy test runner, including support for golden tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -165888,60 +158657,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "telegram-api_0_4_3_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either - , filepath, hjpath, hspec, http-api-data, http-client - , http-client-tls, http-media, http-types, mime-types - , optparse-applicative, servant, servant-client, string-conversions - , text, transformers, utf8-string - }: - mkDerivation { - pname = "telegram-api"; - version = "0.4.3.1"; - sha256 = "b51fa07d2dfa010a467a43b2a86dc56ec7a7adaf91b379528a97b6745771dfc8"; - libraryHaskellDepends = [ - aeson base bytestring either http-api-data http-client http-media - http-types mime-types servant servant-client string-conversions - text transformers - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base filepath hjpath hspec http-client - http-client-tls http-types optparse-applicative servant - servant-client text transformers utf8-string - ]; - homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; - description = "Telegram Bot API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "telegram-api" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either - , filepath, hjpath, hspec, http-api-data, http-client - , http-client-tls, http-media, http-types, mime-types - , optparse-applicative, servant, servant-client, string-conversions - , text, transformers, utf8-string - }: - mkDerivation { - pname = "telegram-api"; - version = "0.5.0.0"; - sha256 = "f971c4acd9101f4fd811a5e60b31ce2c85a09789a248e3a5473efa81d227ad93"; - libraryHaskellDepends = [ - aeson base bytestring either http-api-data http-client http-media - http-types mime-types servant servant-client string-conversions - text transformers - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base filepath hjpath hspec http-client - http-client-tls http-types optparse-applicative servant - servant-client text transformers utf8-string - ]; - homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; - description = "Telegram Bot API bindings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "telegram-api_0_5_0_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either , filepath, hjpath, hspec, http-api-data, http-client , http-client-tls, http-media, http-types, mime-types @@ -165966,7 +158682,6 @@ self: { homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; description = "Telegram Bot API bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teleport" = callPackage @@ -167110,28 +159825,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "texmath_0_8_6_4" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.8.6.4"; - sha256 = "8ef75b8a82ba0d0002388b8a25148b40c06a7e4ea8033f6cc07c806dfa4c6c50"; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text @@ -167611,37 +160304,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "text-show_2_1_2" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors - , bytestring, bytestring-builder, containers, generic-deriving - , ghc-prim, hspec, integer-gmp, nats, QuickCheck - , quickcheck-instances, semigroups, tagged, template-haskell, text - , transformers, transformers-compat, void - }: - mkDerivation { - pname = "text-show"; - version = "2.1.2"; - sha256 = "76c1ce631c6932816dc241b290400e7200d7c79fd50ec03f51964e244fae320d"; - revision = "2"; - editedCabalFile = "b3b37a10589923b91729f07291795acf58f98efd5df1f32de99ab27fa1d3eda3"; - libraryHaskellDepends = [ - array base base-compat bytestring bytestring-builder containers - generic-deriving ghc-prim integer-gmp nats semigroups tagged - template-haskell text transformers void - ]; - testHaskellDepends = [ - array base base-compat base-orphans bifunctors bytestring - bytestring-builder generic-deriving ghc-prim hspec nats QuickCheck - quickcheck-instances tagged text transformers transformers-compat - void - ]; - jailbreak = true; - homepage = "https://github.com/RyanGlScott/text-show"; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant @@ -167667,7 +160329,6 @@ self: { QuickCheck quickcheck-instances semigroups tagged template-haskell text th-lift transformers transformers-compat void ]; - doCheck = false; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; @@ -167772,18 +160433,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-zipper_0_4" = callPackage - ({ mkDerivation, base, text, vector }: - mkDerivation { - pname = "text-zipper"; - version = "0.4"; - sha256 = "0a94fbdc2febc7656369b30c09fe4bcee1f9323547af40037a2adbee52a45d97"; - libraryHaskellDepends = [ base text vector ]; - description = "A text editor zipper library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "text-zipper" = callPackage ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { @@ -168058,30 +160707,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-desugar_1_5_5" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb - , template-haskell, th-lift, th-orphans - }: - mkDerivation { - pname = "th-desugar"; - version = "1.5.5"; - sha256 = "db8cfe15c2b1c5b5e6c2105a0a16f409c9eb9b359c2f2c18e440d5562c5d38a3"; - revision = "1"; - editedCabalFile = "6dffacc4a25cfaa78844eb30be50f7e0c9c502c808c84279577308cb1ec8d1b8"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-lift th-orphans - ]; - testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-lift - th-orphans - ]; - jailbreak = true; - homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; - description = "Functions to desugar Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -168260,23 +160885,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-orphans_0_13_0" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.0"; - sha256 = "bdaeee2a3588e0622f2036481974dfe1bd135a3d71004393c94201d8d700be80"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "th-orphans" = callPackage ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift , th-lift-instances, th-reify-many @@ -168518,34 +161126,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "these_0_6_2_1" = callPackage - ({ mkDerivation, base, bifunctors, containers, data-default-class - , hashable, mtl, profunctors, QuickCheck, quickcheck-instances - , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers - , transformers-compat, unordered-containers, vector - }: - mkDerivation { - pname = "these"; - version = "0.6.2.1"; - sha256 = "41dd6403ec489deef66632fcae4cd058f636badb162aedff7c8b4930affb99bb"; - revision = "2"; - editedCabalFile = "3899efa5ea17e23cfb9acde7fa3316fa35183358b90d4540899b5d9d38d59a35"; - libraryHaskellDepends = [ - base bifunctors containers data-default-class hashable mtl - profunctors semigroupoids semigroups transformers - transformers-compat unordered-containers vector - ]; - testHaskellDepends = [ - base bifunctors containers hashable QuickCheck quickcheck-instances - tasty tasty-quickcheck transformers unordered-containers vector - ]; - jailbreak = true; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "these" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, containers , data-default-class, deepseq, hashable, keys, mtl, profunctors @@ -168702,7 +161282,6 @@ self: { testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; license = stdenv.lib.licenses.bsd3; @@ -169015,28 +161594,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "tidal_0_7_1" = callPackage - ({ mkDerivation, base, binary, bytestring, colour, containers - , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec - , PortMidi, process, serialport, text, time, transformers - , websockets - }: - mkDerivation { - pname = "tidal"; - version = "0.7.1"; - sha256 = "fce7b8e13e4fd0b520a68fa9733cf1a29dfaf6cbdeb37be463b3e6d4ed700314"; - libraryHaskellDepends = [ - base binary bytestring colour containers hashable hmt hosc - mersenne-random-pure64 mtl parsec PortMidi process serialport text - time transformers websockets - ]; - jailbreak = true; - homepage = "http://tidal.lurk.org/"; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tidal" = callPackage ({ mkDerivation, base, binary, bytestring, colour, containers , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec, process @@ -169405,26 +161962,6 @@ self: { }) {}; "time-parsers" = callPackage - ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers - , tasty, tasty-hunit, template-haskell, text, time - }: - mkDerivation { - pname = "time-parsers"; - version = "0.1.0.0"; - sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8"; - revision = "4"; - editedCabalFile = "b245d40a3dd52af19e835fb9b0aaa9373dddd63cff13a3c298c97e02bca29e1e"; - libraryHaskellDepends = [ base parsers template-haskell time ]; - testHaskellDepends = [ - attoparsec base bifunctors parsec parsers tasty tasty-hunit - template-haskell text time - ]; - homepage = "https://github.com/phadej/time-parsers#readme"; - description = "Parsers for types in `time`"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-parsers_0_1_1_0" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers , tasty, tasty-hunit, template-haskell, text, time }: @@ -169440,7 +161977,6 @@ self: { homepage = "https://github.com/phadej/time-parsers#readme"; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-patterns" = callPackage @@ -169878,20 +162414,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "timezone-series_0_1_5_1" = callPackage - ({ mkDerivation, base, time }: - mkDerivation { - pname = "timezone-series"; - version = "0.1.5.1"; - sha256 = "d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56"; - libraryHaskellDepends = [ base time ]; - jailbreak = true; - homepage = "http://projects.haskell.org/time-ng/"; - description = "Enhanced timezone handling for Data.Time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "timezone-series" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -170944,21 +163466,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "transformers-compat_0_4_0_4" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "transformers-compat"; - version = "0.4.0.4"; - sha256 = "d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52"; - libraryHaskellDepends = [ base transformers ]; - doHaddock = false; - jailbreak = true; - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "transformers-compat" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { @@ -171425,34 +163932,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "trifecta_1_5_2" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base - , blaze-builder, blaze-html, blaze-markup, bytestring, charset - , comonad, containers, deepseq, directory, doctest, filepath - , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors - , QuickCheck, reducers, semigroups, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "trifecta"; - version = "1.5.2"; - sha256 = "ebc23319d2cfd39c87b2cf688f3db45528e371de9a417fc9e07e50a796b6503a"; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html - blaze-markup bytestring charset comonad containers deepseq - fingertree ghc-prim hashable lens mtl parsers profunctors reducers - semigroups transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base directory doctest filepath parsers QuickCheck - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "trifecta" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, charset @@ -171792,31 +164271,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tttool_1_6_1_1" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib - }: - mkDerivation { - pname = "tttool"; - version = "1.6.1.1"; - sha256 = "6a002fd4ed43f6ddf165961baa88fa0eb75c4afa87f6916ec9e37331a3c5d78b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib - ]; - homepage = "https://github.com/entropia/tip-toi-reveng"; - description = "Working with files for the Tiptoi® pen"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF @@ -172113,7 +164567,6 @@ self: { libraryHaskellDepends = [ base optional-args parsec text turtle ]; executableHaskellDepends = [ base turtle ]; testHaskellDepends = [ base HUnit parsec ]; - doCheck = false; homepage = "https://github.com/elaye/turtle-options#readme"; description = "Collection of command line options and parsers for these options"; license = stdenv.lib.licenses.bsd3; @@ -172534,7 +164987,6 @@ self: { lens-aeson network-uri resourcet template-haskell text time twitter-types twitter-types-lens ]; - doCheck = false; homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; @@ -172561,27 +165013,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed_0_2_0_7" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, bytestring - , containers, http-conduit, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "twitter-feed"; - version = "0.2.0.7"; - sha256 = "031cafcb9685b1f3f677f9a168b72831f85df43e49a74cc9e89d3d7218e15d95"; - libraryHaskellDepends = [ - aeson authenticate-oauth base bytestring http-conduit - ]; - testHaskellDepends = [ - base containers HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/stackbuilders/twitter-feed"; - description = "Client for fetching Twitter timeline via Oauth"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "twitter-feed" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework @@ -173035,19 +165466,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "type-list_0_3_0_4" = callPackage - ({ mkDerivation, base, singletons }: - mkDerivation { - pname = "type-list"; - version = "0.3.0.4"; - sha256 = "cd06218bf2f6897e0caf85c86334d8834ea36410a0d0b1d9193e1cbadd1b300a"; - libraryHaskellDepends = [ base singletons ]; - jailbreak = true; - description = "Operations on type-level lists and tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "type-list" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -173510,34 +165928,6 @@ self: { license = "GPL"; }) {}; - "tz_0_1_1_1" = callPackage - ({ mkDerivation, base, binary, bindings-posix, bytestring - , containers, data-default, deepseq, HUnit, QuickCheck - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, time, tzdata, unix - , vector - }: - mkDerivation { - pname = "tz"; - version = "0.1.1.1"; - sha256 = "66862e68a1dca1a9fb5372b86f23ae64f39ff0f2f075041fc3dae4c7d2dedcd0"; - libraryHaskellDepends = [ - base binary bytestring containers data-default deepseq - template-haskell time tzdata vector - ]; - testHaskellDepends = [ - base bindings-posix HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - time tzdata unix vector - ]; - jailbreak = true; - preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - homepage = "https://github.com/nilcons/haskell-tz"; - description = "Efficient time zone handling"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , deepseq, HUnit, QuickCheck, template-haskell, test-framework @@ -174404,18 +166794,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "union_0_1_1_0" = callPackage - ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: - mkDerivation { - pname = "union"; - version = "0.1.1.0"; - sha256 = "d83b04349288fe9b73c254312da9850e1c05717beb7f8db6f7fefed83f1a82e6"; - 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 { @@ -174808,21 +167186,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-compat_0_4_1_4" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; - version = "0.4.1.4"; - sha256 = "fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b"; - revision = "2"; - editedCabalFile = "2c9cfb5497baed3eeddfe5c6cc249bf51a76e2bb646c322b8f45a0db8c42129c"; - libraryHaskellDepends = [ base unix ]; - homepage = "http://github.com/jystic/unix-compat"; - description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unix-compat" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -174923,23 +167286,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-time_0_3_6" = callPackage - ({ mkDerivation, base, binary, bytestring, doctest, hspec - , old-locale, old-time, QuickCheck, time - }: - mkDerivation { - pname = "unix-time"; - version = "0.3.6"; - sha256 = "5d15ebd0ee74e13638a7c04a7fc5f05a29ccd3228c8798df226939a778f7db37"; - libraryHaskellDepends = [ base binary bytestring old-time ]; - testHaskellDepends = [ - base bytestring doctest hspec old-locale old-time QuickCheck time - ]; - description = "Unix time parser/formatter and utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unix-time" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hspec , old-locale, old-time, QuickCheck, time @@ -175355,30 +167701,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "uri-bytestring_0_2_1_2" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, derive, HUnit, lens-simple, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.1.2"; - sha256 = "885eacdbca1a94b32eadcaaf20b87be7e293a09418007e0c77cc613ccaecc8eb"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers derive HUnit - lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uri-bytestring" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, derive, HUnit, lens-simple, QuickCheck @@ -175422,21 +167744,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "uri-encode_1_5_0_4" = callPackage - ({ mkDerivation, base, bytestring, network-uri, text, utf8-string - }: - mkDerivation { - pname = "uri-encode"; - version = "1.5.0.4"; - sha256 = "f7ca380f88a3cc815cdffeb7cc714fbed4b9bd8da1a4ac3139e4ab001179f582"; - libraryHaskellDepends = [ - base bytestring network-uri text utf8-string - ]; - description = "Unicode aware uri-encoding"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uri-encode" = callPackage ({ mkDerivation, base, bytestring, network-uri, text, utf8-string }: @@ -175766,23 +168073,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "userid_0_1_2_6" = callPackage - ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes - , web-routes-th - }: - mkDerivation { - pname = "userid"; - version = "0.1.2.6"; - sha256 = "2a6972e25defb31b57055249888ec19565e0f1b884da1235ef1af76d11f44ab1"; - libraryHaskellDepends = [ - aeson base boomerang safecopy web-routes web-routes-th - ]; - homepage = "http://www.github.com/Happstack/userid"; - description = "The UserId type and useful instances for web development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "userid" = callPackage ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes , web-routes-th @@ -175939,19 +168229,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "utility-ht_0_0_11" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "utility-ht"; - version = "0.0.11"; - sha256 = "5cdcc5c1eab4029d18f1712472d69b61265c2d543a8065e1e9762b1ddc235812"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; - description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -176173,7 +168450,6 @@ self: { base bytestring HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/aslatter/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -176201,20 +168477,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "uuid-orphans_1_3_11_1" = callPackage - ({ mkDerivation, base, safecopy, text, uuid-types, web-routes }: - mkDerivation { - pname = "uuid-orphans"; - version = "1.3.11.1"; - sha256 = "264028379dc6bfea1d84ebd6c745d666c51957430822b52480dd6413717a8b75"; - libraryHaskellDepends = [ - base safecopy text uuid-types web-routes - ]; - description = "Orphan instances for the UUID datatype"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uuid-orphans" = callPackage ({ mkDerivation, base, safecopy, text, th-lift, uuid-types , web-routes @@ -176258,7 +168520,6 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/aslatter/uuid"; description = "Type definitions for Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -177103,20 +169364,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "vector-fftw_0_1_3_6" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: - mkDerivation { - pname = "vector-fftw"; - version = "0.1.3.6"; - sha256 = "6ed9d7b6000fdc72d76e7d5a3bfe1441f67eee46bf6f814caf3c35524b000764"; - libraryHaskellDepends = [ base primitive storable-complex vector ]; - librarySystemDepends = [ fftw ]; - homepage = "http://hackage.haskell.org/package/vector-fftw"; - description = "A binding to the fftw library for one-dimensional vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) fftw;}; - "vector-fftw" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { @@ -177244,18 +169491,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-space_0_10_3" = callPackage - ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: - mkDerivation { - pname = "vector-space"; - version = "0.10.3"; - sha256 = "efe39aa83d5ec5187c26f88496faf7411d3ee943cbc719797e58d115b004c885"; - libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; - description = "Vector & affine spaces, linear maps, and derivatives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -177443,24 +169678,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "versions_2_0_0" = callPackage - ({ mkDerivation, base, either, megaparsec, microlens, semigroups - , tasty, tasty-hunit, text - }: - mkDerivation { - pname = "versions"; - version = "2.0.0"; - sha256 = "d8e18c140295e45e6b4f9c103c0c9d953a3baa769a0a364648074ad91623b7d2"; - libraryHaskellDepends = [ base megaparsec semigroups text ]; - testHaskellDepends = [ - base either microlens tasty tasty-hunit text - ]; - jailbreak = true; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "versions" = callPackage ({ mkDerivation, base, either, megaparsec, microlens, semigroups , tasty, tasty-hunit, text @@ -178039,43 +170256,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) vte;}; - "vty_5_5_0" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , data-default, deepseq, directory, filepath, hashable, HUnit - , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec - , QuickCheck, quickcheck-assertions, random, smallcheck, stm - , string-qq, terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.5.0"; - sha256 = "9e185e42aff3385767b2f025765d896d8f503719f08cc6484f1c12b795eca41d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers data-default deepseq - directory filepath hashable microlens microlens-mtl microlens-th - mtl parallel parsec stm terminfo text transformers unix utf8-string - vector - ]; - executableHaskellDepends = [ - base containers data-default microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers data-default deepseq - HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions - random smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "vty" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , data-default, deepseq, directory, filepath, hashable, HUnit @@ -178320,43 +170500,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-app-static_3_1_5" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, cryptonite, directory, file-embed - , filepath, hspec, http-date, http-types, memory, mime-types - , network, old-locale, optparse-applicative, template-haskell - , temporary, text, time, transformers, unix-compat - , unordered-containers, wai, wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.5"; - sha256 = "28667193acfcc534752b715b5f5e16fc58edb550d03c0eb2b68e123e41030d4c"; - revision = "1"; - editedCabalFile = "c3f6628138ef318fc0a5a77949627b7ce06d149f53c21a2832b671664ea473de"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - cryptonite directory file-embed filepath http-date http-types - memory mime-types old-locale optparse-applicative template-haskell - text time transformers unix-compat unordered-containers wai - wai-extra warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - network old-locale temporary text time transformers unix-compat wai - wai-extra zlib - ]; - homepage = "http://www.yesodweb.com/book/web-application-interface"; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-app-static" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, cryptonite, directory, file-embed @@ -178506,36 +170649,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_0_16_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.16.1"; - sha256 = "8f726e73e1895e30e260dd843159bce4cd10740dead9b1607884217bf0975157"; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive cookie fast-logger - hspec http-types HUnit resourcet text time transformers wai zlib - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie @@ -178785,26 +170898,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-logger_2_2_7" = callPackage - ({ mkDerivation, base, blaze-builder, byteorder, bytestring - , case-insensitive, doctest, fast-logger, http-types, network, unix - , unix-time, wai - }: - mkDerivation { - pname = "wai-logger"; - version = "2.2.7"; - sha256 = "f4718c7661373b6a93fb7ac4b4662617f9e161f6b9297d0f665f71391e489607"; - libraryHaskellDepends = [ - base blaze-builder byteorder bytestring case-insensitive - fast-logger http-types network unix unix-time wai - ]; - testHaskellDepends = [ base doctest ]; - doCheck = false; - description = "A logging system for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-logger" = callPackage ({ mkDerivation, base, blaze-builder, byteorder, bytestring , case-insensitive, doctest, fast-logger, http-types, network, unix @@ -179003,36 +171096,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-middleware-content-type_0_4_0" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, exceptions, hashable, hspec, hspec-wai, http-media - , http-types, lucid, mmorph, monad-control, monad-logger, mtl - , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec - , text, transformers, transformers-base, unordered-containers - , urlpath, wai, wai-transformers, warp - }: - mkDerivation { - pname = "wai-middleware-content-type"; - version = "0.4.0"; - sha256 = "bccf5fb49c39cde628d8e73b4afff934186cba6824a8b04501bb3fbada4229eb"; - libraryHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable http-media http-types lucid mmorph monad-control - monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base unordered-containers urlpath wai wai-transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable hspec hspec-wai http-media http-types lucid mmorph - monad-control monad-logger mtl pandoc pandoc-types resourcet - shakespeare tasty tasty-hspec text transformers transformers-base - unordered-containers urlpath wai wai-transformers warp - ]; - description = "A simple WAI library for responding with content"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-middleware-content-type" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , clay, exceptions, hashable, hspec, hspec-wai, http-media @@ -179063,36 +171126,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-crowd_0_1_4_1" = callPackage - ({ mkDerivation, authenticate, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, clientsession - , containers, cookie, gitrev, http-client, http-client-tls - , http-reverse-proxy, http-types, optparse-applicative, resourcet - , template-haskell, text, time, transformers, unix-compat, vault - , wai, wai-app-static, wai-extra, warp - }: - mkDerivation { - pname = "wai-middleware-crowd"; - version = "0.1.4.1"; - sha256 = "b9bf4c1fe892232a8f3adcaca9407f81cadd2a8926e763eb2ecb35b2e9674d2e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - authenticate base base64-bytestring binary blaze-builder bytestring - case-insensitive clientsession containers cookie http-client - http-client-tls http-types resourcet text time unix-compat vault - wai - ]; - executableHaskellDepends = [ - base bytestring clientsession gitrev http-client http-client-tls - http-reverse-proxy http-types optparse-applicative template-haskell - text transformers wai wai-app-static wai-extra warp - ]; - description = "Middleware and utilities for using Atlassian Crowd authentication"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-middleware-crowd" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession @@ -179357,24 +171390,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-verbs_0_2_0" = callPackage - ({ mkDerivation, base, errors, exceptions, hashable, http-types - , mmorph, monad-logger, mtl, resourcet, transformers - , transformers-base, unordered-containers, wai - }: - mkDerivation { - pname = "wai-middleware-verbs"; - version = "0.2.0"; - sha256 = "5e88a38e8e838be9334b72a4dcec70874fe02c8b128dc7a64e682cacfb6ffbf3"; - libraryHaskellDepends = [ - base errors exceptions hashable http-types mmorph monad-logger mtl - resourcet transformers transformers-base unordered-containers wai - ]; - description = "Route different middleware responses based on the incoming HTTP verb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-middleware-verbs" = callPackage ({ mkDerivation, base, errors, exceptions, hashable, http-types , mmorph, monad-logger, mtl, resourcet, transformers @@ -179392,32 +171407,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-predicates_0_8_6" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, cookie, http-types - , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers - , vault, vector, wai - }: - mkDerivation { - pname = "wai-predicates"; - version = "0.8.6"; - sha256 = "7aba73c37a27975b37077b6f06d6c34488750ff022210e29a0966c68fafde918"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types singletons transformers vault vector wai - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types tasty - tasty-hunit tasty-quickcheck wai - ]; - jailbreak = true; - doCheck = false; - homepage = "https://gitlab.com/twittner/wai-predicates/"; - description = "WAI request predicates"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-predicates" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types @@ -179470,26 +171459,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-route_0_3_1" = callPackage - ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck - , tasty, tasty-quickcheck, unordered-containers, wai - }: - mkDerivation { - pname = "wai-route"; - version = "0.3.1"; - sha256 = "6715210058c36baf8476f27807f1ac7ef9c190f5769d516f3edfeae4fb753aef"; - libraryHaskellDepends = [ - base bytestring http-types unordered-containers wai - ]; - testHaskellDepends = [ - base bytestring http-types mtl QuickCheck tasty tasty-quickcheck - wai - ]; - description = "Minimalistic, efficient routing for WAI"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-route" = callPackage ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck , tasty, tasty-quickcheck, unordered-containers, wai @@ -179549,32 +171518,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-routing_0_12_3" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, containers, cookie - , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers - , wai, wai-predicates, wai-route - }: - mkDerivation { - pname = "wai-routing"; - version = "0.12.3"; - sha256 = "9ce8d30b45ac65162589236b33f4ea417f784c70a1cc10b564880819d2620b0b"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types transformers wai wai-predicates wai-route - ]; - testHaskellDepends = [ - base blaze-builder bytestring bytestring-conversion - case-insensitive containers http-types tasty tasty-hunit - tasty-quickcheck wai wai-predicates - ]; - jailbreak = true; - homepage = "https://gitlab.com/twittner/wai-routing/"; - description = "Declarative routing for WAI"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-routing" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie @@ -179830,32 +171773,6 @@ self: { license = "unknown"; }) {}; - "wai-websockets_3_0_0_9" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , file-embed, http-types, network, text, transformers, wai - , wai-app-static, warp, websockets - }: - mkDerivation { - pname = "wai-websockets"; - version = "3.0.0.9"; - sha256 = "a2476dcd0474a4d3322b4d0bbf0418eebb834ad03cecd43d1648d0c73c9f2883"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types network - transformers wai websockets - ]; - executableHaskellDepends = [ - base blaze-builder bytestring case-insensitive file-embed - http-types network text transformers wai wai-app-static warp - websockets - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provide a bridge between WAI and the websockets package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-websockets" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , file-embed, http-types, network, text, transformers, wai @@ -179954,39 +171871,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "warp_3_2_7" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.7"; - sha256 = "ca8f59f9467151a453b5eaa6631d6ccb12ffabd4cd074bf32908e780b695f184"; - libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers ghc-prim hashable - http-date http-types http2 iproute network simple-sendfile stm - streaming-commons text unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck silently - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 - ]; - doCheck = false; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers @@ -180391,26 +172275,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "web-routes_0_27_10" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; - version = "0.27.10"; - sha256 = "1d0f5da073271aa45dbcc9ef51791841f45d13f16756cfe3c16d731e2dd67b4c"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck ]; - homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; - description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "web-routes" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, exceptions , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck @@ -180727,30 +172591,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "webdriver-angular_0_1_10" = callPackage - ({ mkDerivation, aeson, base, hspec, hspec-webdriver - , language-javascript, template-haskell, text, transformers - , unordered-containers, wai-app-static, warp, webdriver - }: - mkDerivation { - pname = "webdriver-angular"; - version = "0.1.10"; - sha256 = "93e341b71b93ecd09a9bdfeae6b5debb4b92832e647ed041f435a6ef0bc34c5b"; - libraryHaskellDepends = [ - aeson base language-javascript template-haskell text transformers - unordered-containers webdriver - ]; - testHaskellDepends = [ - base hspec hspec-webdriver transformers wai-app-static warp - webdriver - ]; - doCheck = false; - homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; - description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "webdriver-angular" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers @@ -180898,25 +172738,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; - "webkitgtk3_0_14_1_1" = callPackage - ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools - , gtk3, mtl, pango, text, transformers, webkit - }: - mkDerivation { - pname = "webkitgtk3"; - version = "0.14.1.1"; - sha256 = "a8edd6470fe9a6c82f98bc331d23f6c6fb6978b6d63f03f010e0c7e1000eb216"; - libraryHaskellDepends = [ - base bytestring cairo glib gtk3 mtl pango text transformers - ]; - libraryPkgconfigDepends = [ webkit ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Webkit library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit @@ -180935,22 +172756,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {webkit = null;}; - "webkitgtk3-javascriptcore_0_13_1_2" = callPackage - ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, webkit - , webkitgtk3 - }: - mkDerivation { - pname = "webkitgtk3-javascriptcore"; - version = "0.13.1.2"; - sha256 = "974924ce394670a7b60126f78eaad2d9a023acab3dfc2472202f07998a95e1bd"; - libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ]; - libraryPkgconfigDepends = [ webkit ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - description = "JavaScriptCore FFI from webkitgtk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - "webkitgtk3-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: mkDerivation { @@ -181021,35 +172826,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "websockets_0_9_6_2" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers, entropy - , HUnit, network, QuickCheck, random, SHA, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.9.6.2"; - sha256 = "d772478ca85b4723cadbf7d73a16c15dea466fd1524d6fe323a2675106c93353"; - revision = "1"; - editedCabalFile = "fcc1f199941e5ee4a5047a74a550877c5e8e6abe1e104f27478324d9112ecd19"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA test-framework test-framework-hunit test-framework-quickcheck2 - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "websockets" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy @@ -181076,23 +172852,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets-snap_0_9_2_0" = callPackage - ({ mkDerivation, base, bytestring, enumerator, mtl, snap-core - , snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; - version = "0.9.2.0"; - sha256 = "b7c30525c8a3ba5aeaadccaf47efc23ac52885e520012df6fc813fbf1bf35f0f"; - libraryHaskellDepends = [ - base bytestring enumerator mtl snap-core snap-server websockets - ]; - jailbreak = true; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "websockets-snap" = callPackage ({ mkDerivation, base, bytestring, io-streams, mtl, snap-core , snap-server, websockets @@ -181227,37 +172986,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "werewolf_1_0_2_2" = callPackage - ({ mkDerivation, aeson, base, containers, directory, extra - , filepath, lens, MonadRandom, mtl, optparse-applicative - , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "werewolf"; - version = "1.0.2.2"; - sha256 = "ef55f17c0d3a49f1135e9691d1cf29dbd0b538c4ef941b20f2f7ca7fd407fa81"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers directory extra filepath lens MonadRandom mtl - text transformers - ]; - executableHaskellDepends = [ - aeson base directory extra filepath lens MonadRandom mtl - optparse-applicative random-shuffle text transformers - ]; - testHaskellDepends = [ - base containers extra lens MonadRandom mtl QuickCheck tasty - tasty-quickcheck text - ]; - jailbreak = true; - homepage = "https://github.com/hjwylde/werewolf"; - description = "A game engine for playing werewolf within an arbitrary chat client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "werewolf" = callPackage ({ mkDerivation, aeson, base, containers, directory, extra , filepath, interpolate, lens, MonadRandom, mtl @@ -181283,28 +173011,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "werewolf-slack_1_0_1_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, extra, http-client - , http-client-tls, http-types, mtl, optparse-applicative, process - , text, wai, warp, werewolf - }: - mkDerivation { - pname = "werewolf-slack"; - version = "1.0.1.4"; - sha256 = "273414f32d25d2dcd8d4445b9055d8e59e68ffdd3f2e6e625de1e6a89b33d450"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring extra http-client http-client-tls http-types - mtl optparse-applicative process text wai warp werewolf - ]; - jailbreak = true; - homepage = "https://github.com/hjwylde/werewolf-slack"; - description = "A chat interface for playing werewolf in Slack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "werewolf-slack" = callPackage ({ mkDerivation, aeson, base, bytestring, extra, http-client , http-client-tls, http-types, mtl, optparse-applicative, process @@ -182522,22 +174228,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wuss_1_0_4" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "1.0.4"; - sha256 = "11a0072c4986d6aa60f686cf9fd29b58077706ab27aabad18d01e5942a179155"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - homepage = "https://github.com/tfausak/wuss#readme"; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wuss" = callPackage ({ mkDerivation, base, bytestring, connection, network, websockets }: @@ -182991,31 +174681,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "xdcc_1_0_4" = callPackage - ({ mkDerivation, ascii-progress, base, bytestring, case-insensitive - , concurrent-extra, concurrent-output, errors, iproute, irc-ctcp - , irc-dcc, lifted-base, network, optparse-applicative, path, random - , simpleirc, transformers, unix-compat - }: - mkDerivation { - pname = "xdcc"; - version = "1.0.4"; - sha256 = "ca6eec53d1229c85d50b64ff08ef4304c795c2fae5e96e730c25d42dbb41a9e9"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ascii-progress base bytestring case-insensitive concurrent-extra - concurrent-output errors iproute irc-ctcp irc-dcc lifted-base - network optparse-applicative path random simpleirc transformers - unix-compat - ]; - jailbreak = true; - homepage = "https://github.com/JanGe/xdcc"; - description = "A wget-like utility for retrieving files from XDCC bots on IRC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xdcc" = callPackage ({ mkDerivation, ascii-progress, async, base, bytestring , case-insensitive, concurrent-output, errors, iproute, irc-client @@ -183367,33 +175032,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xlsx_0_2_3" = callPackage - ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, Diff, extra, filepath, groom - , lens, mtl, network-uri, old-locale, raw-strings-qq, safe - , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time - , transformers, vector, xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; - version = "0.2.3"; - sha256 = "c1170f83d96c4fd500b2a09aa016d6e52668cabf5442e5ba7aa5c64b0e817563"; - libraryHaskellDepends = [ - base base64-bytestring binary-search bytestring conduit containers - data-default extra filepath lens mtl network-uri old-locale safe - text time transformers vector xml-conduit zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck time vector - xml-conduit - ]; - homepage = "https://github.com/qrilka/xlsx"; - description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xlsx" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, errors, extra, filepath @@ -184003,25 +175641,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "xmlhtml_0_2_3_4" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, parsec, text, unordered-containers - }: - mkDerivation { - pname = "xmlhtml"; - version = "0.2.3.4"; - sha256 = "d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533"; - revision = "1"; - editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9"; - libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - parsec text unordered-containers - ]; - description = "XML parser and renderer with HTML 5 quirks mode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xmlhtml" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, directory, HUnit, parsec, QuickCheck @@ -184821,36 +176440,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yaml_0_8_18_1" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, enclosed-exceptions - , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific - , semigroups, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.18.1"; - sha256 = "24610e879d243dd7307123d076d436197f7e28bee5d6a78cafe444833cc9ac7a"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - enclosed-exceptions filepath resourcet scientific semigroups text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit hspec HUnit - mockery resourcet text transformers unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libyaml;}; - "yaml" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions @@ -185380,37 +176969,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth_1_4_13_3" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.13.3"; - sha256 = "38380dcc421848882e1f0c4bdc01b24f8a007748ee1354185c0bff52aada5344"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html @@ -185440,31 +176998,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-auth-account_1_4_2" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger - , mtl, nonce, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, xml-conduit, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-account"; - version = "1.4.2"; - sha256 = "38d5c5795a6acb487f408b0bd7ab3fd874f3d99c5df94202dcbb436847e7eef3"; - libraryHaskellDepends = [ - base blaze-html bytestring mtl nonce persistent pwstore-fast text - yesod-auth yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base bytestring hspec monad-logger mtl persistent-sqlite resourcet - text xml-conduit yesod yesod-auth yesod-test - ]; - jailbreak = true; - homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; - description = "An account authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -185592,33 +177125,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-auth-hashdb_1_5_1_1" = callPackage - ({ mkDerivation, base, basic-prelude, bytestring, containers - , cryptohash, hspec, http-conduit, http-types, monad-logger - , network-uri, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-hashdb"; - version = "1.5.1.1"; - sha256 = "399d76adbee53b80af091b360ebe61ef8e013e13fc40226d0464f7076865bc23"; - libraryHaskellDepends = [ - base bytestring cryptohash persistent pwstore-fast text yesod-auth - yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base basic-prelude bytestring containers hspec http-conduit - http-types monad-logger network-uri persistent-sqlite resourcet - text wai-extra yesod yesod-auth yesod-core yesod-test - ]; - jailbreak = true; - homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; - description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-hashdb" = callPackage ({ mkDerivation, base, basic-prelude, bytestring, containers , cryptohash, hspec, http-conduit, http-types, monad-logger @@ -185628,8 +177134,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.5.1.2"; - sha256 = "95937003779f9024c65f960022dafcd125b28ae4de24b5b7be66b1dd9d4d5a66"; + version = "1.5.1.3"; + sha256 = "ea455c6cb2c60de6254860ed1b8d29f8e73154c24db3e2edbfc0090f728b051a"; libraryHaskellDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -185639,6 +177145,7 @@ self: { http-types monad-logger network-uri persistent-sqlite resourcet text wai-extra yesod yesod-auth yesod-core yesod-test ]; + doCheck = false; homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -185732,28 +177239,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-auth-oauth2_0_1_10" = callPackage - ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 - , hspec, http-client, http-conduit, http-types, lifted-base - , network-uri, random, text, transformers, vector, yesod-auth - , yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-auth-oauth2"; - version = "0.1.10"; - sha256 = "90b3748945e1661311d2ca791f82df8fcb0172e4266f5751374340686eb6e72b"; - libraryHaskellDepends = [ - aeson authenticate base bytestring hoauth2 http-client http-conduit - http-types lifted-base network-uri random text transformers vector - yesod-auth yesod-core yesod-form - ]; - testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; - description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 , hspec, http-client, http-conduit, http-types, lifted-base @@ -185829,40 +177314,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-bin_1_4_18_2" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, deepseq, directory, file-embed - , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, shakespeare, split, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls - , yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.4.18.2"; - sha256 = "4cfd0c6bb3a77e7d126a17e9d11fc50325afdb89c8ed04b9692f1e7948724151"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class deepseq - directory file-embed filepath fsnotify ghc ghc-paths http-client - http-conduit http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - shakespeare split streaming-commons tar template-haskell text time - transformers transformers-compat unix-compat unordered-containers - wai wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-bin" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra @@ -185981,47 +177432,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core_1_4_22" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , data-default, deepseq, deepseq-generics, directory, exceptions - , fast-logger, hspec, hspec-expectations, http-types, HUnit - , lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.22"; - sha256 = "21329336daff5825005efa5905a305e764f2db95e0e43e5d0f0a85fac8bcf124"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-core" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive @@ -186572,30 +177982,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-persistent_1_4_0_5" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.4.0.5"; - sha256 = "e5ad890ca4d4c0499ae08e5e1e294f4c1435e9395ba1ba9bb3acf3982eb8d2c2"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-persistent" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet @@ -187003,42 +178389,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-static_1_5_0_3" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, file-embed, filepath, hashable, hjsmin - , hspec, http-types, HUnit, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.5.0.3"; - sha256 = "a46f952593fc36323aba1352b4b7a2703bb609ec19b709447268e7be24f8ce74"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory file-embed - filepath hashable hjsmin http-types mime-types old-time process - resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default - directory file-embed filepath hjsmin hspec http-types HUnit - mime-types old-time process resourcet template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - wai-extra yesod-core yesod-test - ]; - homepage = "http://www.yesodweb.com/"; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-static" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra @@ -187093,7 +178443,6 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; - doCheck = false; homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; @@ -187127,33 +178476,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-test_1_5_1_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, containers, cookie - , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base - , monad-control, network, persistent, text, time, transformers, wai - , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.1.1"; - sha256 = "0886927c92ddc59608902c6fb02b8e8b9e631120dd6e75db764a95b5a75b0160"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive containers cookie hspec-core html-conduit - http-types HUnit monad-control network persistent text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-test" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie @@ -187515,27 +178837,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yi-rope_0_7_0_1" = callPackage - ({ mkDerivation, base, binary, bytestring, charsetdetect-ae - , data-default, deepseq, fingertree, hspec, QuickCheck - , quickcheck-instances, text, text-icu - }: - mkDerivation { - pname = "yi-rope"; - version = "0.7.0.1"; - sha256 = "e0d56d061a7b5e44d0b82290e7c03ef0c5cf278071c8264a23feb7bd725919a4"; - libraryHaskellDepends = [ - base binary bytestring charsetdetect-ae data-default deepseq - fingertree text text-icu - ]; - testHaskellDepends = [ - base hspec QuickCheck quickcheck-instances text - ]; - description = "A rope data structure used by Yi"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yi-rope" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae , data-default, deepseq, fingertree, hspec, QuickCheck @@ -188271,53 +179572,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zip-archive_0_2_3_7" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, text, time, unix, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.2.3.7"; - sha256 = "41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699"; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory HUnit old-time process time - ]; - testToolDepends = [ zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) zip;}; - "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.0.4"; - sha256 = "67a463b23e1694ad7d4d1f6815b009288c9b585bc411eb1754396b830eba8f92"; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory HUnit old-time process temporary time - unix - ]; - testToolDepends = [ zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) zip;}; - - "zip-archive_0_3_0_5" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty , process, temporary, text, time, unix, zip, zlib @@ -188338,7 +179593,6 @@ self: { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zip;}; "zip-conduit" = callPackage From 97fd9058235d9067b8760efec07643d06eada514 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2016 18:58:46 +0200 Subject: [PATCH 183/234] haskell: add support for 'hardeningDisable' to the generic builder We also have a new helper function 'disableHardening' to use in overrides. Fixes https://github.com/NixOS/nixpkgs/issues/14820. --- pkgs/development/haskell-modules/generic-builder.nix | 2 ++ pkgs/development/haskell-modules/lib.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5eb4e1fac83..2b597532b44 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -47,6 +47,7 @@ , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false +, hardeningDisable ? [] } @ args: assert editedCabalFile != null -> revision != null; @@ -329,5 +330,6 @@ stdenv.mkDerivation ({ // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } +// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } // optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index e96200578de..246a9f305db 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -62,6 +62,8 @@ rec { doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); + disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); + sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; buildPhase = "./Setup sdist"; From 6607b9916837b81b1c874c79b25388f5412aa636 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2016 19:05:32 +0200 Subject: [PATCH 184/234] haskell: port existing hardening overrides to use the new combinator --- .../haskell-modules/configuration-common.nix | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fae838e3d2f..b44519baa4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,9 +26,7 @@ self: super: { c2hs = dontCheck super.c2hs; # fix errors caused by hardening flags - epanet-haskell = super.epanet-haskell.overrideDerivation (drv: { - hardeningDisable = [ "format" ]; - }); + epanet-haskell = disableHardening super.epanet-haskell ["format"]; # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -214,24 +212,10 @@ self: super: { jwt = dontCheck super.jwt; # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 - gio = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.gio self.gtk2hs-buildtools - ) pkgs.glib) (drv: { - hardeningDisable = [ "fortify" ]; - }); - glib = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.glib self.gtk2hs-buildtools - ) pkgs.glib) (drv: { - hardeningDisable = [ "fortify" ]; - }); - gtk3 = pkgs.lib.overrideDerivation (super.gtk3.override { inherit (pkgs) gtk3; }) (drv: { - hardeningDisable = [ "fortify" ]; - }); - gtk = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.gtk self.gtk2hs-buildtools - ) pkgs.gtk2) (drv: { - hardeningDisable = [ "fortify" ]; - }); + gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; + gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; @@ -411,9 +395,7 @@ self: super: { lensref = dontCheck super.lensref; liquidhaskell = dontCheck super.liquidhaskell; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 - lvmrun = pkgs.lib.overrideDerivation (dontCheck super.lvmrun) (drv: { - hardeningDisable = [ "format" ]; - }); + lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; memcache = dontCheck super.memcache; milena = dontCheck super.milena; nats-queue = dontCheck super.nats-queue; @@ -951,9 +933,7 @@ self: super: { # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza cairo = addBuildTool super.cairo self.gtk2hs-buildtools; - pango = (addBuildTool super.pango self.gtk2hs-buildtools).overrideDerivation (drv: { - hardeningDisable = [ "fortify" ]; - }); + pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; # Fix tests which would otherwise fail with "Couldn't launch intero process." intero = overrideCabal super.intero (drv: { From f7133e4de60643d468809f16487f50f9bd5937c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2016 19:06:01 +0200 Subject: [PATCH 185/234] haskell: define top-level attributes for LTS 6.x and 7.x These attributes exist only for backwards compatibility with old versions of Stack and will be removed altogether soon. --- pkgs/top-level/haskell-packages.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 23737ca0ff7..4f9d7f09aff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -238,11 +238,24 @@ rec { lts-6_4 = packages.ghc7103; lts-6_5 = packages.ghc7103; lts-6_6 = packages.ghc7103; - lts-6_7 = packages.ghc7103.override { + lts-6_7 = packages.ghc7103; + lts-6_8 = packages.ghc7103; + lts-6_9 = packages.ghc7103; + lts-6_10 = packages.ghc7103; + lts-6_11 = packages.ghc7103; + lts-6_12 = packages.ghc7103; + lts-6_13 = packages.ghc7103; + lts-6_14 = packages.ghc7103; + lts-6_15 = packages.ghc7103; + lts-6_16 = packages.ghc7103; + lts-6_17 = packages.ghc7103; + lts-6 = packages.lts-6_17; + + lts-7_0 = packages.ghc801.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts.nix { }; }; - lts-6 = packages.lts-6_7; + lts-7 = packages.lts-7_0; - lts = packages.lts-6; + lts = packages.lts-7; }; } From 055a3e52c5e10aada181e006f90cf36b46811c57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2016 19:06:56 +0200 Subject: [PATCH 186/234] Switch the 'haskellPackages' attribute set to the latest version of LTS-7.x. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2edce791899..dc949e50ee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4737,7 +4737,7 @@ in haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc801.override { + haskellPackages = haskell.packages.lts-7.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; From 9123a0452d0fc068954366ec1d4f3799a9a42480 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2016 19:23:06 +0200 Subject: [PATCH 187/234] haskell: drop obsolete LTS package set The default 'haskellPackages' set now corresponds to the latest available version of LTS 7.x. --- .../haskell-modules/configuration-lts.nix | 8284 ----------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 4 +- 3 files changed, 2 insertions(+), 8288 deletions(-) delete mode 100644 pkgs/development/haskell-modules/configuration-lts.nix diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix deleted file mode 100644 index 57e5fc19138..00000000000 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ /dev/null @@ -1,8284 +0,0 @@ -{ pkgs }: - -with import ./lib.nix { inherit pkgs; }; - -self: super: { - - # core libraries provided by the compiler - Cabal = null; - array = null; - base = null; - binary = null; - bytestring = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-prim = null; - ghci = null; - hoopl = null; - hpc = null; - integer-gmp = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - transformers = null; - unix = null; - - # lts-7.0 packages - "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; - "3dmodels" = dontDistribute super."3dmodels"; - "4Blocks" = dontDistribute super."4Blocks"; - "AAI" = dontDistribute super."AAI"; - "ABList" = dontDistribute super."ABList"; - "AC-Angle" = dontDistribute super."AC-Angle"; - "AC-Boolean" = dontDistribute super."AC-Boolean"; - "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; - "AC-Colour" = dontDistribute super."AC-Colour"; - "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; - "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; - "AC-MiniTest" = dontDistribute super."AC-MiniTest"; - "AC-PPM" = dontDistribute super."AC-PPM"; - "AC-Random" = dontDistribute super."AC-Random"; - "AC-Terminal" = dontDistribute super."AC-Terminal"; - "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; - "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; - "ACME" = dontDistribute super."ACME"; - "ADPfusion" = dontDistribute super."ADPfusion"; - "AERN-Basics" = dontDistribute super."AERN-Basics"; - "AERN-Net" = dontDistribute super."AERN-Net"; - "AERN-Real" = dontDistribute super."AERN-Real"; - "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; - "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; - "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; - "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; - "AES" = dontDistribute super."AES"; - "AFSM" = dontDistribute super."AFSM"; - "AGI" = dontDistribute super."AGI"; - "ALUT" = dontDistribute super."ALUT"; - "AMI" = dontDistribute super."AMI"; - "ANum" = dontDistribute super."ANum"; - "ASN1" = dontDistribute super."ASN1"; - "AVar" = dontDistribute super."AVar"; - "AWin32Console" = dontDistribute super."AWin32Console"; - "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; - "AbortT-mtl" = dontDistribute super."AbortT-mtl"; - "AbortT-transformers" = dontDistribute super."AbortT-transformers"; - "ActionKid" = dontDistribute super."ActionKid"; - "Adaptive" = dontDistribute super."Adaptive"; - "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; - "Advgame" = dontDistribute super."Advgame"; - "AesonBson" = dontDistribute super."AesonBson"; - "Agata" = dontDistribute super."Agata"; - "Agda-executable" = dontDistribute super."Agda-executable"; - "AhoCorasick" = dontDistribute super."AhoCorasick"; - "AlanDeniseEricLauren" = dontDistribute super."AlanDeniseEricLauren"; - "AlgorithmW" = dontDistribute super."AlgorithmW"; - "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; - "Allure" = dontDistribute super."Allure"; - "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; - "Animas" = dontDistribute super."Animas"; - "Annotations" = dontDistribute super."Annotations"; - "Ansi2Html" = dontDistribute super."Ansi2Html"; - "ApplePush" = dontDistribute super."ApplePush"; - "AppleScript" = dontDistribute super."AppleScript"; - "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; - "ArrayRef" = dontDistribute super."ArrayRef"; - "ArrowVHDL" = dontDistribute super."ArrowVHDL"; - "AspectAG" = dontDistribute super."AspectAG"; - "AttoBencode" = dontDistribute super."AttoBencode"; - "AttoJson" = dontDistribute super."AttoJson"; - "Attrac" = dontDistribute super."Attrac"; - "Aurochs" = dontDistribute super."Aurochs"; - "AutoForms" = dontDistribute super."AutoForms"; - "AvlTree" = dontDistribute super."AvlTree"; - "BASIC" = dontDistribute super."BASIC"; - "BCMtools" = dontDistribute super."BCMtools"; - "BNFC" = dontDistribute super."BNFC"; - "BNFC-meta" = dontDistribute super."BNFC-meta"; - "Baggins" = dontDistribute super."Baggins"; - "Bang" = dontDistribute super."Bang"; - "Barracuda" = dontDistribute super."Barracuda"; - "Befunge93" = dontDistribute super."Befunge93"; - "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; - "BerkeleyDB" = dontDistribute super."BerkeleyDB"; - "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; - "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; - "BiGUL" = dontDistribute super."BiGUL"; - "BigPixel" = dontDistribute super."BigPixel"; - "Binpack" = dontDistribute super."Binpack"; - "Biobase" = dontDistribute super."Biobase"; - "BiobaseBlast" = dontDistribute super."BiobaseBlast"; - "BiobaseDotP" = dontDistribute super."BiobaseDotP"; - "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; - "BiobaseFasta" = dontDistribute super."BiobaseFasta"; - "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; - "BiobaseMAF" = dontDistribute super."BiobaseMAF"; - "BiobaseNewick" = dontDistribute super."BiobaseNewick"; - "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; - "BiobaseTurner" = dontDistribute super."BiobaseTurner"; - "BiobaseTypes" = dontDistribute super."BiobaseTypes"; - "BiobaseVienna" = dontDistribute super."BiobaseVienna"; - "BiobaseXNA" = dontDistribute super."BiobaseXNA"; - "BirdPP" = dontDistribute super."BirdPP"; - "BitSyntax" = dontDistribute super."BitSyntax"; - "Bitly" = dontDistribute super."Bitly"; - "Blobs" = dontDistribute super."Blobs"; - "BlogLiterately" = dontDistribute super."BlogLiterately"; - "BlogLiterately-diagrams" = dontDistribute super."BlogLiterately-diagrams"; - "BluePrintCSS" = dontDistribute super."BluePrintCSS"; - "Blueprint" = dontDistribute super."Blueprint"; - "Bookshelf" = dontDistribute super."Bookshelf"; - "Bravo" = dontDistribute super."Bravo"; - "BufferedSocket" = dontDistribute super."BufferedSocket"; - "Buster" = dontDistribute super."Buster"; - "CBOR" = dontDistribute super."CBOR"; - "CC-delcont" = dontDistribute super."CC-delcont"; - "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; - "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; - "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; - "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; - "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; - "CCA" = dontDistribute super."CCA"; - "CHXHtml" = dontDistribute super."CHXHtml"; - "CLASE" = dontDistribute super."CLASE"; - "CLI" = dontDistribute super."CLI"; - "CMCompare" = dontDistribute super."CMCompare"; - "CMQ" = dontDistribute super."CMQ"; - "COrdering" = dontDistribute super."COrdering"; - "CPBrainfuck" = dontDistribute super."CPBrainfuck"; - "CPL" = dontDistribute super."CPL"; - "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; - "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; - "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; - "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; - "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; - "CSPM-cspm" = dontDistribute super."CSPM-cspm"; - "CTRex" = dontDistribute super."CTRex"; - "CV" = dontDistribute super."CV"; - "Cabal-ide-backend" = dontDistribute super."Cabal-ide-backend"; - "CabalSearch" = dontDistribute super."CabalSearch"; - "Capabilities" = dontDistribute super."Capabilities"; - "Cardinality" = dontDistribute super."Cardinality"; - "CarneadesDSL" = dontDistribute super."CarneadesDSL"; - "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; - "Cartesian" = dontDistribute super."Cartesian"; - "Cascade" = dontDistribute super."Cascade"; - "Catana" = dontDistribute super."Catana"; - "Chart-gtk" = dontDistribute super."Chart-gtk"; - "Chart-simple" = dontDistribute super."Chart-simple"; - "CheatSheet" = dontDistribute super."CheatSheet"; - "Checked" = dontDistribute super."Checked"; - "Chitra" = dontDistribute super."Chitra"; - "ChristmasTree" = dontDistribute super."ChristmasTree"; - "CirruParser" = dontDistribute super."CirruParser"; - "ClassLaws" = dontDistribute super."ClassLaws"; - "ClassyPrelude" = dontDistribute super."ClassyPrelude"; - "Clean" = dontDistribute super."Clean"; - "Coadjute" = dontDistribute super."Coadjute"; - "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; - "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; - "Combinatorrent" = dontDistribute super."Combinatorrent"; - "Command" = dontDistribute super."Command"; - "Commando" = dontDistribute super."Commando"; - "ComonadSheet" = dontDistribute super."ComonadSheet"; - "Concurrent-Cache" = dontDistribute super."Concurrent-Cache"; - "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; - "Concurrential" = dontDistribute super."Concurrential"; - "Condor" = dontDistribute super."Condor"; - "ConfigFileTH" = dontDistribute super."ConfigFileTH"; - "Configger" = dontDistribute super."Configger"; - "Configurable" = dontDistribute super."Configurable"; - "ConsStream" = dontDistribute super."ConsStream"; - "Conscript" = dontDistribute super."Conscript"; - "ConstraintKinds" = dontDistribute super."ConstraintKinds"; - "Consumer" = dontDistribute super."Consumer"; - "ContArrow" = dontDistribute super."ContArrow"; - "ContextAlgebra" = dontDistribute super."ContextAlgebra"; - "Contract" = dontDistribute super."Contract"; - "Control-Engine" = dontDistribute super."Control-Engine"; - "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; - "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; - "CoreDump" = dontDistribute super."CoreDump"; - "CoreErlang" = dontDistribute super."CoreErlang"; - "CoreFoundation" = dontDistribute super."CoreFoundation"; - "Coroutine" = dontDistribute super."Coroutine"; - "CouchDB" = dontDistribute super."CouchDB"; - "Craft3e" = dontDistribute super."Craft3e"; - "Crypto" = dontDistribute super."Crypto"; - "CurryDB" = dontDistribute super."CurryDB"; - "DAG-Tournament" = dontDistribute super."DAG-Tournament"; - "DBlimited" = dontDistribute super."DBlimited"; - "DBus" = dontDistribute super."DBus"; - "DCFL" = dontDistribute super."DCFL"; - "DMuCheck" = dontDistribute super."DMuCheck"; - "DOM" = dontDistribute super."DOM"; - "DP" = dontDistribute super."DP"; - "DPM" = dontDistribute super."DPM"; - "DPutils" = dontDistribute super."DPutils"; - "DSA" = dontDistribute super."DSA"; - "DSH" = dontDistribute super."DSH"; - "DSTM" = dontDistribute super."DSTM"; - "DTC" = dontDistribute super."DTC"; - "Dangerous" = dontDistribute super."Dangerous"; - "Dao" = dontDistribute super."Dao"; - "DarcsHelpers" = dontDistribute super."DarcsHelpers"; - "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; - "Data-Rope" = dontDistribute super."Data-Rope"; - "DataTreeView" = dontDistribute super."DataTreeView"; - "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; - "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; - "DecisionTree" = dontDistribute super."DecisionTree"; - "DeepArrow" = dontDistribute super."DeepArrow"; - "DefendTheKing" = dontDistribute super."DefendTheKing"; - "Delta-Lambda" = dontDistribute super."Delta-Lambda"; - "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; - "Dflow" = dontDistribute super."Dflow"; - "DifferenceLogic" = dontDistribute super."DifferenceLogic"; - "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; - "Digit" = dontDistribute super."Digit"; - "DigitalOcean" = dontDistribute super."DigitalOcean"; - "DimensionalHash" = dontDistribute super."DimensionalHash"; - "DirectSound" = dontDistribute super."DirectSound"; - "DisTract" = dontDistribute super."DisTract"; - "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; - "Dish" = dontDistribute super."Dish"; - "Dist" = dontDistribute super."Dist"; - "DistanceTransform" = dontDistribute super."DistanceTransform"; - "DistanceUnits" = dontDistribute super."DistanceUnits"; - "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; - "DocTest" = dontDistribute super."DocTest"; - "Docs" = dontDistribute super."Docs"; - "DrHylo" = dontDistribute super."DrHylo"; - "DrIFT" = dontDistribute super."DrIFT"; - "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; - "Dung" = dontDistribute super."Dung"; - "Dust" = dontDistribute super."Dust"; - "Dust-crypto" = dontDistribute super."Dust-crypto"; - "Dust-tools" = dontDistribute super."Dust-tools"; - "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; - "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; - "DysFRP" = dontDistribute super."DysFRP"; - "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; - "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; - "EEConfig" = dontDistribute super."EEConfig"; - "EditTimeReport" = dontDistribute super."EditTimeReport"; - "EitherT" = dontDistribute super."EitherT"; - "Elm" = dontDistribute super."Elm"; - "Emping" = dontDistribute super."Emping"; - "Encode" = dontDistribute super."Encode"; - "EntrezHTTP" = dontDistribute super."EntrezHTTP"; - "EnumContainers" = dontDistribute super."EnumContainers"; - "EnumMap" = dontDistribute super."EnumMap"; - "Eq" = dontDistribute super."Eq"; - "EqualitySolver" = dontDistribute super."EqualitySolver"; - "EsounD" = dontDistribute super."EsounD"; - "EstProgress" = dontDistribute super."EstProgress"; - "EtaMOO" = dontDistribute super."EtaMOO"; - "Etage" = dontDistribute super."Etage"; - "Etage-Graph" = dontDistribute super."Etage-Graph"; - "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; - "Etherbunny" = dontDistribute super."Etherbunny"; - "EuroIT" = dontDistribute super."EuroIT"; - "Euterpea" = dontDistribute super."Euterpea"; - "EventSocket" = dontDistribute super."EventSocket"; - "Extra" = dontDistribute super."Extra"; - "FComp" = dontDistribute super."FComp"; - "FM-SBLEX" = dontDistribute super."FM-SBLEX"; - "FModExRaw" = dontDistribute super."FModExRaw"; - "FPretty" = dontDistribute super."FPretty"; - "FTGL" = dontDistribute super."FTGL"; - "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; - "FTPLine" = dontDistribute super."FTPLine"; - "Facts" = dontDistribute super."Facts"; - "FailureT" = dontDistribute super."FailureT"; - "FastxPipe" = dontDistribute super."FastxPipe"; - "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; - "FerryCore" = dontDistribute super."FerryCore"; - "Feval" = dontDistribute super."Feval"; - "FieldTrip" = dontDistribute super."FieldTrip"; - "FileManip" = dontDistribute super."FileManip"; - "FileManipCompat" = dontDistribute super."FileManipCompat"; - "FilePather" = dontDistribute super."FilePather"; - "FileSystem" = dontDistribute super."FileSystem"; - "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; - "Finance-Treasury" = dontDistribute super."Finance-Treasury"; - "FiniteMap" = dontDistribute super."FiniteMap"; - "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; - "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; - "Flippi" = dontDistribute super."Flippi"; - "Focus" = dontDistribute super."Focus"; - "Folly" = dontDistribute super."Folly"; - "ForSyDe" = dontDistribute super."ForSyDe"; - "ForestStructures" = dontDistribute super."ForestStructures"; - "ForkableT" = dontDistribute super."ForkableT"; - "FormalGrammars" = dontDistribute super."FormalGrammars"; - "Foster" = dontDistribute super."Foster"; - "FpMLv53" = dontDistribute super."FpMLv53"; - "FractalArt" = dontDistribute super."FractalArt"; - "Fractaler" = dontDistribute super."Fractaler"; - "Frank" = dontDistribute super."Frank"; - "FreeTypeGL" = dontDistribute super."FreeTypeGL"; - "FunGEn" = dontDistribute super."FunGEn"; - "Fungi" = dontDistribute super."Fungi"; - "GA" = dontDistribute super."GA"; - "GGg" = dontDistribute super."GGg"; - "GHood" = dontDistribute super."GHood"; - "GLFW" = dontDistribute super."GLFW"; - "GLFW-OGL" = dontDistribute super."GLFW-OGL"; - "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; - "GLFW-task" = dontDistribute super."GLFW-task"; - "GLHUI" = dontDistribute super."GLHUI"; - "GLM" = dontDistribute super."GLM"; - "GLMatrix" = dontDistribute super."GLMatrix"; - "GLUtil" = dontDistribute super."GLUtil"; - "GPX" = dontDistribute super."GPX"; - "GPipe" = dontDistribute super."GPipe"; - "GPipe-Collada" = dontDistribute super."GPipe-Collada"; - "GPipe-Examples" = dontDistribute super."GPipe-Examples"; - "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; - "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; - "GTALib" = dontDistribute super."GTALib"; - "Gamgine" = dontDistribute super."Gamgine"; - "Ganymede" = dontDistribute super."Ganymede"; - "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; - "GeBoP" = dontDistribute super."GeBoP"; - "GenI" = dontDistribute super."GenI"; - "GenSmsPdu" = dontDistribute super."GenSmsPdu"; - "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; - "GenussFold" = dontDistribute super."GenussFold"; - "GeoIp" = dontDistribute super."GeoIp"; - "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; - "Geodetic" = dontDistribute super."Geodetic"; - "GeomPredicates" = dontDistribute super."GeomPredicates"; - "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; - "GiST" = dontDistribute super."GiST"; - "Gifcurry" = dontDistribute super."Gifcurry"; - "GiveYouAHead" = dontDistribute super."GiveYouAHead"; - "GlomeTrace" = dontDistribute super."GlomeTrace"; - "GlomeVec" = dontDistribute super."GlomeVec"; - "GlomeView" = dontDistribute super."GlomeView"; - "GoogleChart" = dontDistribute super."GoogleChart"; - "GoogleDirections" = dontDistribute super."GoogleDirections"; - "GoogleSB" = dontDistribute super."GoogleSB"; - "GoogleSuggest" = dontDistribute super."GoogleSuggest"; - "GoogleTranslate" = dontDistribute super."GoogleTranslate"; - "GotoT-transformers" = dontDistribute super."GotoT-transformers"; - "GrammarProducts" = dontDistribute super."GrammarProducts"; - "Graph500" = dontDistribute super."Graph500"; - "GraphHammer" = dontDistribute super."GraphHammer"; - "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; - "Graphalyze" = dontDistribute super."Graphalyze"; - "Grempa" = dontDistribute super."Grempa"; - "GroteTrap" = dontDistribute super."GroteTrap"; - "Grow" = dontDistribute super."Grow"; - "GrowlNotify" = dontDistribute super."GrowlNotify"; - "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; - "GtkGLTV" = dontDistribute super."GtkGLTV"; - "GtkTV" = dontDistribute super."GtkTV"; - "GuiHaskell" = dontDistribute super."GuiHaskell"; - "GuiTV" = dontDistribute super."GuiTV"; - "HARM" = dontDistribute super."HARM"; - "HAppS-Data" = dontDistribute super."HAppS-Data"; - "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; - "HAppS-Server" = dontDistribute super."HAppS-Server"; - "HAppS-State" = dontDistribute super."HAppS-State"; - "HAppS-Util" = dontDistribute super."HAppS-Util"; - "HAppSHelpers" = dontDistribute super."HAppSHelpers"; - "HCL" = dontDistribute super."HCL"; - "HCard" = dontDistribute super."HCard"; - "HDBC-mysql" = dontDistribute super."HDBC-mysql"; - "HDBC-odbc" = dontDistribute super."HDBC-odbc"; - "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; - "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; - "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; - "HDRUtils" = dontDistribute super."HDRUtils"; - "HERA" = dontDistribute super."HERA"; - "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; - "HFuse" = dontDistribute super."HFuse"; - "HGE2D" = dontDistribute super."HGE2D"; - "HGL" = dontDistribute super."HGL"; - "HGamer3D" = dontDistribute super."HGamer3D"; - "HGamer3D-API" = dontDistribute super."HGamer3D-API"; - "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; - "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; - "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; - "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; - "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; - "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; - "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; - "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; - "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; - "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; - "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; - "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; - "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; - "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; - "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; - "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; - "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; - "HGraphStorage" = dontDistribute super."HGraphStorage"; - "HHDL" = dontDistribute super."HHDL"; - "HJScript" = dontDistribute super."HJScript"; - "HJVM" = dontDistribute super."HJVM"; - "HJavaScript" = dontDistribute super."HJavaScript"; - "HLearn-algebra" = dontDistribute super."HLearn-algebra"; - "HLearn-approximation" = dontDistribute super."HLearn-approximation"; - "HLearn-classification" = dontDistribute super."HLearn-classification"; - "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; - "HLearn-distributions" = dontDistribute super."HLearn-distributions"; - "HList" = dontDistribute super."HList"; - "HListPP" = dontDistribute super."HListPP"; - "HLogger" = dontDistribute super."HLogger"; - "HMM" = dontDistribute super."HMM"; - "HMap" = dontDistribute super."HMap"; - "HNM" = dontDistribute super."HNM"; - "HODE" = dontDistribute super."HODE"; - "HOpenCV" = dontDistribute super."HOpenCV"; - "HPath" = dontDistribute super."HPath"; - "HPhone" = dontDistribute super."HPhone"; - "HPi" = dontDistribute super."HPi"; - "HPlot" = dontDistribute super."HPlot"; - "HPong" = dontDistribute super."HPong"; - "HROOT" = dontDistribute super."HROOT"; - "HROOT-core" = dontDistribute super."HROOT-core"; - "HROOT-graf" = dontDistribute super."HROOT-graf"; - "HROOT-hist" = dontDistribute super."HROOT-hist"; - "HROOT-io" = dontDistribute super."HROOT-io"; - "HROOT-math" = dontDistribute super."HROOT-math"; - "HRay" = dontDistribute super."HRay"; - "HSFFIG" = dontDistribute super."HSFFIG"; - "HSGEP" = dontDistribute super."HSGEP"; - "HSH" = dontDistribute super."HSH"; - "HSHHelpers" = dontDistribute super."HSHHelpers"; - "HSlippyMap" = dontDistribute super."HSlippyMap"; - "HSmarty" = dontDistribute super."HSmarty"; - "HSoundFile" = dontDistribute super."HSoundFile"; - "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; - "HSvm" = dontDistribute super."HSvm"; - "HTTP-Simple" = dontDistribute super."HTTP-Simple"; - "HTab" = dontDistribute super."HTab"; - "HTicTacToe" = dontDistribute super."HTicTacToe"; - "HUnit-Diff" = dontDistribute super."HUnit-Diff"; - "HUnit-Plus" = dontDistribute super."HUnit-Plus"; - "HXMPP" = dontDistribute super."HXMPP"; - "HXQ" = dontDistribute super."HXQ"; - "HaLeX" = dontDistribute super."HaLeX"; - "HaMinitel" = dontDistribute super."HaMinitel"; - "HaPy" = dontDistribute super."HaPy"; - "HaTeX-meta" = dontDistribute super."HaTeX-meta"; - "HaTeX-qq" = dontDistribute super."HaTeX-qq"; - "HaVSA" = dontDistribute super."HaVSA"; - "HaXml" = dontDistribute super."HaXml"; - "Hach" = dontDistribute super."Hach"; - "HackMail" = dontDistribute super."HackMail"; - "Haggressive" = dontDistribute super."Haggressive"; - "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; - "Hangman" = dontDistribute super."Hangman"; - "HarmTrace" = dontDistribute super."HarmTrace"; - "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; - "HasGP" = dontDistribute super."HasGP"; - "Haschoo" = dontDistribute super."Haschoo"; - "Hashell" = dontDistribute super."Hashell"; - "HaskRel" = dontDistribute super."HaskRel"; - "HaskellForMaths" = dontDistribute super."HaskellForMaths"; - "HaskellLM" = dontDistribute super."HaskellLM"; - "HaskellNN" = dontDistribute super."HaskellNN"; - "HaskellTorrent" = dontDistribute super."HaskellTorrent"; - "HaskellTutorials" = dontDistribute super."HaskellTutorials"; - "Haskelloids" = dontDistribute super."Haskelloids"; - "Hate" = dontDistribute super."Hate"; - "Hawk" = dontDistribute super."Hawk"; - "Hayoo" = dontDistribute super."Hayoo"; - "Hedi" = dontDistribute super."Hedi"; - "HerbiePlugin" = dontDistribute super."HerbiePlugin"; - "Hermes" = dontDistribute super."Hermes"; - "Hieroglyph" = dontDistribute super."Hieroglyph"; - "HiggsSet" = dontDistribute super."HiggsSet"; - "Hipmunk" = dontDistribute super."Hipmunk"; - "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; - "Hish" = dontDistribute super."Hish"; - "Histogram" = dontDistribute super."Histogram"; - "Hmpf" = dontDistribute super."Hmpf"; - "Hoed" = dontDistribute super."Hoed"; - "HoleyMonoid" = dontDistribute super."HoleyMonoid"; - "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; - "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; - "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; - "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; - "Homology" = dontDistribute super."Homology"; - "HongoDB" = dontDistribute super."HongoDB"; - "HostAndPort" = dontDistribute super."HostAndPort"; - "Hricket" = dontDistribute super."Hricket"; - "Hs2lib" = dontDistribute super."Hs2lib"; - "HsASA" = dontDistribute super."HsASA"; - "HsHaruPDF" = dontDistribute super."HsHaruPDF"; - "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; - "HsJudy" = dontDistribute super."HsJudy"; - "HsParrot" = dontDistribute super."HsParrot"; - "HsPerl5" = dontDistribute super."HsPerl5"; - "HsSVN" = dontDistribute super."HsSVN"; - "HsSyck" = dontDistribute super."HsSyck"; - "HsTools" = dontDistribute super."HsTools"; - "Hsed" = dontDistribute super."Hsed"; - "Hsmtlib" = dontDistribute super."Hsmtlib"; - "HueAPI" = dontDistribute super."HueAPI"; - "HulkImport" = dontDistribute super."HulkImport"; - "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; - "IDynamic" = dontDistribute super."IDynamic"; - "IFS" = dontDistribute super."IFS"; - "INblobs" = dontDistribute super."INblobs"; - "IOR" = dontDistribute super."IOR"; - "IORefCAS" = dontDistribute super."IORefCAS"; - "IOSpec" = dontDistribute super."IOSpec"; - "IcoGrid" = dontDistribute super."IcoGrid"; - "Imlib" = dontDistribute super."Imlib"; - "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; - "IndentParser" = dontDistribute super."IndentParser"; - "IndexedList" = dontDistribute super."IndexedList"; - "InfixApplicative" = dontDistribute super."InfixApplicative"; - "Interpolation" = dontDistribute super."Interpolation"; - "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; - "Irc" = dontDistribute super."Irc"; - "IrrHaskell" = dontDistribute super."IrrHaskell"; - "IsNull" = dontDistribute super."IsNull"; - "JSON-Combinator" = dontDistribute super."JSON-Combinator"; - "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; - "JSONb" = dontDistribute super."JSONb"; - "JYU-Utils" = dontDistribute super."JYU-Utils"; - "JackMiniMix" = dontDistribute super."JackMiniMix"; - "Javasf" = dontDistribute super."Javasf"; - "Javav" = dontDistribute super."Javav"; - "JsContracts" = dontDistribute super."JsContracts"; - "JsonGrammar" = dontDistribute super."JsonGrammar"; - "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; - "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; - "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; - "JunkDB" = dontDistribute super."JunkDB"; - "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; - "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; - "JustParse" = dontDistribute super."JustParse"; - "KMP" = dontDistribute super."KMP"; - "KSP" = dontDistribute super."KSP"; - "Kalman" = dontDistribute super."Kalman"; - "KdTree" = dontDistribute super."KdTree"; - "Ketchup" = dontDistribute super."Ketchup"; - "KiCS" = dontDistribute super."KiCS"; - "KiCS-debugger" = dontDistribute super."KiCS-debugger"; - "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; - "Kleislify" = dontDistribute super."Kleislify"; - "Konf" = dontDistribute super."Konf"; - "Kriens" = dontDistribute super."Kriens"; - "KyotoCabinet" = dontDistribute super."KyotoCabinet"; - "L-seed" = dontDistribute super."L-seed"; - "LATS" = dontDistribute super."LATS"; - "LDAP" = dontDistribute super."LDAP"; - "LRU" = dontDistribute super."LRU"; - "LTree" = dontDistribute super."LTree"; - "LambdaCalculator" = dontDistribute super."LambdaCalculator"; - "LambdaDB" = dontDistribute super."LambdaDB"; - "LambdaHack" = dontDistribute super."LambdaHack"; - "LambdaINet" = dontDistribute super."LambdaINet"; - "LambdaNet" = dontDistribute super."LambdaNet"; - "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; - "LambdaShell" = dontDistribute super."LambdaShell"; - "Lambdajudge" = dontDistribute super."Lambdajudge"; - "Lambdaya" = dontDistribute super."Lambdaya"; - "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; - "Lastik" = dontDistribute super."Lastik"; - "Lattices" = dontDistribute super."Lattices"; - "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; - "LazyVault" = dontDistribute super."LazyVault"; - "Level0" = dontDistribute super."Level0"; - "LibClang" = dontDistribute super."LibClang"; - "Limit" = dontDistribute super."Limit"; - "LinearSplit" = dontDistribute super."LinearSplit"; - "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; - "LinkChecker" = dontDistribute super."LinkChecker"; - "List" = dontDistribute super."List"; - "ListTree" = dontDistribute super."ListTree"; - "ListWriter" = dontDistribute super."ListWriter"; - "ListZipper" = dontDistribute super."ListZipper"; - "Logic" = dontDistribute super."Logic"; - "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; - "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; - "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; - "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; - "LslPlus" = dontDistribute super."LslPlus"; - "Lucu" = dontDistribute super."Lucu"; - "MASMGen" = dontDistribute super."MASMGen"; - "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; - "MHask" = dontDistribute super."MHask"; - "MSQueue" = dontDistribute super."MSQueue"; - "MTGBuilder" = dontDistribute super."MTGBuilder"; - "MagicHaskeller" = dontDistribute super."MagicHaskeller"; - "MailchimpSimple" = dontDistribute super."MailchimpSimple"; - "MaybeT" = dontDistribute super."MaybeT"; - "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; - "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; - "MazesOfMonad" = dontDistribute super."MazesOfMonad"; - "MeanShift" = dontDistribute super."MeanShift"; - "Measure" = dontDistribute super."Measure"; - "Mecha" = dontDistribute super."Mecha"; - "Mechs" = dontDistribute super."Mechs"; - "MetaHDBC" = dontDistribute super."MetaHDBC"; - "MetaObject" = dontDistribute super."MetaObject"; - "Metrics" = dontDistribute super."Metrics"; - "Mhailist" = dontDistribute super."Mhailist"; - "Michelangelo" = dontDistribute super."Michelangelo"; - "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; - "MiniAgda" = dontDistribute super."MiniAgda"; - "MissingK" = dontDistribute super."MissingK"; - "MissingM" = dontDistribute super."MissingM"; - "MissingPy" = dontDistribute super."MissingPy"; - "Modulo" = dontDistribute super."Modulo"; - "Moe" = dontDistribute super."Moe"; - "MoeDict" = dontDistribute super."MoeDict"; - "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; - "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; - "MonadCatchIO-transformers" = dontDistribute super."MonadCatchIO-transformers"; - "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; - "MonadCompose" = dontDistribute super."MonadCompose"; - "MonadLab" = dontDistribute super."MonadLab"; - "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; - "MonadStack" = dontDistribute super."MonadStack"; - "Monadius" = dontDistribute super."Monadius"; - "Monaris" = dontDistribute super."Monaris"; - "Monatron" = dontDistribute super."Monatron"; - "Monatron-IO" = dontDistribute super."Monatron-IO"; - "Monocle" = dontDistribute super."Monocle"; - "MorseCode" = dontDistribute super."MorseCode"; - "MuCheck" = dontDistribute super."MuCheck"; - "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; - "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; - "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; - "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; - "Munkres" = dontDistribute super."Munkres"; - "Munkres-simple" = dontDistribute super."Munkres-simple"; - "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; - "MyPrimes" = dontDistribute super."MyPrimes"; - "NGrams" = dontDistribute super."NGrams"; - "NTRU" = dontDistribute super."NTRU"; - "NXT" = dontDistribute super."NXT"; - "NXTDSL" = dontDistribute super."NXTDSL"; - "NanoProlog" = dontDistribute super."NanoProlog"; - "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; - "NaturalSort" = dontDistribute super."NaturalSort"; - "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; - "Neks" = dontDistribute super."Neks"; - "NestedFunctor" = dontDistribute super."NestedFunctor"; - "NestedSampling" = dontDistribute super."NestedSampling"; - "NetSNMP" = dontDistribute super."NetSNMP"; - "Network-NineP" = dontDistribute super."Network-NineP"; - "NewBinary" = dontDistribute super."NewBinary"; - "NineP" = dontDistribute super."NineP"; - "Ninjas" = dontDistribute super."Ninjas"; - "NoSlow" = dontDistribute super."NoSlow"; - "Noise" = dontDistribute super."Noise"; - "Nomyx" = dontDistribute super."Nomyx"; - "Nomyx-Core" = dontDistribute super."Nomyx-Core"; - "Nomyx-Language" = dontDistribute super."Nomyx-Language"; - "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; - "Nomyx-Web" = dontDistribute super."Nomyx-Web"; - "NonEmpty" = dontDistribute super."NonEmpty"; - "NonEmptyList" = dontDistribute super."NonEmptyList"; - "NumLazyByteString" = dontDistribute super."NumLazyByteString"; - "NumberSieves" = dontDistribute super."NumberSieves"; - "NumberTheory" = dontDistribute super."NumberTheory"; - "Numbers" = dontDistribute super."Numbers"; - "Nussinov78" = dontDistribute super."Nussinov78"; - "Nutri" = dontDistribute super."Nutri"; - "OGL" = dontDistribute super."OGL"; - "OSM" = dontDistribute super."OSM"; - "OTP" = dontDistribute super."OTP"; - "Object" = dontDistribute super."Object"; - "ObjectIO" = dontDistribute super."ObjectIO"; - "Obsidian" = dontDistribute super."Obsidian"; - "OddWord" = dontDistribute super."OddWord"; - "Omega" = dontDistribute super."Omega"; - "OpenAFP" = dontDistribute super."OpenAFP"; - "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; - "OpenAL" = dontDistribute super."OpenAL"; - "OpenCL" = dontDistribute super."OpenCL"; - "OpenCLRaw" = dontDistribute super."OpenCLRaw"; - "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; - "OpenGLCheck" = dontDistribute super."OpenGLCheck"; - "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; - "OpenSCAD" = dontDistribute super."OpenSCAD"; - "OpenVG" = dontDistribute super."OpenVG"; - "OpenVGRaw" = dontDistribute super."OpenVGRaw"; - "Operads" = dontDistribute super."Operads"; - "OptDir" = dontDistribute super."OptDir"; - "OrPatterns" = dontDistribute super."OrPatterns"; - "OrchestrateDB" = dontDistribute super."OrchestrateDB"; - "OrderedBits" = dontDistribute super."OrderedBits"; - "Ordinals" = dontDistribute super."Ordinals"; - "PArrows" = dontDistribute super."PArrows"; - "PBKDF2" = dontDistribute super."PBKDF2"; - "PCLT" = dontDistribute super."PCLT"; - "PCLT-DB" = dontDistribute super."PCLT-DB"; - "PDBtools" = dontDistribute super."PDBtools"; - "PPrinter" = dontDistribute super."PPrinter"; - "PTQ" = dontDistribute super."PTQ"; - "PUH-Project" = dontDistribute super."PUH-Project"; - "PageIO" = dontDistribute super."PageIO"; - "Paillier" = dontDistribute super."Paillier"; - "PandocAgda" = dontDistribute super."PandocAgda"; - "Paraiso" = dontDistribute super."Paraiso"; - "Parry" = dontDistribute super."Parry"; - "ParsecTools" = dontDistribute super."ParsecTools"; - "ParserFunction" = dontDistribute super."ParserFunction"; - "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; - "PasswordGenerator" = dontDistribute super."PasswordGenerator"; - "PastePipe" = dontDistribute super."PastePipe"; - "PathTree" = dontDistribute super."PathTree"; - "Pathfinder" = dontDistribute super."Pathfinder"; - "Peano" = dontDistribute super."Peano"; - "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; - "PerfectHash" = dontDistribute super."PerfectHash"; - "PermuteEffects" = dontDistribute super."PermuteEffects"; - "Phsu" = dontDistribute super."Phsu"; - "Pipe" = dontDistribute super."Pipe"; - "Piso" = dontDistribute super."Piso"; - "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; - "PlayingCards" = dontDistribute super."PlayingCards"; - "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; - "PlslTools" = dontDistribute super."PlslTools"; - "Plural" = dontDistribute super."Plural"; - "Pollutocracy" = dontDistribute super."Pollutocracy"; - "PortFusion" = dontDistribute super."PortFusion"; - "PortMidi" = dontDistribute super."PortMidi"; - "PostgreSQL" = dontDistribute super."PostgreSQL"; - "PrimitiveArray" = dontDistribute super."PrimitiveArray"; - "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty"; - "Printf-TH" = dontDistribute super."Printf-TH"; - "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; - "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; - "PropLogic" = dontDistribute super."PropLogic"; - "Proper" = dontDistribute super."Proper"; - "ProxN" = dontDistribute super."ProxN"; - "Pugs" = dontDistribute super."Pugs"; - "Pup-Events" = dontDistribute super."Pup-Events"; - "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; - "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; - "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; - "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; - "QIO" = dontDistribute super."QIO"; - "QLearn" = dontDistribute super."QLearn"; - "QuadEdge" = dontDistribute super."QuadEdge"; - "QuadTree" = dontDistribute super."QuadTree"; - "Quelea" = dontDistribute super."Quelea"; - "QuickAnnotate" = dontDistribute super."QuickAnnotate"; - "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; - "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; - "QuickCheckVariant" = dontDistribute super."QuickCheckVariant"; - "QuickPlot" = dontDistribute super."QuickPlot"; - "Quickson" = dontDistribute super."Quickson"; - "R-pandoc" = dontDistribute super."R-pandoc"; - "RANSAC" = dontDistribute super."RANSAC"; - "RBTree" = dontDistribute super."RBTree"; - "RESTng" = dontDistribute super."RESTng"; - "RFC1751" = dontDistribute super."RFC1751"; - "RJson" = dontDistribute super."RJson"; - "RMP" = dontDistribute super."RMP"; - "RNAFold" = dontDistribute super."RNAFold"; - "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; - "RNAdesign" = dontDistribute super."RNAdesign"; - "RNAdraw" = dontDistribute super."RNAdraw"; - "RNAlien" = dontDistribute super."RNAlien"; - "RNAwolf" = dontDistribute super."RNAwolf"; - "Raincat" = dontDistribute super."Raincat"; - "Random123" = dontDistribute super."Random123"; - "RandomDotOrg" = dontDistribute super."RandomDotOrg"; - "Randometer" = dontDistribute super."Randometer"; - "Range" = dontDistribute super."Range"; - "Ranged-sets" = dontDistribute super."Ranged-sets"; - "Ranka" = dontDistribute super."Ranka"; - "Rasenschach" = dontDistribute super."Rasenschach"; - "Redmine" = dontDistribute super."Redmine"; - "Ref" = dontDistribute super."Ref"; - "Referees" = dontDistribute super."Referees"; - "ReplicateEffects" = dontDistribute super."ReplicateEffects"; - "ReviewBoard" = dontDistribute super."ReviewBoard"; - "RichConditional" = dontDistribute super."RichConditional"; - "Rlang-QQ" = dontDistribute super."Rlang-QQ"; - "RollingDirectory" = dontDistribute super."RollingDirectory"; - "RoyalMonad" = dontDistribute super."RoyalMonad"; - "RxHaskell" = dontDistribute super."RxHaskell"; - "SBench" = dontDistribute super."SBench"; - "SCalendar" = dontDistribute super."SCalendar"; - "SConfig" = dontDistribute super."SConfig"; - "SDL" = dontDistribute super."SDL"; - "SDL-gfx" = dontDistribute super."SDL-gfx"; - "SDL-image" = dontDistribute super."SDL-image"; - "SDL-mixer" = dontDistribute super."SDL-mixer"; - "SDL-mpeg" = dontDistribute super."SDL-mpeg"; - "SDL-ttf" = dontDistribute super."SDL-ttf"; - "SDL2-ttf" = dontDistribute super."SDL2-ttf"; - "SFML" = dontDistribute super."SFML"; - "SFML-control" = dontDistribute super."SFML-control"; - "SFont" = dontDistribute super."SFont"; - "SG" = dontDistribute super."SG"; - "SGdemo" = dontDistribute super."SGdemo"; - "SGplus" = dontDistribute super."SGplus"; - "SHA2" = dontDistribute super."SHA2"; - "SMTPClient" = dontDistribute super."SMTPClient"; - "SNet" = dontDistribute super."SNet"; - "SQLDeps" = dontDistribute super."SQLDeps"; - "STL" = dontDistribute super."STL"; - "SVG2Q" = dontDistribute super."SVG2Q"; - "SVGPath" = dontDistribute super."SVGPath"; - "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; - "SableCC2Hs" = dontDistribute super."SableCC2Hs"; - "Safe" = dontDistribute super."Safe"; - "Salsa" = dontDistribute super."Salsa"; - "Saturnin" = dontDistribute super."Saturnin"; - "SciFlow" = dontDistribute super."SciFlow"; - "ScratchFs" = dontDistribute super."ScratchFs"; - "Scurry" = dontDistribute super."Scurry"; - "Semantique" = dontDistribute super."Semantique"; - "Semigroup" = dontDistribute super."Semigroup"; - "SeqAlign" = dontDistribute super."SeqAlign"; - "SessionLogger" = dontDistribute super."SessionLogger"; - "Shellac" = dontDistribute super."Shellac"; - "Shellac-compatline" = dontDistribute super."Shellac-compatline"; - "Shellac-editline" = dontDistribute super."Shellac-editline"; - "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; - "Shellac-readline" = dontDistribute super."Shellac-readline"; - "ShowF" = dontDistribute super."ShowF"; - "Shrub" = dontDistribute super."Shrub"; - "Shu-thing" = dontDistribute super."Shu-thing"; - "SimpleAES" = dontDistribute super."SimpleAES"; - "SimpleEA" = dontDistribute super."SimpleEA"; - "SimpleGL" = dontDistribute super."SimpleGL"; - "SimpleH" = dontDistribute super."SimpleH"; - "SimpleLog" = dontDistribute super."SimpleLog"; - "SimpleServer" = dontDistribute super."SimpleServer"; - "SizeCompare" = dontDistribute super."SizeCompare"; - "Slides" = dontDistribute super."Slides"; - "Smooth" = dontDistribute super."Smooth"; - "SmtLib" = dontDistribute super."SmtLib"; - "Snusmumrik" = dontDistribute super."Snusmumrik"; - "SoOSiM" = dontDistribute super."SoOSiM"; - "SoccerFun" = dontDistribute super."SoccerFun"; - "SoccerFunGL" = dontDistribute super."SoccerFunGL"; - "Sonnex" = dontDistribute super."Sonnex"; - "SourceGraph" = dontDistribute super."SourceGraph"; - "Southpaw" = dontDistribute super."Southpaw"; - "SpaceInvaders" = dontDistribute super."SpaceInvaders"; - "SpacePrivateers" = dontDistribute super."SpacePrivateers"; - "SpinCounter" = dontDistribute super."SpinCounter"; - "Spock-api-ghcjs" = dontDistribute super."Spock-api-ghcjs"; - "Spock-auth" = dontDistribute super."Spock-auth"; - "Spock-digestive" = dontDistribute super."Spock-digestive"; - "SpreadsheetML" = dontDistribute super."SpreadsheetML"; - "Sprig" = dontDistribute super."Sprig"; - "Stasis" = dontDistribute super."Stasis"; - "StateVar-transformer" = dontDistribute super."StateVar-transformer"; - "StatisticalMethods" = dontDistribute super."StatisticalMethods"; - "Stomp" = dontDistribute super."Stomp"; - "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; - "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; - "StrappedTemplates" = dontDistribute super."StrappedTemplates"; - "StrategyLib" = dontDistribute super."StrategyLib"; - "Stream" = dontDistribute super."Stream"; - "StrictBench" = dontDistribute super."StrictBench"; - "StringUtils" = dontDistribute super."StringUtils"; - "SuffixStructures" = dontDistribute super."SuffixStructures"; - "SybWidget" = dontDistribute super."SybWidget"; - "SyntaxMacros" = dontDistribute super."SyntaxMacros"; - "Sysmon" = dontDistribute super."Sysmon"; - "TBC" = dontDistribute super."TBC"; - "TBit" = dontDistribute super."TBit"; - "THEff" = dontDistribute super."THEff"; - "TTTAS" = dontDistribute super."TTTAS"; - "TV" = dontDistribute super."TV"; - "TYB" = dontDistribute super."TYB"; - "TableAlgebra" = dontDistribute super."TableAlgebra"; - "Tables" = dontDistribute super."Tables"; - "Tablify" = dontDistribute super."Tablify"; - "Tahin" = dontDistribute super."Tahin"; - "Tainted" = dontDistribute super."Tainted"; - "Takusen" = dontDistribute super."Takusen"; - "Tape" = dontDistribute super."Tape"; - "Taxonomy" = dontDistribute super."Taxonomy"; - "TaxonomyTools" = dontDistribute super."TaxonomyTools"; - "TeaHS" = dontDistribute super."TeaHS"; - "Tensor" = dontDistribute super."Tensor"; - "TernaryTrees" = dontDistribute super."TernaryTrees"; - "TestExplode" = dontDistribute super."TestExplode"; - "Theora" = dontDistribute super."Theora"; - "Thingie" = dontDistribute super."Thingie"; - "ThreadObjects" = dontDistribute super."ThreadObjects"; - "Thrift" = dontDistribute super."Thrift"; - "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; - "TicTacToe" = dontDistribute super."TicTacToe"; - "TigerHash" = dontDistribute super."TigerHash"; - "TimePiece" = dontDistribute super."TimePiece"; - "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; - "TinyURL" = dontDistribute super."TinyURL"; - "Titim" = dontDistribute super."Titim"; - "Top" = dontDistribute super."Top"; - "Tournament" = dontDistribute super."Tournament"; - "TraceUtils" = dontDistribute super."TraceUtils"; - "TransformeR" = dontDistribute super."TransformeR"; - "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; - "Transhare" = dontDistribute super."Transhare"; - "TreeCounter" = dontDistribute super."TreeCounter"; - "TreeStructures" = dontDistribute super."TreeStructures"; - "TreeT" = dontDistribute super."TreeT"; - "Treiber" = dontDistribute super."Treiber"; - "TrendGraph" = dontDistribute super."TrendGraph"; - "TrieMap" = dontDistribute super."TrieMap"; - "Twofish" = dontDistribute super."Twofish"; - "TypeClass" = dontDistribute super."TypeClass"; - "TypeCompose" = dontDistribute super."TypeCompose"; - "TypeIlluminator" = dontDistribute super."TypeIlluminator"; - "TypeNat" = dontDistribute super."TypeNat"; - "TypingTester" = dontDistribute super."TypingTester"; - "UISF" = dontDistribute super."UISF"; - "UMM" = dontDistribute super."UMM"; - "URLT" = dontDistribute super."URLT"; - "URLb" = dontDistribute super."URLb"; - "UTFTConverter" = dontDistribute super."UTFTConverter"; - "Unique" = dontDistribute super."Unique"; - "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; - "Updater" = dontDistribute super."Updater"; - "UrlDisp" = dontDistribute super."UrlDisp"; - "Useful" = dontDistribute super."Useful"; - "UtilityTM" = dontDistribute super."UtilityTM"; - "VKHS" = dontDistribute super."VKHS"; - "Validation" = dontDistribute super."Validation"; - "Vec" = dontDistribute super."Vec"; - "Vec-Boolean" = dontDistribute super."Vec-Boolean"; - "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; - "Vec-Transform" = dontDistribute super."Vec-Transform"; - "VecN" = dontDistribute super."VecN"; - "Verba" = dontDistribute super."Verba"; - "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; - "Vulkan" = dontDistribute super."Vulkan"; - "WAVE" = dontDistribute super."WAVE"; - "WL500gPControl" = dontDistribute super."WL500gPControl"; - "WL500gPLib" = dontDistribute super."WL500gPLib"; - "WMSigner" = dontDistribute super."WMSigner"; - "WURFL" = dontDistribute super."WURFL"; - "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; - "WashNGo" = dontDistribute super."WashNGo"; - "WaveFront" = dontDistribute super."WaveFront"; - "Weather" = dontDistribute super."Weather"; - "WebBits" = dontDistribute super."WebBits"; - "WebBits-Html" = dontDistribute super."WebBits-Html"; - "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; - "WebCont" = dontDistribute super."WebCont"; - "WeberLogic" = dontDistribute super."WeberLogic"; - "Webrexp" = dontDistribute super."Webrexp"; - "Wheb" = dontDistribute super."Wheb"; - "WikimediaParser" = dontDistribute super."WikimediaParser"; - "Win32-console" = dontDistribute super."Win32-console"; - "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; - "Win32-errors" = dontDistribute super."Win32-errors"; - "Win32-junction-point" = dontDistribute super."Win32-junction-point"; - "Win32-security" = dontDistribute super."Win32-security"; - "Win32-services" = dontDistribute super."Win32-services"; - "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; - "Wired" = dontDistribute super."Wired"; - "WordAlignment" = dontDistribute super."WordAlignment"; - "WordNet" = dontDistribute super."WordNet"; - "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; - "Wordlint" = dontDistribute super."Wordlint"; - "WxGeneric" = dontDistribute super."WxGeneric"; - "X11-extras" = dontDistribute super."X11-extras"; - "X11-rm" = dontDistribute super."X11-rm"; - "X11-xdamage" = dontDistribute super."X11-xdamage"; - "X11-xfixes" = dontDistribute super."X11-xfixes"; - "X11-xft" = dontDistribute super."X11-xft"; - "X11-xshape" = dontDistribute super."X11-xshape"; - "XAttr" = dontDistribute super."XAttr"; - "XInput" = dontDistribute super."XInput"; - "XMLParser" = dontDistribute super."XMLParser"; - "XMMS" = dontDistribute super."XMMS"; - "XMPP" = dontDistribute super."XMPP"; - "XSaiga" = dontDistribute super."XSaiga"; - "Xec" = dontDistribute super."Xec"; - "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; - "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; - "YACPong" = dontDistribute super."YACPong"; - "YFrob" = dontDistribute super."YFrob"; - "Yablog" = dontDistribute super."Yablog"; - "YamlReference" = dontDistribute super."YamlReference"; - "Yampa-core" = dontDistribute super."Yampa-core"; - "Yocto" = dontDistribute super."Yocto"; - "Yogurt" = dontDistribute super."Yogurt"; - "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; - "ZEBEDDE" = dontDistribute super."ZEBEDDE"; - "ZFS" = dontDistribute super."ZFS"; - "ZMachine" = dontDistribute super."ZMachine"; - "ZipFold" = dontDistribute super."ZipFold"; - "ZipperAG" = dontDistribute super."ZipperAG"; - "Zora" = dontDistribute super."Zora"; - "Zwaluw" = dontDistribute super."Zwaluw"; - "a50" = dontDistribute super."a50"; - "abacate" = dontDistribute super."abacate"; - "abc-puzzle" = dontDistribute super."abc-puzzle"; - "abcBridge" = dontDistribute super."abcBridge"; - "abcnotation" = dontDistribute super."abcnotation"; - "abeson" = dontDistribute super."abeson"; - "abnf" = dontDistribute super."abnf"; - "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; - "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; - "abt" = dontDistribute super."abt"; - "ac-machine" = dontDistribute super."ac-machine"; - "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; - "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; - "accelerate-cublas" = dontDistribute super."accelerate-cublas"; - "accelerate-cuda" = dontDistribute super."accelerate-cuda"; - "accelerate-cufft" = dontDistribute super."accelerate-cufft"; - "accelerate-examples" = dontDistribute super."accelerate-examples"; - "accelerate-fft" = dontDistribute super."accelerate-fft"; - "accelerate-fftw" = dontDistribute super."accelerate-fftw"; - "accelerate-fourier" = dontDistribute super."accelerate-fourier"; - "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; - "accelerate-io" = dontDistribute super."accelerate-io"; - "accelerate-random" = dontDistribute super."accelerate-random"; - "accelerate-typelits" = dontDistribute super."accelerate-typelits"; - "accelerate-utility" = dontDistribute super."accelerate-utility"; - "accentuateus" = dontDistribute super."accentuateus"; - "access-time" = dontDistribute super."access-time"; - "acid-state-dist" = dontDistribute super."acid-state-dist"; - "acid-state-tls" = dontDistribute super."acid-state-tls"; - "acl2" = dontDistribute super."acl2"; - "acme-all-monad" = dontDistribute super."acme-all-monad"; - "acme-box" = dontDistribute super."acme-box"; - "acme-cadre" = dontDistribute super."acme-cadre"; - "acme-cofunctor" = dontDistribute super."acme-cofunctor"; - "acme-colosson" = dontDistribute super."acme-colosson"; - "acme-comonad" = dontDistribute super."acme-comonad"; - "acme-cutegirl" = dontDistribute super."acme-cutegirl"; - "acme-default" = dontDistribute super."acme-default"; - "acme-dont" = dontDistribute super."acme-dont"; - "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; - "acme-grawlix" = dontDistribute super."acme-grawlix"; - "acme-hq9plus" = dontDistribute super."acme-hq9plus"; - "acme-http" = dontDistribute super."acme-http"; - "acme-inator" = dontDistribute super."acme-inator"; - "acme-io" = dontDistribute super."acme-io"; - "acme-iot" = dontDistribute super."acme-iot"; - "acme-left-pad" = dontDistribute super."acme-left-pad"; - "acme-lolcat" = dontDistribute super."acme-lolcat"; - "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; - "acme-memorandom" = dontDistribute super."acme-memorandom"; - "acme-microwave" = dontDistribute super."acme-microwave"; - "acme-miscorder" = dontDistribute super."acme-miscorder"; - "acme-missiles" = dontDistribute super."acme-missiles"; - "acme-now" = dontDistribute super."acme-now"; - "acme-numbersystem" = dontDistribute super."acme-numbersystem"; - "acme-omitted" = dontDistribute super."acme-omitted"; - "acme-one" = dontDistribute super."acme-one"; - "acme-operators" = dontDistribute super."acme-operators"; - "acme-php" = dontDistribute super."acme-php"; - "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; - "acme-realworld" = dontDistribute super."acme-realworld"; - "acme-safe" = dontDistribute super."acme-safe"; - "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; - "acme-strfry" = dontDistribute super."acme-strfry"; - "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; - "acme-strtok" = dontDistribute super."acme-strtok"; - "acme-timemachine" = dontDistribute super."acme-timemachine"; - "acme-year" = dontDistribute super."acme-year"; - "acme-zero" = dontDistribute super."acme-zero"; - "activehs" = dontDistribute super."activehs"; - "activehs-base" = dontDistribute super."activehs-base"; - "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; - "actor" = dontDistribute super."actor"; - "adaptive-containers" = dontDistribute super."adaptive-containers"; - "adaptive-tuple" = dontDistribute super."adaptive-tuple"; - "adb" = dontDistribute super."adb"; - "adblock2privoxy" = dontDistribute super."adblock2privoxy"; - "addLicenseInfo" = dontDistribute super."addLicenseInfo"; - "adhoc-network" = dontDistribute super."adhoc-network"; - "adict" = dontDistribute super."adict"; - "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; - "adp-multi" = dontDistribute super."adp-multi"; - "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; - "aeson-applicative" = dontDistribute super."aeson-applicative"; - "aeson-bson" = dontDistribute super."aeson-bson"; - "aeson-coerce" = dontDistribute super."aeson-coerce"; - "aeson-diff" = dontDistribute super."aeson-diff"; - "aeson-extra" = dontDistribute super."aeson-extra"; - "aeson-filthy" = dontDistribute super."aeson-filthy"; - "aeson-flatten" = dontDistribute super."aeson-flatten"; - "aeson-iproute" = dontDistribute super."aeson-iproute"; - "aeson-json-ast" = dontDistribute super."aeson-json-ast"; - "aeson-lens" = dontDistribute super."aeson-lens"; - "aeson-native" = dontDistribute super."aeson-native"; - "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; - "aeson-prefix" = dontDistribute super."aeson-prefix"; - "aeson-schema" = dontDistribute super."aeson-schema"; - "aeson-serialize" = dontDistribute super."aeson-serialize"; - "aeson-smart" = dontDistribute super."aeson-smart"; - "aeson-streams" = dontDistribute super."aeson-streams"; - "aeson-t" = dontDistribute super."aeson-t"; - "aeson-toolkit" = dontDistribute super."aeson-toolkit"; - "aeson-value-parser" = dontDistribute super."aeson-value-parser"; - "aeson-yak" = dontDistribute super."aeson-yak"; - "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; - "afis" = dontDistribute super."afis"; - "afv" = dontDistribute super."afv"; - "ag-pictgen" = dontDistribute super."ag-pictgen"; - "agda-server" = dontDistribute super."agda-server"; - "agda-snippets" = dontDistribute super."agda-snippets"; - "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll"; - "agentx" = dontDistribute super."agentx"; - "agum" = dontDistribute super."agum"; - "aig" = dontDistribute super."aig"; - "air" = dontDistribute super."air"; - "air-extra" = dontDistribute super."air-extra"; - "air-spec" = dontDistribute super."air-spec"; - "air-th" = dontDistribute super."air-th"; - "airbrake" = dontDistribute super."airbrake"; - "aivika" = dontDistribute super."aivika"; - "aivika-branches" = dontDistribute super."aivika-branches"; - "aivika-distributed" = dontDistribute super."aivika-distributed"; - "aivika-experiment" = dontDistribute super."aivika-experiment"; - "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; - "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; - "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; - "aivika-lattice" = dontDistribute super."aivika-lattice"; - "aivika-transformers" = dontDistribute super."aivika-transformers"; - "ajhc" = dontDistribute super."ajhc"; - "al" = dontDistribute super."al"; - "alea" = dontDistribute super."alea"; - "alex-meta" = dontDistribute super."alex-meta"; - "alex-tools" = dontDistribute super."alex-tools"; - "alfred" = dontDistribute super."alfred"; - "alga" = dontDistribute super."alga"; - "algebra" = dontDistribute super."algebra"; - "algebra-dag" = dontDistribute super."algebra-dag"; - "algebra-sql" = dontDistribute super."algebra-sql"; - "algebraic" = dontDistribute super."algebraic"; - "algebraic-classes" = dontDistribute super."algebraic-classes"; - "algo-s" = dontDistribute super."algo-s"; - "align" = dontDistribute super."align"; - "align-text" = dontDistribute super."align-text"; - "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; - "allocated-processor" = dontDistribute super."allocated-processor"; - "alloy" = dontDistribute super."alloy"; - "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; - "almost-fix" = dontDistribute super."almost-fix"; - "alms" = dontDistribute super."alms"; - "alpha" = dontDistribute super."alpha"; - "alpino-tools" = dontDistribute super."alpino-tools"; - "alsa" = dontDistribute super."alsa"; - "alsa-core" = dontDistribute super."alsa-core"; - "alsa-gui" = dontDistribute super."alsa-gui"; - "alsa-midi" = dontDistribute super."alsa-midi"; - "alsa-mixer" = dontDistribute super."alsa-mixer"; - "alsa-pcm" = dontDistribute super."alsa-pcm"; - "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; - "alsa-seq" = dontDistribute super."alsa-seq"; - "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; - "altcomposition" = dontDistribute super."altcomposition"; - "alternative-io" = dontDistribute super."alternative-io"; - "altfloat" = dontDistribute super."altfloat"; - "alure" = dontDistribute super."alure"; - "amazon-emailer" = dontDistribute super."amazon-emailer"; - "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; - "amazon-products" = dontDistribute super."amazon-products"; - "ampersand" = dontDistribute super."ampersand"; - "amqp-conduit" = dontDistribute super."amqp-conduit"; - "amrun" = dontDistribute super."amrun"; - "analyze-client" = dontDistribute super."analyze-client"; - "anansi" = dontDistribute super."anansi"; - "anansi-hscolour" = dontDistribute super."anansi-hscolour"; - "anansi-pandoc" = dontDistribute super."anansi-pandoc"; - "anatomy" = dontDistribute super."anatomy"; - "android" = dontDistribute super."android"; - "android-lint-summary" = dontDistribute super."android-lint-summary"; - "angle" = dontDistribute super."angle"; - "animalcase" = dontDistribute super."animalcase"; - "annah" = dontDistribute super."annah"; - "annihilator" = dontDistribute super."annihilator"; - "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; - "ansi-pretty" = dontDistribute super."ansi-pretty"; - "antagonist" = dontDistribute super."antagonist"; - "antfarm" = dontDistribute super."antfarm"; - "anticiv" = dontDistribute super."anticiv"; - "antigate" = dontDistribute super."antigate"; - "antimirov" = dontDistribute super."antimirov"; - "antiprimes" = dontDistribute super."antiprimes"; - "antiquoter" = dontDistribute super."antiquoter"; - "antisplice" = dontDistribute super."antisplice"; - "antlrc" = dontDistribute super."antlrc"; - "anydbm" = dontDistribute super."anydbm"; - "aosd" = dontDistribute super."aosd"; - "ap-reflect" = dontDistribute super."ap-reflect"; - "apache-md5" = dontDistribute super."apache-md5"; - "apelsin" = dontDistribute super."apelsin"; - "api-builder" = dontDistribute super."api-builder"; - "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; - "api-tools" = dontDistribute super."api-tools"; - "apiary" = dontDistribute super."apiary"; - "apiary-authenticate" = dontDistribute super."apiary-authenticate"; - "apiary-clientsession" = dontDistribute super."apiary-clientsession"; - "apiary-cookie" = dontDistribute super."apiary-cookie"; - "apiary-eventsource" = dontDistribute super."apiary-eventsource"; - "apiary-helics" = dontDistribute super."apiary-helics"; - "apiary-http-client" = dontDistribute super."apiary-http-client"; - "apiary-logger" = dontDistribute super."apiary-logger"; - "apiary-memcached" = dontDistribute super."apiary-memcached"; - "apiary-mongoDB" = dontDistribute super."apiary-mongoDB"; - "apiary-persistent" = dontDistribute super."apiary-persistent"; - "apiary-purescript" = dontDistribute super."apiary-purescript"; - "apiary-session" = dontDistribute super."apiary-session"; - "apiary-websockets" = dontDistribute super."apiary-websockets"; - "apis" = dontDistribute super."apis"; - "apotiki" = dontDistribute super."apotiki"; - "app-lens" = dontDistribute super."app-lens"; - "appc" = dontDistribute super."appc"; - "applicative-extras" = dontDistribute super."applicative-extras"; - "applicative-fail" = dontDistribute super."applicative-fail"; - "applicative-numbers" = dontDistribute super."applicative-numbers"; - "applicative-parsec" = dontDistribute super."applicative-parsec"; - "applicative-quoters" = dontDistribute super."applicative-quoters"; - "applicative-splice" = dontDistribute super."applicative-splice"; - "apportionment" = dontDistribute super."apportionment"; - "approx-rand-test" = dontDistribute super."approx-rand-test"; - "approximate" = dontDistribute super."approximate"; - "approximate-equality" = dontDistribute super."approximate-equality"; - "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; - "arb-fft" = dontDistribute super."arb-fft"; - "arbb-vm" = dontDistribute super."arbb-vm"; - "archive" = dontDistribute super."archive"; - "archiver" = dontDistribute super."archiver"; - "archlinux" = dontDistribute super."archlinux"; - "archlinux-web" = dontDistribute super."archlinux-web"; - "archnews" = dontDistribute super."archnews"; - "arena" = dontDistribute super."arena"; - "arff" = dontDistribute super."arff"; - "arghwxhaskell" = dontDistribute super."arghwxhaskell"; - "argon" = dontDistribute super."argon"; - "argon2" = dontDistribute super."argon2"; - "argparser" = dontDistribute super."argparser"; - "arguedit" = dontDistribute super."arguedit"; - "ariadne" = dontDistribute super."ariadne"; - "arion" = dontDistribute super."arion"; - "arith-encode" = dontDistribute super."arith-encode"; - "arithmatic" = dontDistribute super."arithmatic"; - "arithmetic" = dontDistribute super."arithmetic"; - "armada" = dontDistribute super."armada"; - "arpa" = dontDistribute super."arpa"; - "array-forth" = dontDistribute super."array-forth"; - "array-primops" = dontDistribute super."array-primops"; - "array-utils" = dontDistribute super."array-utils"; - "arrow-improve" = dontDistribute super."arrow-improve"; - "arrowapply-utils" = dontDistribute super."arrowapply-utils"; - "arrowp" = dontDistribute super."arrowp"; - "arrows" = dontDistribute super."arrows"; - "artery" = dontDistribute super."artery"; - "arx" = dontDistribute super."arx"; - "arxiv" = dontDistribute super."arxiv"; - "ascetic" = dontDistribute super."ascetic"; - "ascii" = dontDistribute super."ascii"; - "ascii-cows" = dontDistribute super."ascii-cows"; - "ascii-flatten" = dontDistribute super."ascii-flatten"; - "ascii-table" = dontDistribute super."ascii-table"; - "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; - "ascii85-conduit" = dontDistribute super."ascii85-conduit"; - "asic" = dontDistribute super."asic"; - "asil" = dontDistribute super."asil"; - "asn1-data" = dontDistribute super."asn1-data"; - "asn1dump" = dontDistribute super."asn1dump"; - "assembler" = dontDistribute super."assembler"; - "assert" = dontDistribute super."assert"; - "assert-failure" = dontDistribute super."assert-failure"; - "assertions" = dontDistribute super."assertions"; - "assimp" = dontDistribute super."assimp"; - "astar" = dontDistribute super."astar"; - "astrds" = dontDistribute super."astrds"; - "astview" = dontDistribute super."astview"; - "astview-utils" = dontDistribute super."astview-utils"; - "async-ajax" = dontDistribute super."async-ajax"; - "async-extras" = dontDistribute super."async-extras"; - "async-manager" = dontDistribute super."async-manager"; - "async-pool" = dontDistribute super."async-pool"; - "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; - "aterm" = dontDistribute super."aterm"; - "aterm-utils" = dontDistribute super."aterm-utils"; - "atl" = dontDistribute super."atl"; - "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; - "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; - "atmos" = dontDistribute super."atmos"; - "atmos-dimensional" = dontDistribute super."atmos-dimensional"; - "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; - "atom" = dontDistribute super."atom"; - "atom-basic" = dontDistribute super."atom-basic"; - "atom-msp430" = dontDistribute super."atom-msp430"; - "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; - "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; - "atomo" = dontDistribute super."atomo"; - "atp-haskell" = dontDistribute super."atp-haskell"; - "atrans" = dontDistribute super."atrans"; - "attempt" = dontDistribute super."attempt"; - "atto-lisp" = dontDistribute super."atto-lisp"; - "attoparsec-arff" = dontDistribute super."attoparsec-arff"; - "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; - "attoparsec-csv" = dontDistribute super."attoparsec-csv"; - "attoparsec-enumerator" = dontDistribute super."attoparsec-enumerator"; - "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; - "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; - "attoparsec-text" = dontDistribute super."attoparsec-text"; - "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; - "attoparsec-trans" = dontDistribute super."attoparsec-trans"; - "attosplit" = dontDistribute super."attosplit"; - "atuin" = dontDistribute super."atuin"; - "audacity" = dontDistribute super."audacity"; - "audiovisual" = dontDistribute super."audiovisual"; - "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"; - "authoring" = dontDistribute super."authoring"; - "automitive-cse" = dontDistribute super."automitive-cse"; - "automotive-cse" = dontDistribute super."automotive-cse"; - "autonix-deps" = dontDistribute super."autonix-deps"; - "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; - "autoproc" = dontDistribute super."autoproc"; - "avahi" = dontDistribute super."avahi"; - "avatar-generator" = dontDistribute super."avatar-generator"; - "average" = dontDistribute super."average"; - "avers" = dontDistribute super."avers"; - "avers-api" = dontDistribute super."avers-api"; - "avers-server" = dontDistribute super."avers-server"; - "avl-static" = dontDistribute super."avl-static"; - "avr-shake" = dontDistribute super."avr-shake"; - "avwx" = dontDistribute super."avwx"; - "awesome-prelude" = dontDistribute super."awesome-prelude"; - "awesomium" = dontDistribute super."awesomium"; - "awesomium-glut" = dontDistribute super."awesomium-glut"; - "awesomium-raw" = dontDistribute super."awesomium-raw"; - "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; - "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; - "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; - "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; - "aws-ec2" = dontDistribute super."aws-ec2"; - "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; - "aws-general" = dontDistribute super."aws-general"; - "aws-kinesis" = dontDistribute super."aws-kinesis"; - "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; - "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; - "aws-lambda" = dontDistribute super."aws-lambda"; - "aws-performance-tests" = dontDistribute super."aws-performance-tests"; - "aws-route53" = dontDistribute super."aws-route53"; - "aws-sdk" = dontDistribute super."aws-sdk"; - "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; - "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; - "aws-sign4" = dontDistribute super."aws-sign4"; - "aws-sns" = dontDistribute super."aws-sns"; - "azure-acs" = dontDistribute super."azure-acs"; - "azure-service-api" = dontDistribute super."azure-service-api"; - "azure-servicebus" = dontDistribute super."azure-servicebus"; - "azurify" = dontDistribute super."azurify"; - "b-tree" = dontDistribute super."b-tree"; - "babylon" = dontDistribute super."babylon"; - "backdropper" = dontDistribute super."backdropper"; - "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; - "backward-state" = dontDistribute super."backward-state"; - "bacteria" = dontDistribute super."bacteria"; - "bag" = dontDistribute super."bag"; - "bamboo" = dontDistribute super."bamboo"; - "bamboo-launcher" = dontDistribute super."bamboo-launcher"; - "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; - "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; - "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; - "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; - "bamse" = dontDistribute super."bamse"; - "bamstats" = dontDistribute super."bamstats"; - "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; - "banwords" = dontDistribute super."banwords"; - "barchart" = dontDistribute super."barchart"; - "barcodes-code128" = dontDistribute super."barcodes-code128"; - "barecheck" = dontDistribute super."barecheck"; - "barley" = dontDistribute super."barley"; - "barrie" = dontDistribute super."barrie"; - "barrier" = dontDistribute super."barrier"; - "barrier-monad" = dontDistribute super."barrier-monad"; - "base-generics" = dontDistribute super."base-generics"; - "base-io-access" = dontDistribute super."base-io-access"; - "base32-bytestring" = dontDistribute super."base32-bytestring"; - "base58-bytestring" = dontDistribute super."base58-bytestring"; - "base58address" = dontDistribute super."base58address"; - "base64-conduit" = dontDistribute super."base64-conduit"; - "base91" = dontDistribute super."base91"; - "basex-client" = dontDistribute super."basex-client"; - "bash" = dontDistribute super."bash"; - "basic-lens" = dontDistribute super."basic-lens"; - "basic-sop" = dontDistribute super."basic-sop"; - "baskell" = dontDistribute super."baskell"; - "batch-rename" = dontDistribute super."batch-rename"; - "battlenet" = dontDistribute super."battlenet"; - "battlenet-yesod" = dontDistribute super."battlenet-yesod"; - "battleships" = dontDistribute super."battleships"; - "bayes-stack" = dontDistribute super."bayes-stack"; - "bbdb" = dontDistribute super."bbdb"; - "bbi" = dontDistribute super."bbi"; - "bdd" = dontDistribute super."bdd"; - "bdelta" = dontDistribute super."bdelta"; - "bdo" = dontDistribute super."bdo"; - "beam" = dontDistribute super."beam"; - "beam-th" = dontDistribute super."beam-th"; - "beamable" = dontDistribute super."beamable"; - "bearriver" = dontDistribute super."bearriver"; - "beautifHOL" = dontDistribute super."beautifHOL"; - "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; - "bein" = dontDistribute super."bein"; - "bench" = dontDistribute super."bench"; - "benchmark-function" = dontDistribute super."benchmark-function"; - "bencoding" = dontDistribute super."bencoding"; - "berkeleydb" = dontDistribute super."berkeleydb"; - "berp" = dontDistribute super."berp"; - "bert" = dontDistribute super."bert"; - "besout" = dontDistribute super."besout"; - "bet" = dontDistribute super."bet"; - "betacode" = dontDistribute super."betacode"; - "between" = dontDistribute super."between"; - "bf-cata" = dontDistribute super."bf-cata"; - "bff" = dontDistribute super."bff"; - "bff-mono" = dontDistribute super."bff-mono"; - "bgmax" = dontDistribute super."bgmax"; - "bgzf" = dontDistribute super."bgzf"; - "bibdb" = dontDistribute super."bibdb"; - "bibtex" = dontDistribute super."bibtex"; - "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; - "bidispec" = dontDistribute super."bidispec"; - "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bighugethesaurus" = dontDistribute super."bighugethesaurus"; - "billboard-parser" = dontDistribute super."billboard-parser"; - "billeksah-forms" = dontDistribute super."billeksah-forms"; - "billeksah-main" = dontDistribute super."billeksah-main"; - "billeksah-main-static" = dontDistribute super."billeksah-main-static"; - "billeksah-pane" = dontDistribute super."billeksah-pane"; - "billeksah-services" = dontDistribute super."billeksah-services"; - "bimaps" = dontDistribute super."bimaps"; - "binary-communicator" = dontDistribute super."binary-communicator"; - "binary-derive" = dontDistribute super."binary-derive"; - "binary-enum" = dontDistribute super."binary-enum"; - "binary-file" = dontDistribute super."binary-file"; - "binary-generic" = dontDistribute super."binary-generic"; - "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; - "binary-literal-qq" = dontDistribute super."binary-literal-qq"; - "binary-protocol" = dontDistribute super."binary-protocol"; - "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; - "binary-shared" = dontDistribute super."binary-shared"; - "binary-state" = dontDistribute super."binary-state"; - "binary-store" = dontDistribute super."binary-store"; - "binary-streams" = dontDistribute super."binary-streams"; - "binary-strict" = dontDistribute super."binary-strict"; - "binarydefer" = dontDistribute super."binarydefer"; - "bind-marshal" = dontDistribute super."bind-marshal"; - "binding-core" = dontDistribute super."binding-core"; - "binding-gtk" = dontDistribute super."binding-gtk"; - "binding-wx" = dontDistribute super."binding-wx"; - "bindings" = dontDistribute super."bindings"; - "bindings-EsounD" = dontDistribute super."bindings-EsounD"; - "bindings-K8055" = dontDistribute super."bindings-K8055"; - "bindings-apr" = dontDistribute super."bindings-apr"; - "bindings-apr-util" = dontDistribute super."bindings-apr-util"; - "bindings-audiofile" = dontDistribute super."bindings-audiofile"; - "bindings-bfd" = dontDistribute super."bindings-bfd"; - "bindings-cctools" = dontDistribute super."bindings-cctools"; - "bindings-codec2" = dontDistribute super."bindings-codec2"; - "bindings-common" = dontDistribute super."bindings-common"; - "bindings-dc1394" = dontDistribute super."bindings-dc1394"; - "bindings-directfb" = dontDistribute super."bindings-directfb"; - "bindings-eskit" = dontDistribute super."bindings-eskit"; - "bindings-fann" = dontDistribute super."bindings-fann"; - "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; - "bindings-friso" = dontDistribute super."bindings-friso"; - "bindings-glib" = dontDistribute super."bindings-glib"; - "bindings-gobject" = dontDistribute super."bindings-gobject"; - "bindings-gpgme" = dontDistribute super."bindings-gpgme"; - "bindings-gsl" = dontDistribute super."bindings-gsl"; - "bindings-gts" = dontDistribute super."bindings-gts"; - "bindings-hamlib" = dontDistribute super."bindings-hamlib"; - "bindings-hdf5" = dontDistribute super."bindings-hdf5"; - "bindings-levmar" = dontDistribute super."bindings-levmar"; - "bindings-libcddb" = dontDistribute super."bindings-libcddb"; - "bindings-libffi" = dontDistribute super."bindings-libffi"; - "bindings-libftdi" = dontDistribute super."bindings-libftdi"; - "bindings-librrd" = dontDistribute super."bindings-librrd"; - "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; - "bindings-libusb" = dontDistribute super."bindings-libusb"; - "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; - "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; - "bindings-lxc" = dontDistribute super."bindings-lxc"; - "bindings-mmap" = dontDistribute super."bindings-mmap"; - "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; - "bindings-nettle" = dontDistribute super."bindings-nettle"; - "bindings-parport" = dontDistribute super."bindings-parport"; - "bindings-portaudio" = dontDistribute super."bindings-portaudio"; - "bindings-posix" = dontDistribute super."bindings-posix"; - "bindings-potrace" = dontDistribute super."bindings-potrace"; - "bindings-ppdev" = dontDistribute super."bindings-ppdev"; - "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; - "bindings-sane" = dontDistribute super."bindings-sane"; - "bindings-sc3" = dontDistribute super."bindings-sc3"; - "bindings-sipc" = dontDistribute super."bindings-sipc"; - "bindings-sophia" = dontDistribute super."bindings-sophia"; - "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; - "bindings-svm" = dontDistribute super."bindings-svm"; - "bindings-uname" = dontDistribute super."bindings-uname"; - "bindings-wlc" = dontDistribute super."bindings-wlc"; - "bindings-yices" = dontDistribute super."bindings-yices"; - "bindynamic" = dontDistribute super."bindynamic"; - "binembed" = dontDistribute super."binembed"; - "binembed-example" = dontDistribute super."binembed-example"; - "bini" = dontDistribute super."bini"; - "bio" = dontDistribute super."bio"; - "biohazard" = dontDistribute super."biohazard"; - "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; - "biophd" = dontDistribute super."biophd"; - "biosff" = dontDistribute super."biosff"; - "biostockholm" = dontDistribute super."biostockholm"; - "bird" = dontDistribute super."bird"; - "bit-array" = dontDistribute super."bit-array"; - "bit-vector" = dontDistribute super."bit-vector"; - "bitarray" = dontDistribute super."bitarray"; - "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; - "bitly-cli" = dontDistribute super."bitly-cli"; - "bitmap" = dontDistribute super."bitmap"; - "bitmap-opengl" = dontDistribute super."bitmap-opengl"; - "bitmaps" = dontDistribute super."bitmaps"; - "bits-atomic" = dontDistribute super."bits-atomic"; - "bits-bytestring" = dontDistribute super."bits-bytestring"; - "bits-bytestring-lazy" = dontDistribute super."bits-bytestring-lazy"; - "bits-conduit" = dontDistribute super."bits-conduit"; - "bits-extras" = dontDistribute super."bits-extras"; - "bitset" = dontDistribute super."bitset"; - "bitspeak" = dontDistribute super."bitspeak"; - "bitstream" = dontDistribute super."bitstream"; - "bitstring" = dontDistribute super."bitstring"; - "bittorrent" = dontDistribute super."bittorrent"; - "bitvec" = dontDistribute super."bitvec"; - "bitwise" = dontDistribute super."bitwise"; - "bk-tree" = dontDistribute super."bk-tree"; - "bkr" = dontDistribute super."bkr"; - "bktrees" = dontDistribute super."bktrees"; - "bla" = dontDistribute super."bla"; - "black-jewel" = dontDistribute super."black-jewel"; - "blacktip" = dontDistribute super."blacktip"; - "blakesum" = dontDistribute super."blakesum"; - "blakesum-demo" = dontDistribute super."blakesum-demo"; - "blas" = dontDistribute super."blas"; - "blas-hs" = dontDistribute super."blas-hs"; - "blatex" = dontDistribute super."blatex"; - "blaze" = dontDistribute super."blaze"; - "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; - "blaze-builder-enumerator" = dontDistribute super."blaze-builder-enumerator"; - "blaze-from-html" = dontDistribute super."blaze-from-html"; - "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; - "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; - "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; - "blaze-json" = dontDistribute super."blaze-json"; - "blaze-shields" = dontDistribute super."blaze-shields"; - "blaze-textual-native" = dontDistribute super."blaze-textual-native"; - "blazeMarker" = dontDistribute super."blazeMarker"; - "blink1" = dontDistribute super."blink1"; - "blip" = dontDistribute super."blip"; - "bliplib" = dontDistribute super."bliplib"; - "blockhash" = dontDistribute super."blockhash"; - "blocking-transactions" = dontDistribute super."blocking-transactions"; - "blogination" = dontDistribute super."blogination"; - "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; - "bloomfilter" = dontDistribute super."bloomfilter"; - "bloomfilter-redis" = dontDistribute super."bloomfilter-redis"; - "bloxorz" = dontDistribute super."bloxorz"; - "blubber" = dontDistribute super."blubber"; - "blubber-server" = dontDistribute super."blubber-server"; - "bluetile" = dontDistribute super."bluetile"; - "bluetileutils" = dontDistribute super."bluetileutils"; - "blunt" = dontDistribute super."blunt"; - "board-games" = dontDistribute super."board-games"; - "bogre-banana" = dontDistribute super."bogre-banana"; - "bond" = dontDistribute super."bond"; - "bond-haskell" = dontDistribute super."bond-haskell"; - "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; - "bookkeeper" = dontDistribute super."bookkeeper"; - "bookkeeper-permissions" = dontDistribute super."bookkeeper-permissions"; - "bool-extras" = dontDistribute super."bool-extras"; - "boolean-list" = dontDistribute super."boolean-list"; - "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; - "boolexpr" = dontDistribute super."boolexpr"; - "bools" = dontDistribute super."bools"; - "boomange" = dontDistribute super."boomange"; - "boombox" = dontDistribute super."boombox"; - "boomslang" = dontDistribute super."boomslang"; - "borel" = dontDistribute super."borel"; - "boring-window-switcher" = dontDistribute super."boring-window-switcher"; - "bot" = dontDistribute super."bot"; - "botpp" = dontDistribute super."botpp"; - "bound" = dontDistribute super."bound"; - "bound-gen" = dontDistribute super."bound-gen"; - "bounded-tchan" = dontDistribute super."bounded-tchan"; - "bowntz" = dontDistribute super."bowntz"; - "box-tuples" = dontDistribute super."box-tuples"; - "bpann" = dontDistribute super."bpann"; - "braid" = dontDistribute super."braid"; - "brainfuck" = dontDistribute super."brainfuck"; - "brainfuck-monad" = dontDistribute super."brainfuck-monad"; - "brainfuck-tut" = dontDistribute super."brainfuck-tut"; - "break" = dontDistribute super."break"; - "breakout" = dontDistribute super."breakout"; - "breve" = dontDistribute super."breve"; - "brians-brain" = dontDistribute super."brians-brain"; - "brick" = dontDistribute super."brick"; - "brillig" = dontDistribute super."brillig"; - "broccoli" = dontDistribute super."broccoli"; - "broker-haskell" = dontDistribute super."broker-haskell"; - "bsd-sysctl" = dontDistribute super."bsd-sysctl"; - "bson-generic" = dontDistribute super."bson-generic"; - "bson-generics" = dontDistribute super."bson-generics"; - "bson-mapping" = dontDistribute super."bson-mapping"; - "bspack" = dontDistribute super."bspack"; - "bsparse" = dontDistribute super."bsparse"; - "btree-concurrent" = dontDistribute super."btree-concurrent"; - "buffer-builder" = dontDistribute super."buffer-builder"; - "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; - "buffer-pipe" = dontDistribute super."buffer-pipe"; - "buffon" = dontDistribute super."buffon"; - "bugzilla" = dontDistribute super."bugzilla"; - "buildable" = dontDistribute super."buildable"; - "buildbox" = dontDistribute super."buildbox"; - "buildbox-tools" = dontDistribute super."buildbox-tools"; - "buildwrapper" = dontDistribute super."buildwrapper"; - "bullet" = dontDistribute super."bullet"; - "burst-detection" = dontDistribute super."burst-detection"; - "bus-pirate" = dontDistribute super."bus-pirate"; - "buster" = dontDistribute super."buster"; - "buster-gtk" = dontDistribute super."buster-gtk"; - "buster-network" = dontDistribute super."buster-network"; - "butterflies" = dontDistribute super."butterflies"; - "bv" = dontDistribute super."bv"; - "byline" = dontDistribute super."byline"; - "bytable" = dontDistribute super."bytable"; - "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; - "bytestring-class" = dontDistribute super."bytestring-class"; - "bytestring-csv" = dontDistribute super."bytestring-csv"; - "bytestring-delta" = dontDistribute super."bytestring-delta"; - "bytestring-from" = dontDistribute super."bytestring-from"; - "bytestring-mmap" = dontDistribute super."bytestring-mmap"; - "bytestring-nums" = dontDistribute super."bytestring-nums"; - "bytestring-plain" = dontDistribute super."bytestring-plain"; - "bytestring-read" = dontDistribute super."bytestring-read"; - "bytestring-rematch" = dontDistribute super."bytestring-rematch"; - "bytestring-short" = dontDistribute super."bytestring-short"; - "bytestring-show" = dontDistribute super."bytestring-show"; - "bytestringparser" = dontDistribute super."bytestringparser"; - "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; - "bytestringreadp" = dontDistribute super."bytestringreadp"; - "c-dsl" = dontDistribute super."c-dsl"; - "c-io" = dontDistribute super."c-io"; - "c-storable-deriving" = dontDistribute super."c-storable-deriving"; - "c0check" = dontDistribute super."c0check"; - "c0parser" = dontDistribute super."c0parser"; - "c10k" = dontDistribute super."c10k"; - "c2hsc" = dontDistribute super."c2hsc"; - "cab" = dontDistribute super."cab"; - "cabal" = dontDistribute super."cabal"; - "cabal-audit" = dontDistribute super."cabal-audit"; - "cabal-bounds" = dontDistribute super."cabal-bounds"; - "cabal-cargs" = dontDistribute super."cabal-cargs"; - "cabal-constraints" = dontDistribute super."cabal-constraints"; - "cabal-db" = dontDistribute super."cabal-db"; - "cabal-debian" = dontDistribute super."cabal-debian"; - "cabal-dev" = dontDistribute super."cabal-dev"; - "cabal-dir" = dontDistribute super."cabal-dir"; - "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; - "cabal-ghci" = dontDistribute super."cabal-ghci"; - "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; - "cabal-info" = dontDistribute super."cabal-info"; - "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; - "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; - "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; - "cabal-lenses" = dontDistribute super."cabal-lenses"; - "cabal-macosx" = dontDistribute super."cabal-macosx"; - "cabal-meta" = dontDistribute super."cabal-meta"; - "cabal-mon" = dontDistribute super."cabal-mon"; - "cabal-nirvana" = dontDistribute super."cabal-nirvana"; - "cabal-progdeps" = dontDistribute super."cabal-progdeps"; - "cabal-query" = dontDistribute super."cabal-query"; - "cabal-scripts" = dontDistribute super."cabal-scripts"; - "cabal-setup" = dontDistribute super."cabal-setup"; - "cabal-sign" = dontDistribute super."cabal-sign"; - "cabal-test" = dontDistribute super."cabal-test"; - "cabal-test-bin" = dontDistribute super."cabal-test-bin"; - "cabal-test-compat" = dontDistribute super."cabal-test-compat"; - "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; - "cabal-uninstall" = dontDistribute super."cabal-uninstall"; - "cabal-upload" = dontDistribute super."cabal-upload"; - "cabal2arch" = dontDistribute super."cabal2arch"; - "cabal2doap" = dontDistribute super."cabal2doap"; - "cabal2ebuild" = dontDistribute super."cabal2ebuild"; - "cabal2ghci" = dontDistribute super."cabal2ghci"; - "cabal2spec" = dontDistribute super."cabal2spec"; - "cabalQuery" = dontDistribute super."cabalQuery"; - "cabalg" = dontDistribute super."cabalg"; - "cabalgraph" = dontDistribute super."cabalgraph"; - "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; - "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; - "cabalvchk" = dontDistribute super."cabalvchk"; - "cabin" = dontDistribute super."cabin"; - "cabocha" = dontDistribute super."cabocha"; - "cached-io" = dontDistribute super."cached-io"; - "cached-traversable" = dontDistribute super."cached-traversable"; - "caf" = dontDistribute super."caf"; - "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; - "caffegraph" = dontDistribute super."caffegraph"; - "cairo-appbase" = dontDistribute super."cairo-appbase"; - "cake" = dontDistribute super."cake"; - "cake3" = dontDistribute super."cake3"; - "cakyrespa" = dontDistribute super."cakyrespa"; - "cal3d" = dontDistribute super."cal3d"; - "cal3d-examples" = dontDistribute super."cal3d-examples"; - "cal3d-opengl" = dontDistribute super."cal3d-opengl"; - "calc" = dontDistribute super."calc"; - "calculator" = dontDistribute super."calculator"; - "caldims" = dontDistribute super."caldims"; - "caledon" = dontDistribute super."caledon"; - "calendar-recycling" = dontDistribute super."calendar-recycling"; - "call" = dontDistribute super."call"; - "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; - "camh" = dontDistribute super."camh"; - "campfire" = dontDistribute super."campfire"; - "canonical-filepath" = dontDistribute super."canonical-filepath"; - "canteven-config" = dontDistribute super."canteven-config"; - "canteven-http" = dontDistribute super."canteven-http"; - "canteven-listen-http" = dontDistribute super."canteven-listen-http"; - "canteven-log" = dontDistribute super."canteven-log"; - "canteven-parsedate" = dontDistribute super."canteven-parsedate"; - "canteven-template" = dontDistribute super."canteven-template"; - "cantor" = dontDistribute super."cantor"; - "cao" = dontDistribute super."cao"; - "cap" = dontDistribute super."cap"; - "capped-list" = dontDistribute super."capped-list"; - "capri" = dontDistribute super."capri"; - "car-pool" = dontDistribute super."car-pool"; - "caramia" = dontDistribute super."caramia"; - "carboncopy" = dontDistribute super."carboncopy"; - "carettah" = dontDistribute super."carettah"; - "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; - "casadi-bindings" = dontDistribute super."casadi-bindings"; - "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; - "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; - "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; - "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; - "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; - "cascading" = dontDistribute super."cascading"; - "case-conversion" = dontDistribute super."case-conversion"; - "case-insensitive-match" = dontDistribute super."case-insensitive-match"; - "cash" = dontDistribute super."cash"; - "casing" = dontDistribute super."casing"; - "casr-logbook" = dontDistribute super."casr-logbook"; - "casr-logbook-html" = dontDistribute super."casr-logbook-html"; - "casr-logbook-meta" = dontDistribute super."casr-logbook-meta"; - "casr-logbook-meta-html" = dontDistribute super."casr-logbook-meta-html"; - "casr-logbook-reports" = dontDistribute super."casr-logbook-reports"; - "casr-logbook-reports-html" = dontDistribute super."casr-logbook-reports-html"; - "casr-logbook-reports-meta" = dontDistribute super."casr-logbook-reports-meta"; - "casr-logbook-reports-meta-html" = dontDistribute super."casr-logbook-reports-meta-html"; - "casr-logbook-types" = dontDistribute super."casr-logbook-types"; - "cassandra-cql" = dontDistribute super."cassandra-cql"; - "cassandra-thrift" = dontDistribute super."cassandra-thrift"; - "cassava-streams" = dontDistribute super."cassava-streams"; - "cassy" = dontDistribute super."cassy"; - "castle" = dontDistribute super."castle"; - "casui" = dontDistribute super."casui"; - "catamorphism" = dontDistribute super."catamorphism"; - "catch-fd" = dontDistribute super."catch-fd"; - "categorical-algebra" = dontDistribute super."categorical-algebra"; - "categories" = dontDistribute super."categories"; - "category-extras" = dontDistribute super."category-extras"; - "category-printf" = dontDistribute super."category-printf"; - "category-traced" = dontDistribute super."category-traced"; - "cautious-file" = dontDistribute super."cautious-file"; - "cayley-dickson" = dontDistribute super."cayley-dickson"; - "cblrepo" = dontDistribute super."cblrepo"; - "cci" = dontDistribute super."cci"; - "ccnx" = dontDistribute super."ccnx"; - "cctools-workqueue" = dontDistribute super."cctools-workqueue"; - "cedict" = dontDistribute super."cedict"; - "cef" = dontDistribute super."cef"; - "ceilometer-common" = dontDistribute super."ceilometer-common"; - "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; - "cerberus" = dontDistribute super."cerberus"; - "cereal-derive" = dontDistribute super."cereal-derive"; - "cereal-enumerator" = dontDistribute super."cereal-enumerator"; - "cereal-ieee754" = dontDistribute super."cereal-ieee754"; - "cereal-io-streams" = dontDistribute super."cereal-io-streams"; - "cereal-plus" = dontDistribute super."cereal-plus"; - "cereal-streams" = dontDistribute super."cereal-streams"; - "cereal-text" = dontDistribute super."cereal-text"; - "certificate" = dontDistribute super."certificate"; - "cf" = dontDistribute super."cf"; - "cfipu" = dontDistribute super."cfipu"; - "cflp" = dontDistribute super."cflp"; - "cfopu" = dontDistribute super."cfopu"; - "cg" = dontDistribute super."cg"; - "cgen" = dontDistribute super."cgen"; - "cgi-undecidable" = dontDistribute super."cgi-undecidable"; - "cgi-utils" = dontDistribute super."cgi-utils"; - "cgrep" = dontDistribute super."cgrep"; - "chain-codes" = dontDistribute super."chain-codes"; - "chalk" = dontDistribute super."chalk"; - "chalkboard" = dontDistribute super."chalkboard"; - "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; - "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; - "chan-split" = dontDistribute super."chan-split"; - "change-monger" = dontDistribute super."change-monger"; - "charade" = dontDistribute super."charade"; - "charsetdetect" = dontDistribute super."charsetdetect"; - "chart-histogram" = dontDistribute super."chart-histogram"; - "chaselev-deque" = dontDistribute super."chaselev-deque"; - "chatter" = dontDistribute super."chatter"; - "chatty" = dontDistribute super."chatty"; - "chatty-text" = dontDistribute super."chatty-text"; - "chatty-utils" = dontDistribute super."chatty-utils"; - "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; - "check-pvp" = dontDistribute super."check-pvp"; - "checked" = dontDistribute super."checked"; - "chell-hunit" = dontDistribute super."chell-hunit"; - "chesshs" = dontDistribute super."chesshs"; - "chevalier-common" = dontDistribute super."chevalier-common"; - "chorale" = dontDistribute super."chorale"; - "chorale-geo" = dontDistribute super."chorale-geo"; - "chp" = dontDistribute super."chp"; - "chp-mtl" = dontDistribute super."chp-mtl"; - "chp-plus" = dontDistribute super."chp-plus"; - "chp-spec" = dontDistribute super."chp-spec"; - "chp-transformers" = dontDistribute super."chp-transformers"; - "chronograph" = dontDistribute super."chronograph"; - "chronos" = dontDistribute super."chronos"; - "chu2" = dontDistribute super."chu2"; - "chuchu" = dontDistribute super."chuchu"; - "chunks" = dontDistribute super."chunks"; - "chunky" = dontDistribute super."chunky"; - "church-list" = dontDistribute super."church-list"; - "cil" = dontDistribute super."cil"; - "cinvoke" = dontDistribute super."cinvoke"; - "cio" = dontDistribute super."cio"; - "cipher-rc5" = dontDistribute super."cipher-rc5"; - "ciphersaber2" = dontDistribute super."ciphersaber2"; - "circ" = dontDistribute super."circ"; - "circlehs" = dontDistribute super."circlehs"; - "cirru-parser" = dontDistribute super."cirru-parser"; - "citation-resolve" = dontDistribute super."citation-resolve"; - "citeproc-hs" = dontDistribute super."citeproc-hs"; - "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; - "cityhash" = dontDistribute super."cityhash"; - "cjk" = dontDistribute super."cjk"; - "clac" = dontDistribute super."clac"; - "clafer" = dontDistribute super."clafer"; - "claferIG" = dontDistribute super."claferIG"; - "claferwiki" = dontDistribute super."claferwiki"; - "clang-pure" = dontDistribute super."clang-pure"; - "clanki" = dontDistribute super."clanki"; - "clarifai" = dontDistribute super."clarifai"; - "clash" = dontDistribute super."clash"; - "clash-ghc" = dontDistribute super."clash-ghc"; - "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; - "classify" = dontDistribute super."classify"; - "classy-parallel" = dontDistribute super."classy-parallel"; - "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; - "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; - "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; - "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; - "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; - "cld2" = dontDistribute super."cld2"; - "clean-home" = dontDistribute super."clean-home"; - "clean-unions" = dontDistribute super."clean-unions"; - "cless" = dontDistribute super."cless"; - "clevercss" = dontDistribute super."clevercss"; - "click-clack" = dontDistribute super."click-clack"; - "clifford" = dontDistribute super."clifford"; - "clippard" = dontDistribute super."clippard"; - "clipper" = dontDistribute super."clipper"; - "clippings" = dontDistribute super."clippings"; - "clist" = dontDistribute super."clist"; - "cloben" = dontDistribute super."cloben"; - "clocked" = dontDistribute super."clocked"; - "clogparse" = dontDistribute super."clogparse"; - "clone-all" = dontDistribute super."clone-all"; - "closure" = dontDistribute super."closure"; - "cloud-haskell" = dontDistribute super."cloud-haskell"; - "cloudfront-signer" = dontDistribute super."cloudfront-signer"; - "cloudyfs" = dontDistribute super."cloudyfs"; - "cltw" = dontDistribute super."cltw"; - "clua" = dontDistribute super."clua"; - "cluss" = dontDistribute super."cluss"; - "clustertools" = dontDistribute super."clustertools"; - "clutterhs" = dontDistribute super."clutterhs"; - "cmaes" = dontDistribute super."cmaes"; - "cmark-sections" = dontDistribute super."cmark-sections"; - "cmath" = dontDistribute super."cmath"; - "cmathml3" = dontDistribute super."cmathml3"; - "cmd-item" = dontDistribute super."cmd-item"; - "cmdargs-browser" = dontDistribute super."cmdargs-browser"; - "cmdlib" = dontDistribute super."cmdlib"; - "cmdtheline" = dontDistribute super."cmdtheline"; - "cml" = dontDistribute super."cml"; - "cmonad" = dontDistribute super."cmonad"; - "cmph" = dontDistribute super."cmph"; - "cmu" = dontDistribute super."cmu"; - "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; - "cndict" = dontDistribute super."cndict"; - "codec" = dontDistribute super."codec"; - "codec-libevent" = dontDistribute super."codec-libevent"; - "codec-mbox" = dontDistribute super."codec-mbox"; - "codecov-haskell" = dontDistribute super."codecov-haskell"; - "codemonitor" = dontDistribute super."codemonitor"; - "codepad" = dontDistribute super."codepad"; - "codeworld-api" = dontDistribute super."codeworld-api"; - "codex" = dontDistribute super."codex"; - "cofunctor" = dontDistribute super."cofunctor"; - "cognimeta-utils" = dontDistribute super."cognimeta-utils"; - "coin" = dontDistribute super."coin"; - "coinbase-exchange" = dontDistribute super."coinbase-exchange"; - "colada" = dontDistribute super."colada"; - "colchis" = dontDistribute super."colchis"; - "collada-output" = dontDistribute super."collada-output"; - "collada-types" = dontDistribute super."collada-types"; - "collapse-util" = dontDistribute super."collapse-util"; - "collection-json" = dontDistribute super."collection-json"; - "collections" = dontDistribute super."collections"; - "collections-api" = dontDistribute super."collections-api"; - "collections-base-instances" = dontDistribute super."collections-base-instances"; - "colock" = dontDistribute super."colock"; - "colonnade" = dontDistribute super."colonnade"; - "color-counter" = dontDistribute super."color-counter"; - "colorize-haskell" = dontDistribute super."colorize-haskell"; - "colors" = dontDistribute super."colors"; - "coltrane" = dontDistribute super."coltrane"; - "com" = dontDistribute super."com"; - "combinat" = dontDistribute super."combinat"; - "combinat-diagrams" = dontDistribute super."combinat-diagrams"; - "combinator-interactive" = dontDistribute super."combinator-interactive"; - "combinatorial-problems" = dontDistribute super."combinatorial-problems"; - "combinatorics" = dontDistribute super."combinatorics"; - "combobuffer" = dontDistribute super."combobuffer"; - "comfort-graph" = dontDistribute super."comfort-graph"; - "command" = dontDistribute super."command"; - "command-qq" = dontDistribute super."command-qq"; - "commander" = dontDistribute super."commander"; - "commodities" = dontDistribute super."commodities"; - "commsec" = dontDistribute super."commsec"; - "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; - "comonad-extras" = dontDistribute super."comonad-extras"; - "comonad-random" = dontDistribute super."comonad-random"; - "compact-map" = dontDistribute super."compact-map"; - "compact-socket" = dontDistribute super."compact-socket"; - "compact-string" = dontDistribute super."compact-string"; - "compact-string-fix" = dontDistribute super."compact-string-fix"; - "compare-type" = dontDistribute super."compare-type"; - "compdata-automata" = dontDistribute super."compdata-automata"; - "compdata-dags" = dontDistribute super."compdata-dags"; - "compdata-param" = dontDistribute super."compdata-param"; - "compensated" = dontDistribute super."compensated"; - "competition" = dontDistribute super."competition"; - "compilation" = dontDistribute super."compilation"; - "complex-generic" = dontDistribute super."complex-generic"; - "complex-integrate" = dontDistribute super."complex-integrate"; - "complexity" = dontDistribute super."complexity"; - "compose-ltr" = dontDistribute super."compose-ltr"; - "compose-trans" = dontDistribute super."compose-trans"; - "composition-tree" = dontDistribute super."composition-tree"; - "compound-types" = dontDistribute super."compound-types"; - "compressed" = dontDistribute super."compressed"; - "compression" = dontDistribute super."compression"; - "compstrat" = dontDistribute super."compstrat"; - "comptrans" = dontDistribute super."comptrans"; - "computational-algebra" = dontDistribute super."computational-algebra"; - "computations" = dontDistribute super."computations"; - "conceit" = dontDistribute super."conceit"; - "concorde" = dontDistribute super."concorde"; - "concraft" = dontDistribute super."concraft"; - "concraft-hr" = dontDistribute super."concraft-hr"; - "concraft-pl" = dontDistribute super."concraft-pl"; - "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; - "concrete-typerep" = dontDistribute super."concrete-typerep"; - "concurrent-barrier" = dontDistribute super."concurrent-barrier"; - "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; - "concurrent-machines" = dontDistribute super."concurrent-machines"; - "concurrent-rpc" = dontDistribute super."concurrent-rpc"; - "concurrent-sa" = dontDistribute super."concurrent-sa"; - "concurrent-split" = dontDistribute super."concurrent-split"; - "concurrent-state" = dontDistribute super."concurrent-state"; - "concurrent-utilities" = dontDistribute super."concurrent-utilities"; - "concurrentoutput" = dontDistribute super."concurrentoutput"; - "cond" = dontDistribute super."cond"; - "condor" = dontDistribute super."condor"; - "condorcet" = dontDistribute super."condorcet"; - "conductive-base" = dontDistribute super."conductive-base"; - "conductive-clock" = dontDistribute super."conductive-clock"; - "conductive-hsc3" = dontDistribute super."conductive-hsc3"; - "conductive-song" = dontDistribute super."conductive-song"; - "conduit-audio" = dontDistribute super."conduit-audio"; - "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-connection" = dontDistribute super."conduit-connection"; - "conduit-find" = dontDistribute super."conduit-find"; - "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"; - "conf" = dontDistribute super."conf"; - "conffmt" = dontDistribute super."conffmt"; - "config-manager" = dontDistribute super."config-manager"; - "config-select" = dontDistribute super."config-select"; - "config-value" = dontDistribute super."config-value"; - "config-value-getopt" = dontDistribute super."config-value-getopt"; - "configifier" = dontDistribute super."configifier"; - "configuration" = dontDistribute super."configuration"; - "confsolve" = dontDistribute super."confsolve"; - "congruence-relation" = dontDistribute super."congruence-relation"; - "conjugateGradient" = dontDistribute super."conjugateGradient"; - "conjure" = dontDistribute super."conjure"; - "conlogger" = dontDistribute super."conlogger"; - "connection-pool" = dontDistribute super."connection-pool"; - "consistent" = dontDistribute super."consistent"; - "console-program" = dontDistribute super."console-program"; - "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; - "constrained-categories" = dontDistribute super."constrained-categories"; - "constrained-dynamic" = dontDistribute super."constrained-dynamic"; - "constrained-normal" = dontDistribute super."constrained-normal"; - "constraint-classes" = dontDistribute super."constraint-classes"; - "constructible" = dontDistribute super."constructible"; - "constructive-algebra" = dontDistribute super."constructive-algebra"; - "consumers" = dontDistribute super."consumers"; - "container" = dontDistribute super."container"; - "container-builder" = dontDistribute super."container-builder"; - "container-classes" = dontDistribute super."container-classes"; - "containers-benchmark" = dontDistribute super."containers-benchmark"; - "containers-deepseq" = dontDistribute super."containers-deepseq"; - "context-free-grammar" = dontDistribute super."context-free-grammar"; - "context-stack" = dontDistribute super."context-stack"; - "continue" = dontDistribute super."continue"; - "continuum" = dontDistribute super."continuum"; - "continuum-client" = dontDistribute super."continuum-client"; - "control-event" = dontDistribute super."control-event"; - "control-monad-attempt" = dontDistribute super."control-monad-attempt"; - "control-monad-exception" = dontDistribute super."control-monad-exception"; - "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; - "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; - "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; - "control-monad-failure" = dontDistribute super."control-monad-failure"; - "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; - "control-monad-queue" = dontDistribute super."control-monad-queue"; - "control-timeout" = dontDistribute super."control-timeout"; - "contstuff" = dontDistribute super."contstuff"; - "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; - "contstuff-transformers" = dontDistribute super."contstuff-transformers"; - "conversion" = dontDistribute super."conversion"; - "conversion-bytestring" = dontDistribute super."conversion-bytestring"; - "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; - "conversion-text" = dontDistribute super."conversion-text"; - "convert" = dontDistribute super."convert"; - "convertible-ascii" = dontDistribute super."convertible-ascii"; - "convertible-text" = dontDistribute super."convertible-text"; - "cookbook" = dontDistribute super."cookbook"; - "coordinate" = dontDistribute super."coordinate"; - "copilot" = dontDistribute super."copilot"; - "copilot-c99" = dontDistribute super."copilot-c99"; - "copilot-cbmc" = dontDistribute super."copilot-cbmc"; - "copilot-core" = dontDistribute super."copilot-core"; - "copilot-language" = dontDistribute super."copilot-language"; - "copilot-libraries" = dontDistribute super."copilot-libraries"; - "copilot-sbv" = dontDistribute super."copilot-sbv"; - "copilot-theorem" = dontDistribute super."copilot-theorem"; - "copr" = dontDistribute super."copr"; - "core" = dontDistribute super."core"; - "core-compiler" = dontDistribute super."core-compiler"; - "core-haskell" = dontDistribute super."core-haskell"; - "corebot-bliki" = dontDistribute super."corebot-bliki"; - "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; - "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; - "coroutine-object" = dontDistribute super."coroutine-object"; - "couch-hs" = dontDistribute super."couch-hs"; - "couch-simple" = dontDistribute super."couch-simple"; - "couchdb-conduit" = dontDistribute super."couchdb-conduit"; - "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; - "count" = dontDistribute super."count"; - "counter" = dontDistribute super."counter"; - "country-codes" = dontDistribute super."country-codes"; - "court" = dontDistribute super."court"; - "coverage" = dontDistribute super."coverage"; - "cpio-conduit" = dontDistribute super."cpio-conduit"; - "cplex-hs" = dontDistribute super."cplex-hs"; - "cplusplus-th" = dontDistribute super."cplusplus-th"; - "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; - "cpsa" = dontDistribute super."cpsa"; - "cpuid" = dontDistribute super."cpuid"; - "cpuinfo" = dontDistribute super."cpuinfo"; - "cpuperf" = dontDistribute super."cpuperf"; - "cpython" = dontDistribute super."cpython"; - "cql" = dontDistribute super."cql"; - "cql-io" = dontDistribute super."cql-io"; - "cqrs" = dontDistribute super."cqrs"; - "cqrs-core" = dontDistribute super."cqrs-core"; - "cqrs-example" = dontDistribute super."cqrs-example"; - "cqrs-memory" = dontDistribute super."cqrs-memory"; - "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; - "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; - "cqrs-test" = dontDistribute super."cqrs-test"; - "cqrs-testkit" = dontDistribute super."cqrs-testkit"; - "cqrs-types" = dontDistribute super."cqrs-types"; - "cr" = dontDistribute super."cr"; - "crack" = dontDistribute super."crack"; - "craftwerk" = dontDistribute super."craftwerk"; - "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; - "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; - "crawlchain" = dontDistribute super."crawlchain"; - "craze" = dontDistribute super."craze"; - "crc" = dontDistribute super."crc"; - "crc16" = dontDistribute super."crc16"; - "crc16-table" = dontDistribute super."crc16-table"; - "creatur" = dontDistribute super."creatur"; - "credentials" = dontDistribute super."credentials"; - "credentials-cli" = dontDistribute super."credentials-cli"; - "crf-chain1" = dontDistribute super."crf-chain1"; - "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; - "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; - "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; - "critbit" = dontDistribute super."critbit"; - "criterion-plus" = dontDistribute super."criterion-plus"; - "criterion-to-html" = dontDistribute super."criterion-to-html"; - "crockford" = dontDistribute super."crockford"; - "crocodile" = dontDistribute super."crocodile"; - "cron-compat" = dontDistribute super."cron-compat"; - "cruncher-types" = dontDistribute super."cruncher-types"; - "crunghc" = dontDistribute super."crunghc"; - "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; - "crypto-classical" = dontDistribute super."crypto-classical"; - "crypto-conduit" = dontDistribute super."crypto-conduit"; - "crypto-enigma" = dontDistribute super."crypto-enigma"; - "crypto-multihash" = dontDistribute super."crypto-multihash"; - "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; - "crypto-random-effect" = dontDistribute super."crypto-random-effect"; - "crypto-totp" = dontDistribute super."crypto-totp"; - "cryptohash-md5" = dontDistribute super."cryptohash-md5"; - "cryptohash-sha1" = dontDistribute super."cryptohash-sha1"; - "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; - "cryptsy-api" = dontDistribute super."cryptsy-api"; - "crystalfontz" = dontDistribute super."crystalfontz"; - "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; - "csound-catalog" = dontDistribute super."csound-catalog"; - "csound-expression" = dontDistribute super."csound-expression"; - "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; - "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; - "csound-expression-typed" = dontDistribute super."csound-expression-typed"; - "csound-sampler" = dontDistribute super."csound-sampler"; - "csp" = dontDistribute super."csp"; - "cspmchecker" = dontDistribute super."cspmchecker"; - "css" = dontDistribute super."css"; - "csv-conduit" = dontDistribute super."csv-conduit"; - "csv-enumerator" = dontDistribute super."csv-enumerator"; - "csv-nptools" = dontDistribute super."csv-nptools"; - "csv-table" = dontDistribute super."csv-table"; - "csv-to-qif" = dontDistribute super."csv-to-qif"; - "ctemplate" = dontDistribute super."ctemplate"; - "ctkl" = dontDistribute super."ctkl"; - "ctpl" = dontDistribute super."ctpl"; - "cube" = dontDistribute super."cube"; - "cubical" = dontDistribute super."cubical"; - "cubicbezier" = dontDistribute super."cubicbezier"; - "cublas" = dontDistribute super."cublas"; - "cuboid" = dontDistribute super."cuboid"; - "cuda" = dontDistribute super."cuda"; - "cudd" = dontDistribute super."cudd"; - "cufft" = dontDistribute super."cufft"; - "curl-aeson" = dontDistribute super."curl-aeson"; - "curlhs" = dontDistribute super."curlhs"; - "currency" = dontDistribute super."currency"; - "currency-convert" = dontDistribute super."currency-convert"; - "current-locale" = dontDistribute super."current-locale"; - "curry-base" = dontDistribute super."curry-base"; - "curry-frontend" = dontDistribute super."curry-frontend"; - "cursedcsv" = dontDistribute super."cursedcsv"; - "curve25519" = dontDistribute super."curve25519"; - "curves" = dontDistribute super."curves"; - "custom-prelude" = dontDistribute super."custom-prelude"; - "cv-combinators" = dontDistribute super."cv-combinators"; - "cyclotomic" = dontDistribute super."cyclotomic"; - "cypher" = dontDistribute super."cypher"; - "d-bus" = dontDistribute super."d-bus"; - "d3d11binding" = dontDistribute super."d3d11binding"; - "d3js" = dontDistribute super."d3js"; - "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; - "daemons" = dontDistribute super."daemons"; - "dag" = dontDistribute super."dag"; - "damnpacket" = dontDistribute super."damnpacket"; - "danibot" = dontDistribute super."danibot"; - "dao" = dontDistribute super."dao"; - "dapi" = dontDistribute super."dapi"; - "darcs-benchmark" = dontDistribute super."darcs-benchmark"; - "darcs-beta" = dontDistribute super."darcs-beta"; - "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; - "darcs-cabalized" = dontDistribute super."darcs-cabalized"; - "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; - "darcs-graph" = dontDistribute super."darcs-graph"; - "darcs-monitor" = dontDistribute super."darcs-monitor"; - "darcs-scripts" = dontDistribute super."darcs-scripts"; - "darcs2dot" = dontDistribute super."darcs2dot"; - "darcsden" = dontDistribute super."darcsden"; - "darcswatch" = dontDistribute super."darcswatch"; - "darkplaces-demo" = dontDistribute super."darkplaces-demo"; - "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; - "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; - "darkplaces-text" = dontDistribute super."darkplaces-text"; - "dash-haskell" = dontDistribute super."dash-haskell"; - "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; - "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; - "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; - "data-accessor-template" = dontDistribute super."data-accessor-template"; - "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; - "data-aviary" = dontDistribute super."data-aviary"; - "data-base" = dontDistribute super."data-base"; - "data-bword" = dontDistribute super."data-bword"; - "data-carousel" = dontDistribute super."data-carousel"; - "data-category" = dontDistribute super."data-category"; - "data-cell" = dontDistribute super."data-cell"; - "data-checked" = dontDistribute super."data-checked"; - "data-clist" = dontDistribute super."data-clist"; - "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; - "data-construction" = dontDistribute super."data-construction"; - "data-cycle" = dontDistribute super."data-cycle"; - "data-default-extra" = dontDistribute super."data-default-extra"; - "data-default-generics" = dontDistribute super."data-default-generics"; - "data-default-instances-base" = dontDistribute super."data-default-instances-base"; - "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; - "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; - "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; - "data-default-instances-text" = dontDistribute super."data-default-instances-text"; - "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; - "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; - "data-dispersal" = dontDistribute super."data-dispersal"; - "data-dword" = dontDistribute super."data-dword"; - "data-easy" = dontDistribute super."data-easy"; - "data-elf" = dontDistribute super."data-elf"; - "data-embed" = dontDistribute super."data-embed"; - "data-endian" = dontDistribute super."data-endian"; - "data-extend-generic" = dontDistribute super."data-extend-generic"; - "data-extra" = dontDistribute super."data-extra"; - "data-filepath" = dontDistribute super."data-filepath"; - "data-files-gen" = dontDistribute super."data-files-gen"; - "data-fin" = dontDistribute super."data-fin"; - "data-fin-simple" = dontDistribute super."data-fin-simple"; - "data-fix" = dontDistribute super."data-fix"; - "data-fix-cse" = dontDistribute super."data-fix-cse"; - "data-flags" = dontDistribute super."data-flags"; - "data-flagset" = dontDistribute super."data-flagset"; - "data-fresh" = dontDistribute super."data-fresh"; - "data-function-meld" = dontDistribute super."data-function-meld"; - "data-function-tacit" = dontDistribute super."data-function-tacit"; - "data-interval" = dontDistribute super."data-interval"; - "data-ivar" = dontDistribute super."data-ivar"; - "data-json-token" = dontDistribute super."data-json-token"; - "data-kiln" = dontDistribute super."data-kiln"; - "data-layer" = dontDistribute super."data-layer"; - "data-layout" = dontDistribute super."data-layout"; - "data-lens" = dontDistribute super."data-lens"; - "data-lens-fd" = dontDistribute super."data-lens-fd"; - "data-lens-ixset" = dontDistribute super."data-lens-ixset"; - "data-lens-template" = dontDistribute super."data-lens-template"; - "data-list-sequences" = dontDistribute super."data-list-sequences"; - "data-map-multikey" = dontDistribute super."data-map-multikey"; - "data-msgpack" = dontDistribute super."data-msgpack"; - "data-named" = dontDistribute super."data-named"; - "data-nat" = dontDistribute super."data-nat"; - "data-object" = dontDistribute super."data-object"; - "data-object-json" = dontDistribute super."data-object-json"; - "data-object-yaml" = dontDistribute super."data-object-yaml"; - "data-partition" = dontDistribute super."data-partition"; - "data-pprint" = dontDistribute super."data-pprint"; - "data-quotientref" = dontDistribute super."data-quotientref"; - "data-r-tree" = dontDistribute super."data-r-tree"; - "data-ref" = dontDistribute super."data-ref"; - "data-reify-cse" = dontDistribute super."data-reify-cse"; - "data-repr" = dontDistribute super."data-repr"; - "data-result" = dontDistribute super."data-result"; - "data-rev" = dontDistribute super."data-rev"; - "data-rope" = dontDistribute super."data-rope"; - "data-rtuple" = dontDistribute super."data-rtuple"; - "data-serializer" = dontDistribute super."data-serializer"; - "data-size" = dontDistribute super."data-size"; - "data-spacepart" = dontDistribute super."data-spacepart"; - "data-store" = dontDistribute super."data-store"; - "data-stringmap" = dontDistribute super."data-stringmap"; - "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; - "data-sword" = dontDistribute super."data-sword"; - "data-tensor" = dontDistribute super."data-tensor"; - "data-textual" = dontDistribute super."data-textual"; - "data-timeout" = dontDistribute super."data-timeout"; - "data-transform" = dontDistribute super."data-transform"; - "data-treify" = dontDistribute super."data-treify"; - "data-type" = dontDistribute super."data-type"; - "data-util" = dontDistribute super."data-util"; - "data-variant" = dontDistribute super."data-variant"; - "database-migrate" = dontDistribute super."database-migrate"; - "database-study" = dontDistribute super."database-study"; - "datadog" = dontDistribute super."datadog"; - "dataenc" = dontDistribute super."dataenc"; - "dataflow" = dontDistribute super."dataflow"; - "datalog" = dontDistribute super."datalog"; - "datapacker" = dontDistribute super."datapacker"; - "date-cache" = dontDistribute super."date-cache"; - "dates" = dontDistribute super."dates"; - "datetime" = dontDistribute super."datetime"; - "datetime-sb" = dontDistribute super."datetime-sb"; - "dawdle" = dontDistribute super."dawdle"; - "dawg" = dontDistribute super."dawg"; - "dbcleaner" = dontDistribute super."dbcleaner"; - "dbf" = dontDistribute super."dbf"; - "dbjava" = dontDistribute super."dbjava"; - "dbm" = dontDistribute super."dbm"; - "dbmigrations" = dontDistribute super."dbmigrations"; - "dbus-client" = dontDistribute super."dbus-client"; - "dbus-core" = dontDistribute super."dbus-core"; - "dbus-qq" = dontDistribute super."dbus-qq"; - "dbus-th" = dontDistribute super."dbus-th"; - "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; - "dclabel" = dontDistribute super."dclabel"; - "dclabel-eci11" = dontDistribute super."dclabel-eci11"; - "ddate" = dontDistribute super."ddate"; - "ddc-base" = dontDistribute super."ddc-base"; - "ddc-build" = dontDistribute super."ddc-build"; - "ddc-code" = dontDistribute super."ddc-code"; - "ddc-core" = dontDistribute super."ddc-core"; - "ddc-core-babel" = dontDistribute super."ddc-core-babel"; - "ddc-core-eval" = dontDistribute super."ddc-core-eval"; - "ddc-core-flow" = dontDistribute super."ddc-core-flow"; - "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; - "ddc-core-salt" = dontDistribute super."ddc-core-salt"; - "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; - "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; - "ddc-driver" = dontDistribute super."ddc-driver"; - "ddc-interface" = dontDistribute super."ddc-interface"; - "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; - "ddc-tools" = dontDistribute super."ddc-tools"; - "ddc-war" = dontDistribute super."ddc-war"; - "ddci-core" = dontDistribute super."ddci-core"; - "dead-code-detection" = dontDistribute super."dead-code-detection"; - "dead-simple-json" = dontDistribute super."dead-simple-json"; - "debian" = dontDistribute super."debian"; - "debian-binary" = dontDistribute super."debian-binary"; - "debug-diff" = dontDistribute super."debug-diff"; - "debug-time" = dontDistribute super."debug-time"; - "decepticons" = dontDistribute super."decepticons"; - "decimal-arithmetic" = dontDistribute super."decimal-arithmetic"; - "decode-utf8" = dontDistribute super."decode-utf8"; - "decoder-conduit" = dontDistribute super."decoder-conduit"; - "dedukti" = dontDistribute super."dedukti"; - "deepcontrol" = dontDistribute super."deepcontrol"; - "deeplearning-hs" = dontDistribute super."deeplearning-hs"; - "deepseq-bounded" = dontDistribute super."deepseq-bounded"; - "deepseq-magic" = dontDistribute super."deepseq-magic"; - "deepseq-th" = dontDistribute super."deepseq-th"; - "deepzoom" = dontDistribute super."deepzoom"; - "defargs" = dontDistribute super."defargs"; - "definitive-base" = dontDistribute super."definitive-base"; - "definitive-filesystem" = dontDistribute super."definitive-filesystem"; - "definitive-graphics" = dontDistribute super."definitive-graphics"; - "definitive-parser" = dontDistribute super."definitive-parser"; - "definitive-reactive" = dontDistribute super."definitive-reactive"; - "definitive-sound" = dontDistribute super."definitive-sound"; - "deiko-config" = dontDistribute super."deiko-config"; - "deka" = dontDistribute super."deka"; - "deka-tests" = dontDistribute super."deka-tests"; - "delaunay" = dontDistribute super."delaunay"; - "delay" = dontDistribute super."delay"; - "delicious" = dontDistribute super."delicious"; - "delimited-text" = dontDistribute super."delimited-text"; - "delimiter-separated" = dontDistribute super."delimiter-separated"; - "delta" = dontDistribute super."delta"; - "delta-h" = dontDistribute super."delta-h"; - "delude" = dontDistribute super."delude"; - "demarcate" = dontDistribute super."demarcate"; - "denominate" = dontDistribute super."denominate"; - "dense" = dontDistribute super."dense"; - "dependent-state" = dontDistribute super."dependent-state"; - "depends" = dontDistribute super."depends"; - "dephd" = dontDistribute super."dephd"; - "deque" = dontDistribute super."deque"; - "dequeue" = dontDistribute super."dequeue"; - "derangement" = dontDistribute super."derangement"; - "derivation-trees" = dontDistribute super."derivation-trees"; - "derive-IG" = dontDistribute super."derive-IG"; - "derive-enumerable" = dontDistribute super."derive-enumerable"; - "derive-gadt" = dontDistribute super."derive-gadt"; - "derive-monoid" = dontDistribute super."derive-monoid"; - "derive-storable" = dontDistribute super."derive-storable"; - "derive-storable-plugin" = dontDistribute super."derive-storable-plugin"; - "derive-topdown" = dontDistribute super."derive-topdown"; - "derive-trie" = dontDistribute super."derive-trie"; - "derp" = dontDistribute super."derp"; - "derp-lib" = dontDistribute super."derp-lib"; - "descrilo" = dontDistribute super."descrilo"; - "desert" = dontDistribute super."desert"; - "despair" = dontDistribute super."despair"; - "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; - "detrospector" = dontDistribute super."detrospector"; - "deunicode" = dontDistribute super."deunicode"; - "devil" = dontDistribute super."devil"; - "dewdrop" = dontDistribute super."dewdrop"; - "dfrac" = dontDistribute super."dfrac"; - "dfsbuild" = dontDistribute super."dfsbuild"; - "dgim" = dontDistribute super."dgim"; - "dgs" = dontDistribute super."dgs"; - "dia-base" = dontDistribute super."dia-base"; - "dia-functions" = dontDistribute super."dia-functions"; - "diagrams-boolean" = dontDistribute super."diagrams-boolean"; - "diagrams-builder" = dontDistribute super."diagrams-builder"; - "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; - "diagrams-haddock" = dontDistribute super."diagrams-haddock"; - "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; - "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; - "diagrams-pdf" = dontDistribute super."diagrams-pdf"; - "diagrams-pgf" = dontDistribute super."diagrams-pgf"; - "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; - "diagrams-reflex" = dontDistribute super."diagrams-reflex"; - "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; - "diagrams-tikz" = dontDistribute super."diagrams-tikz"; - "diagrams-wx" = dontDistribute super."diagrams-wx"; - "dialog" = dontDistribute super."dialog"; - "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; - "dicom" = dontDistribute super."dicom"; - "dictionary-sharing" = dontDistribute super."dictionary-sharing"; - "dictparser" = dontDistribute super."dictparser"; - "diet" = dontDistribute super."diet"; - "diff-gestalt" = dontDistribute super."diff-gestalt"; - "diff-parse" = dontDistribute super."diff-parse"; - "diffarray" = dontDistribute super."diffarray"; - "diffcabal" = dontDistribute super."diffcabal"; - "diffdump" = dontDistribute super."diffdump"; - "difftodo" = dontDistribute super."difftodo"; - "digamma" = dontDistribute super."digamma"; - "digest-pure" = dontDistribute super."digest-pure"; - "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; - "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; - "digestive-functors" = dontDistribute super."digestive-functors"; - "digestive-functors-aeson" = dontDistribute super."digestive-functors-aeson"; - "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; - "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; - "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; - "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; - "digestive-functors-lucid" = dontDistribute super."digestive-functors-lucid"; - "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; - "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; - "digit" = dontDistribute super."digit"; - "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; - "dimensional-codata" = dontDistribute super."dimensional-codata"; - "dimensional-tf" = dontDistribute super."dimensional-tf"; - "dingo-core" = dontDistribute super."dingo-core"; - "dingo-example" = dontDistribute super."dingo-example"; - "dingo-widgets" = dontDistribute super."dingo-widgets"; - "diophantine" = dontDistribute super."diophantine"; - "diplomacy" = dontDistribute super."diplomacy"; - "diplomacy-server" = dontDistribute super."diplomacy-server"; - "direct-binary-files" = dontDistribute super."direct-binary-files"; - "direct-daemonize" = dontDistribute super."direct-daemonize"; - "direct-fastcgi" = dontDistribute super."direct-fastcgi"; - "direct-http" = dontDistribute super."direct-http"; - "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; - "direct-plugins" = dontDistribute super."direct-plugins"; - "directed-cubical" = dontDistribute super."directed-cubical"; - "directory-layout" = dontDistribute super."directory-layout"; - "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser"; - "dirfiles" = dontDistribute super."dirfiles"; - "dirstream" = dontDistribute super."dirstream"; - "disassembler" = dontDistribute super."disassembler"; - "discogs-haskell" = dontDistribute super."discogs-haskell"; - "discordian-calendar" = dontDistribute super."discordian-calendar"; - "discrete-space-map" = dontDistribute super."discrete-space-map"; - "discrimination" = dontDistribute super."discrimination"; - "disjoint-set" = dontDistribute super."disjoint-set"; - "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; - "dist-upload" = dontDistribute super."dist-upload"; - "distributed-process" = dontDistribute super."distributed-process"; - "distributed-process-async" = dontDistribute super."distributed-process-async"; - "distributed-process-azure" = dontDistribute super."distributed-process-azure"; - "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; - "distributed-process-ekg" = dontDistribute super."distributed-process-ekg"; - "distributed-process-execution" = dontDistribute super."distributed-process-execution"; - "distributed-process-extras" = dontDistribute super."distributed-process-extras"; - "distributed-process-lifted" = dontDistribute super."distributed-process-lifted"; - "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; - "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; - "distributed-process-platform" = dontDistribute super."distributed-process-platform"; - "distributed-process-registry" = dontDistribute super."distributed-process-registry"; - "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; - "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; - "distributed-process-task" = dontDistribute super."distributed-process-task"; - "distributed-process-tests" = dontDistribute super."distributed-process-tests"; - "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; - "distribution" = dontDistribute super."distribution"; - "distribution-plot" = dontDistribute super."distribution-plot"; - "dixi" = dontDistribute super."dixi"; - "djembe" = dontDistribute super."djembe"; - "djinn" = dontDistribute super."djinn"; - "djinn-th" = dontDistribute super."djinn-th"; - "dnscache" = dontDistribute super."dnscache"; - "dnsrbl" = dontDistribute super."dnsrbl"; - "dnssd" = dontDistribute super."dnssd"; - "doc-review" = dontDistribute super."doc-review"; - "doccheck" = dontDistribute super."doccheck"; - "docidx" = dontDistribute super."docidx"; - "docker" = dontDistribute super."docker"; - "dockercook" = dontDistribute super."dockercook"; - "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; - "dom-lt" = dontDistribute super."dom-lt"; - "dom-parser" = dontDistribute super."dom-parser"; - "dom-selector" = dontDistribute super."dom-selector"; - "domain-auth" = dontDistribute super."domain-auth"; - "dominion" = dontDistribute super."dominion"; - "domplate" = dontDistribute super."domplate"; - "dot" = dontDistribute super."dot"; - "dot-linker" = dontDistribute super."dot-linker"; - "dot2graphml" = dontDistribute super."dot2graphml"; - "dotfs" = dontDistribute super."dotfs"; - "dotgen" = dontDistribute super."dotgen"; - "double-metaphone" = dontDistribute super."double-metaphone"; - "dove" = dontDistribute super."dove"; - "dow" = dontDistribute super."dow"; - "download-curl" = dontDistribute super."download-curl"; - "download-media-content" = dontDistribute super."download-media-content"; - "dozenal" = dontDistribute super."dozenal"; - "dozens" = dontDistribute super."dozens"; - "dph-base" = dontDistribute super."dph-base"; - "dph-examples" = dontDistribute super."dph-examples"; - "dph-lifted-base" = dontDistribute super."dph-lifted-base"; - "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; - "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; - "dph-par" = dontDistribute super."dph-par"; - "dph-prim-interface" = dontDistribute super."dph-prim-interface"; - "dph-prim-par" = dontDistribute super."dph-prim-par"; - "dph-prim-seq" = dontDistribute super."dph-prim-seq"; - "dph-seq" = dontDistribute super."dph-seq"; - "dpkg" = dontDistribute super."dpkg"; - "drClickOn" = dontDistribute super."drClickOn"; - "draw-poker" = dontDistribute super."draw-poker"; - "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe"; - "drmaa" = dontDistribute super."drmaa"; - "dropbox-sdk" = dontDistribute super."dropbox-sdk"; - "dropsolve" = dontDistribute super."dropsolve"; - "ds-kanren" = dontDistribute super."ds-kanren"; - "dsh-sql" = dontDistribute super."dsh-sql"; - "dsmc" = dontDistribute super."dsmc"; - "dsmc-tools" = dontDistribute super."dsmc-tools"; - "dson" = dontDistribute super."dson"; - "dson-parsec" = dontDistribute super."dson-parsec"; - "dsp" = dontDistribute super."dsp"; - "dstring" = dontDistribute super."dstring"; - "dtab" = dontDistribute super."dtab"; - "dtd" = dontDistribute super."dtd"; - "dtd-text" = dontDistribute super."dtd-text"; - "dtd-types" = dontDistribute super."dtd-types"; - "dtrace" = dontDistribute super."dtrace"; - "dtw" = dontDistribute super."dtw"; - "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"; - "dvorak" = dontDistribute super."dvorak"; - "dwarf" = dontDistribute super."dwarf"; - "dwarf-el" = dontDistribute super."dwarf-el"; - "dwarfadt" = dontDistribute super."dwarfadt"; - "dx9base" = dontDistribute super."dx9base"; - "dx9d3d" = dontDistribute super."dx9d3d"; - "dx9d3dx" = dontDistribute super."dx9d3dx"; - "dynamic-cabal" = dontDistribute super."dynamic-cabal"; - "dynamic-graph" = dontDistribute super."dynamic-graph"; - "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; - "dynamic-loader" = dontDistribute super."dynamic-loader"; - "dynamic-mvector" = dontDistribute super."dynamic-mvector"; - "dynamic-object" = dontDistribute super."dynamic-object"; - "dynamic-plot" = dontDistribute super."dynamic-plot"; - "dynamic-pp" = dontDistribute super."dynamic-pp"; - "dynobud" = dontDistribute super."dynobud"; - "dywapitchtrack" = dontDistribute super."dywapitchtrack"; - "dzen-utils" = dontDistribute super."dzen-utils"; - "eager-sockets" = dontDistribute super."eager-sockets"; - "easy-api" = dontDistribute super."easy-api"; - "easy-bitcoin" = dontDistribute super."easy-bitcoin"; - "easyjson" = dontDistribute super."easyjson"; - "easyplot" = dontDistribute super."easyplot"; - "easyrender" = dontDistribute super."easyrender"; - "ebeats" = dontDistribute super."ebeats"; - "ebnf-bff" = dontDistribute super."ebnf-bff"; - "ec2-signature" = dontDistribute super."ec2-signature"; - "ec2-unikernel" = dontDistribute super."ec2-unikernel"; - "eccrypto" = dontDistribute super."eccrypto"; - "ecdsa" = dontDistribute super."ecdsa"; - "ecma262" = dontDistribute super."ecma262"; - "ecu" = dontDistribute super."ecu"; - "ed25519-donna" = dontDistribute super."ed25519-donna"; - "eddie" = dontDistribute super."eddie"; - "edenmodules" = dontDistribute super."edenmodules"; - "edenskel" = dontDistribute super."edenskel"; - "edentv" = dontDistribute super."edentv"; - "edge" = dontDistribute super."edge"; - "edis" = dontDistribute super."edis"; - "edit-distance-vector" = dontDistribute super."edit-distance-vector"; - "edit-lenses" = dontDistribute super."edit-lenses"; - "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; - "editable" = dontDistribute super."editable"; - "editline" = dontDistribute super."editline"; - "editpipe" = dontDistribute super."editpipe"; - "effect-monad" = dontDistribute super."effect-monad"; - "effective-aspects" = dontDistribute super."effective-aspects"; - "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; - "effects" = dontDistribute super."effects"; - "effects-parser" = dontDistribute super."effects-parser"; - "effin" = dontDistribute super."effin"; - "egison" = dontDistribute super."egison"; - "egison-quote" = dontDistribute super."egison-quote"; - "egison-tutorial" = dontDistribute super."egison-tutorial"; - "ehaskell" = dontDistribute super."ehaskell"; - "ehs" = dontDistribute super."ehs"; - "eibd-client-simple" = dontDistribute super."eibd-client-simple"; - "eigen" = dontDistribute super."eigen"; - "eithers" = dontDistribute super."eithers"; - "ekg-bosun" = dontDistribute super."ekg-bosun"; - "ekg-carbon" = dontDistribute super."ekg-carbon"; - "ekg-log" = dontDistribute super."ekg-log"; - "ekg-push" = dontDistribute super."ekg-push"; - "ekg-rrd" = dontDistribute super."ekg-rrd"; - "ekg-statsd" = dontDistribute super."ekg-statsd"; - "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; - "elerea-examples" = dontDistribute super."elerea-examples"; - "elerea-sdl" = dontDistribute super."elerea-sdl"; - "elevator" = dontDistribute super."elevator"; - "elf" = dontDistribute super."elf"; - "elision" = dontDistribute super."elision"; - "elm-build-lib" = dontDistribute super."elm-build-lib"; - "elm-compiler" = dontDistribute super."elm-compiler"; - "elm-export" = dontDistribute super."elm-export"; - "elm-get" = dontDistribute super."elm-get"; - "elm-hybrid" = dontDistribute super."elm-hybrid"; - "elm-init" = dontDistribute super."elm-init"; - "elm-make" = dontDistribute super."elm-make"; - "elm-package" = dontDistribute super."elm-package"; - "elm-reactor" = dontDistribute super."elm-reactor"; - "elm-repl" = dontDistribute super."elm-repl"; - "elm-server" = dontDistribute super."elm-server"; - "elm-yesod" = dontDistribute super."elm-yesod"; - "elo" = dontDistribute super."elo"; - "elocrypt" = dontDistribute super."elocrypt"; - "emacs-keys" = dontDistribute super."emacs-keys"; - "email" = dontDistribute super."email"; - "email-header" = dontDistribute super."email-header"; - "email-postmark" = dontDistribute super."email-postmark"; - "email-validate-json" = dontDistribute super."email-validate-json"; - "email-validator" = dontDistribute super."email-validator"; - "emailparse" = dontDistribute super."emailparse"; - "embeddock" = dontDistribute super."embeddock"; - "embeddock-example" = dontDistribute super."embeddock-example"; - "embroidery" = dontDistribute super."embroidery"; - "emgm" = dontDistribute super."emgm"; - "empty" = dontDistribute super."empty"; - "enchant" = dontDistribute super."enchant"; - "encoding" = dontDistribute super."encoding"; - "endo" = dontDistribute super."endo"; - "engine-io" = dontDistribute super."engine-io"; - "engine-io-growler" = dontDistribute super."engine-io-growler"; - "engine-io-snap" = dontDistribute super."engine-io-snap"; - "engine-io-wai" = dontDistribute super."engine-io-wai"; - "engine-io-yesod" = dontDistribute super."engine-io-yesod"; - "engineering-units" = dontDistribute super."engineering-units"; - "enumerable" = dontDistribute super."enumerable"; - "enumerate" = dontDistribute super."enumerate"; - "enumeration" = dontDistribute super."enumeration"; - "enumerator" = dontDistribute super."enumerator"; - "enumerator-fd" = dontDistribute super."enumerator-fd"; - "enumerator-tf" = dontDistribute super."enumerator-tf"; - "enumfun" = dontDistribute super."enumfun"; - "enummapmap" = dontDistribute super."enummapmap"; - "enummapset" = dontDistribute super."enummapset"; - "enumset" = dontDistribute super."enumset"; - "env-locale" = dontDistribute super."env-locale"; - "env-parser" = dontDistribute super."env-parser"; - "envparse" = dontDistribute super."envparse"; - "envy" = dontDistribute super."envy"; - "epanet-haskell" = dontDistribute super."epanet-haskell"; - "epass" = dontDistribute super."epass"; - "epic" = dontDistribute super."epic"; - "epoll" = dontDistribute super."epoll"; - "eprocess" = dontDistribute super."eprocess"; - "epub" = dontDistribute super."epub"; - "epub-metadata" = dontDistribute super."epub-metadata"; - "epub-tools" = dontDistribute super."epub-tools"; - "epubname" = dontDistribute super."epubname"; - "equal-files" = dontDistribute super."equal-files"; - "equational-reasoning" = dontDistribute super."equational-reasoning"; - "erd" = dontDistribute super."erd"; - "erf-native" = dontDistribute super."erf-native"; - "erlang" = dontDistribute super."erlang"; - "eros" = dontDistribute super."eros"; - "eros-client" = dontDistribute super."eros-client"; - "eros-http" = dontDistribute super."eros-http"; - "errno" = dontDistribute super."errno"; - "error-analyze" = dontDistribute super."error-analyze"; - "error-continuations" = dontDistribute super."error-continuations"; - "error-list" = dontDistribute super."error-list"; - "error-loc" = dontDistribute super."error-loc"; - "error-location" = dontDistribute super."error-location"; - "error-message" = dontDistribute super."error-message"; - "error-util" = dontDistribute super."error-util"; - "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; - "ersatz-toysat" = dontDistribute super."ersatz-toysat"; - "ert" = dontDistribute super."ert"; - "esotericbot" = dontDistribute super."esotericbot"; - "esqueleto" = dontDistribute super."esqueleto"; - "ess" = dontDistribute super."ess"; - "estimator" = dontDistribute super."estimator"; - "estimators" = dontDistribute super."estimators"; - "estreps" = dontDistribute super."estreps"; - "eternal" = dontDistribute super."eternal"; - "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; - "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; - "ethereum-rlp" = dontDistribute super."ethereum-rlp"; - "ety" = dontDistribute super."ety"; - "euler" = dontDistribute super."euler"; - "eurofxref" = dontDistribute super."eurofxref"; - "event-driven" = dontDistribute super."event-driven"; - "event-handlers" = dontDistribute super."event-handlers"; - "event-list" = dontDistribute super."event-list"; - "event-monad" = dontDistribute super."event-monad"; - "eventloop" = dontDistribute super."eventloop"; - "eventsourced" = dontDistribute super."eventsourced"; - "every-bit-counts" = dontDistribute super."every-bit-counts"; - "ewe" = dontDistribute super."ewe"; - "ex-pool" = dontDistribute super."ex-pool"; - "exact-real" = dontDistribute super."exact-real"; - "exception-hierarchy" = dontDistribute super."exception-hierarchy"; - "exception-mailer" = dontDistribute super."exception-mailer"; - "exception-monads-fd" = dontDistribute super."exception-monads-fd"; - "exception-monads-tf" = dontDistribute super."exception-monads-tf"; - "execs" = dontDistribute super."execs"; - "exhaustive" = dontDistribute super."exhaustive"; - "exherbo-cabal" = dontDistribute super."exherbo-cabal"; - "exif" = dontDistribute super."exif"; - "exinst" = dontDistribute super."exinst"; - "exinst-aeson" = dontDistribute super."exinst-aeson"; - "exinst-bytes" = dontDistribute super."exinst-bytes"; - "exinst-deepseq" = dontDistribute super."exinst-deepseq"; - "exinst-hashable" = dontDistribute super."exinst-hashable"; - "existential" = dontDistribute super."existential"; - "exists" = dontDistribute super."exists"; - "exit-codes" = dontDistribute super."exit-codes"; - "exp-extended" = dontDistribute super."exp-extended"; - "expand" = dontDistribute super."expand"; - "expat-enumerator" = dontDistribute super."expat-enumerator"; - "expiring-mvar" = dontDistribute super."expiring-mvar"; - "explain" = dontDistribute super."explain"; - "explicit-determinant" = dontDistribute super."explicit-determinant"; - "explicit-iomodes" = dontDistribute super."explicit-iomodes"; - "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; - "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; - "explicit-sharing" = dontDistribute super."explicit-sharing"; - "explore" = dontDistribute super."explore"; - "exposed-containers" = dontDistribute super."exposed-containers"; - "expression-parser" = dontDistribute super."expression-parser"; - "extcore" = dontDistribute super."extcore"; - "extemp" = dontDistribute super."extemp"; - "extended-categories" = dontDistribute super."extended-categories"; - "extended-reals" = dontDistribute super."extended-reals"; - "extensible-data" = dontDistribute super."extensible-data"; - "external-sort" = dontDistribute super."external-sort"; - "extractelf" = dontDistribute super."extractelf"; - "ez-couch" = dontDistribute super."ez-couch"; - "faceted" = dontDistribute super."faceted"; - "factory" = dontDistribute super."factory"; - "factual-api" = dontDistribute super."factual-api"; - "fad" = dontDistribute super."fad"; - "fadno-braids" = dontDistribute super."fadno-braids"; - "failable-list" = dontDistribute super."failable-list"; - "failure" = dontDistribute super."failure"; - "failure-detector" = dontDistribute super."failure-detector"; - "fair-predicates" = dontDistribute super."fair-predicates"; - "fake-type" = dontDistribute super."fake-type"; - "faker" = dontDistribute super."faker"; - "falling-turnip" = dontDistribute super."falling-turnip"; - "fallingblocks" = dontDistribute super."fallingblocks"; - "family-tree" = dontDistribute super."family-tree"; - "fast-math" = dontDistribute super."fast-math"; - "fast-tags" = dontDistribute super."fast-tags"; - "fast-tagsoup" = dontDistribute super."fast-tagsoup"; - "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; - "fastbayes" = dontDistribute super."fastbayes"; - "fastcgi" = dontDistribute super."fastcgi"; - "fastedit" = dontDistribute super."fastedit"; - "fastirc" = dontDistribute super."fastirc"; - "fathead-util" = dontDistribute super."fathead-util"; - "fault-tree" = dontDistribute super."fault-tree"; - "fay-geoposition" = dontDistribute super."fay-geoposition"; - "fay-hsx" = dontDistribute super."fay-hsx"; - "fay-ref" = dontDistribute super."fay-ref"; - "fb-persistent" = dontDistribute super."fb-persistent"; - "fbmessenger-api" = dontDistribute super."fbmessenger-api"; - "fca" = dontDistribute super."fca"; - "fcache" = dontDistribute super."fcache"; - "fcd" = dontDistribute super."fcd"; - "fckeditor" = dontDistribute super."fckeditor"; - "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; - "fdo-notify" = dontDistribute super."fdo-notify"; - "fdo-trash" = dontDistribute super."fdo-trash"; - "fec" = dontDistribute super."fec"; - "fedora-packages" = dontDistribute super."fedora-packages"; - "feed-cli" = dontDistribute super."feed-cli"; - "feed-collect" = dontDistribute super."feed-collect"; - "feed-crawl" = dontDistribute super."feed-crawl"; - "feed-gipeda" = dontDistribute super."feed-gipeda"; - "feed-translator" = dontDistribute super."feed-translator"; - "feed2lj" = dontDistribute super."feed2lj"; - "feed2twitter" = dontDistribute super."feed2twitter"; - "feldspar-compiler" = dontDistribute super."feldspar-compiler"; - "feldspar-language" = dontDistribute super."feldspar-language"; - "feldspar-signal" = dontDistribute super."feldspar-signal"; - "fen2s" = dontDistribute super."fen2s"; - "fences" = dontDistribute super."fences"; - "fenfire" = dontDistribute super."fenfire"; - "fez-conf" = dontDistribute super."fez-conf"; - "ffeed" = dontDistribute super."ffeed"; - "fficxx" = dontDistribute super."fficxx"; - "fficxx-runtime" = dontDistribute super."fficxx-runtime"; - "ffmpeg-light" = dontDistribute super."ffmpeg-light"; - "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; - "fftwRaw" = dontDistribute super."fftwRaw"; - "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; - "fgl-visualize" = dontDistribute super."fgl-visualize"; - "fibon" = dontDistribute super."fibon"; - "fibonacci" = dontDistribute super."fibonacci"; - "fields" = dontDistribute super."fields"; - "fields-json" = dontDistribute super."fields-json"; - "fieldwise" = dontDistribute super."fieldwise"; - "fig" = dontDistribute super."fig"; - "file-collection" = dontDistribute super."file-collection"; - "file-command-qq" = dontDistribute super."file-command-qq"; - "file-embed-poly" = dontDistribute super."file-embed-poly"; - "file-location" = dontDistribute super."file-location"; - "filediff" = dontDistribute super."filediff"; - "filepath-io-access" = dontDistribute super."filepath-io-access"; - "filepather" = dontDistribute super."filepather"; - "filestore" = dontDistribute super."filestore"; - "filesystem-conduit" = dontDistribute super."filesystem-conduit"; - "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; - "filesystem-trees" = dontDistribute super."filesystem-trees"; - "filtrable" = dontDistribute super."filtrable"; - "final" = dontDistribute super."final"; - "find-conduit" = dontDistribute super."find-conduit"; - "fingertree-tf" = dontDistribute super."fingertree-tf"; - "finite-field" = dontDistribute super."finite-field"; - "finite-typelits" = dontDistribute super."finite-typelits"; - "first-and-last" = dontDistribute super."first-and-last"; - "first-class-patterns" = dontDistribute super."first-class-patterns"; - "firstify" = dontDistribute super."firstify"; - "fishfood" = dontDistribute super."fishfood"; - "fit" = dontDistribute super."fit"; - "fitsio" = dontDistribute super."fitsio"; - "fitspec" = dontDistribute super."fitspec"; - "fix-imports" = dontDistribute super."fix-imports"; - "fix-parser-simple" = dontDistribute super."fix-parser-simple"; - "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; - "fixed-length" = dontDistribute super."fixed-length"; - "fixed-list" = dontDistribute super."fixed-list"; - "fixed-point" = dontDistribute super."fixed-point"; - "fixed-point-vector" = dontDistribute super."fixed-point-vector"; - "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; - "fixed-precision" = dontDistribute super."fixed-precision"; - "fixed-storable-array" = dontDistribute super."fixed-storable-array"; - "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; - "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; - "fixedprec" = dontDistribute super."fixedprec"; - "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; - "fixfile" = dontDistribute super."fixfile"; - "fixhs" = dontDistribute super."fixhs"; - "fixplate" = dontDistribute super."fixplate"; - "fixpoint" = dontDistribute super."fixpoint"; - "fixtime" = dontDistribute super."fixtime"; - "fizz-buzz" = dontDistribute super."fizz-buzz"; - "fizzbuzz" = dontDistribute super."fizzbuzz"; - "flaccuraterip" = dontDistribute super."flaccuraterip"; - "flamethrower" = dontDistribute super."flamethrower"; - "flamingra" = dontDistribute super."flamingra"; - "flat-maybe" = dontDistribute super."flat-maybe"; - "flat-tex" = dontDistribute super."flat-tex"; - "flexible-time" = dontDistribute super."flexible-time"; - "flexible-unlit" = dontDistribute super."flexible-unlit"; - "flexiwrap" = dontDistribute super."flexiwrap"; - "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; - "flickr" = dontDistribute super."flickr"; - "flippers" = dontDistribute super."flippers"; - "flite" = dontDistribute super."flite"; - "flo" = dontDistribute super."flo"; - "float-binstring" = dontDistribute super."float-binstring"; - "floating-bits" = dontDistribute super."floating-bits"; - "floatshow" = dontDistribute super."floatshow"; - "flow-er" = dontDistribute super."flow-er"; - "flow2dot" = dontDistribute super."flow2dot"; - "flowdock" = dontDistribute super."flowdock"; - "flowdock-api" = dontDistribute super."flowdock-api"; - "flowdock-rest" = dontDistribute super."flowdock-rest"; - "flower" = dontDistribute super."flower"; - "flowlocks-framework" = dontDistribute super."flowlocks-framework"; - "flowsim" = dontDistribute super."flowsim"; - "fltkhs" = dontDistribute super."fltkhs"; - "fltkhs-demos" = dontDistribute super."fltkhs-demos"; - "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos"; - "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; - "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; - "fluent-logger" = dontDistribute super."fluent-logger"; - "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; - "fluidsynth" = dontDistribute super."fluidsynth"; - "fmark" = dontDistribute super."fmark"; - "fn-extra" = dontDistribute super."fn-extra"; - "foldl-incremental" = dontDistribute super."foldl-incremental"; - "foldl-statistics" = dontDistribute super."foldl-statistics"; - "foldl-transduce" = dontDistribute super."foldl-transduce"; - "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; - "folds" = dontDistribute super."folds"; - "folds-common" = dontDistribute super."folds-common"; - "follower" = dontDistribute super."follower"; - "foma" = dontDistribute super."foma"; - "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; - "foo" = dontDistribute super."foo"; - "foobar" = dontDistribute super."foobar"; - "for-free" = dontDistribute super."for-free"; - "forbidden-fruit" = dontDistribute super."forbidden-fruit"; - "fordo" = dontDistribute super."fordo"; - "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; - "foreign-var" = dontDistribute super."foreign-var"; - "forger" = dontDistribute super."forger"; - "forkable-monad" = dontDistribute super."forkable-monad"; - "formal" = dontDistribute super."formal"; - "format" = dontDistribute super."format"; - "format-status" = dontDistribute super."format-status"; - "formattable" = dontDistribute super."formattable"; - "forml" = dontDistribute super."forml"; - "formlets" = dontDistribute super."formlets"; - "formlets-hsp" = dontDistribute super."formlets-hsp"; - "formura" = dontDistribute super."formura"; - "forth-hll" = dontDistribute super."forth-hll"; - "foscam-directory" = dontDistribute super."foscam-directory"; - "foscam-filename" = dontDistribute super."foscam-filename"; - "foscam-sort" = dontDistribute super."foscam-sort"; - "foundation" = dontDistribute super."foundation"; - "foundation-edge" = dontDistribute super."foundation-edge"; - "fountain" = dontDistribute super."fountain"; - "fpco-api" = dontDistribute super."fpco-api"; - "fpipe" = dontDistribute super."fpipe"; - "fpnla" = dontDistribute super."fpnla"; - "fpnla-examples" = dontDistribute super."fpnla-examples"; - "fptest" = dontDistribute super."fptest"; - "fquery" = dontDistribute super."fquery"; - "fractal" = dontDistribute super."fractal"; - "fractals" = dontDistribute super."fractals"; - "fraction" = dontDistribute super."fraction"; - "frag" = dontDistribute super."frag"; - "frame" = dontDistribute super."frame"; - "frame-markdown" = dontDistribute super."frame-markdown"; - "franchise" = dontDistribute super."franchise"; - "fraxl" = dontDistribute super."fraxl"; - "freddy" = dontDistribute super."freddy"; - "free-concurrent" = dontDistribute super."free-concurrent"; - "free-functors" = dontDistribute super."free-functors"; - "free-game" = dontDistribute super."free-game"; - "free-http" = dontDistribute super."free-http"; - "free-operational" = dontDistribute super."free-operational"; - "free-theorems" = dontDistribute super."free-theorems"; - "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; - "free-theorems-seq" = dontDistribute super."free-theorems-seq"; - "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; - "free-theorems-webui" = dontDistribute super."free-theorems-webui"; - "free-vector-spaces" = dontDistribute super."free-vector-spaces"; - "freekick2" = dontDistribute super."freekick2"; - "freesect" = dontDistribute super."freesect"; - "freesound" = dontDistribute super."freesound"; - "freetype-simple" = dontDistribute super."freetype-simple"; - "freetype2" = dontDistribute super."freetype2"; - "fresco-binding" = dontDistribute super."fresco-binding"; - "fresh" = dontDistribute super."fresh"; - "friday" = dontDistribute super."friday"; - "friday-devil" = dontDistribute super."friday-devil"; - "friday-juicypixels" = dontDistribute super."friday-juicypixels"; - "friday-scale-dct" = dontDistribute super."friday-scale-dct"; - "frown" = dontDistribute super."frown"; - "frp-arduino" = dontDistribute super."frp-arduino"; - "frpnow" = dontDistribute super."frpnow"; - "frpnow-gloss" = dontDistribute super."frpnow-gloss"; - "frpnow-gtk" = dontDistribute super."frpnow-gtk"; - "frquotes" = dontDistribute super."frquotes"; - "fs-events" = dontDistribute super."fs-events"; - "fsharp" = dontDistribute super."fsharp"; - "fsmActions" = dontDistribute super."fsmActions"; - "fst" = dontDistribute super."fst"; - "fsutils" = dontDistribute super."fsutils"; - "fswatcher" = dontDistribute super."fswatcher"; - "ftdi" = dontDistribute super."ftdi"; - "ftp-conduit" = dontDistribute super."ftp-conduit"; - "ftphs" = dontDistribute super."ftphs"; - "ftree" = dontDistribute super."ftree"; - "ftshell" = dontDistribute super."ftshell"; - "fugue" = dontDistribute super."fugue"; - "full-sessions" = dontDistribute super."full-sessions"; - "full-text-search" = dontDistribute super."full-text-search"; - "fullstop" = dontDistribute super."fullstop"; - "funbot" = dontDistribute super."funbot"; - "funbot-client" = dontDistribute super."funbot-client"; - "funbot-ext-events" = dontDistribute super."funbot-ext-events"; - "funbot-git-hook" = dontDistribute super."funbot-git-hook"; - "funcons-tools" = dontDistribute super."funcons-tools"; - "function-combine" = dontDistribute super."function-combine"; - "function-instances-algebra" = dontDistribute super."function-instances-algebra"; - "functional-arrow" = dontDistribute super."functional-arrow"; - "functional-kmp" = dontDistribute super."functional-kmp"; - "functor-apply" = dontDistribute super."functor-apply"; - "functor-combo" = dontDistribute super."functor-combo"; - "functor-infix" = dontDistribute super."functor-infix"; - "functor-monadic" = dontDistribute super."functor-monadic"; - "functor-utils" = dontDistribute super."functor-utils"; - "functorm" = dontDistribute super."functorm"; - "functors" = dontDistribute super."functors"; - "funion" = dontDistribute super."funion"; - "funnyprint" = dontDistribute super."funnyprint"; - "funpat" = dontDistribute super."funpat"; - "funsat" = dontDistribute super."funsat"; - "fusion" = dontDistribute super."fusion"; - "futun" = dontDistribute super."futun"; - "future" = dontDistribute super."future"; - "future-resource" = dontDistribute super."future-resource"; - "fuzzy" = dontDistribute super."fuzzy"; - "fuzzy-timings" = dontDistribute super."fuzzy-timings"; - "fuzzytime" = dontDistribute super."fuzzytime"; - "fwgl" = dontDistribute super."fwgl"; - "fwgl-glfw" = dontDistribute super."fwgl-glfw"; - "fwgl-javascript" = dontDistribute super."fwgl-javascript"; - "g-npm" = dontDistribute super."g-npm"; - "gact" = dontDistribute super."gact"; - "game-of-life" = dontDistribute super."game-of-life"; - "game-probability" = dontDistribute super."game-probability"; - "game-tree" = dontDistribute super."game-tree"; - "gameclock" = dontDistribute super."gameclock"; - "gang-of-threads" = dontDistribute super."gang-of-threads"; - "garepinoh" = dontDistribute super."garepinoh"; - "garsia-wachs" = dontDistribute super."garsia-wachs"; - "gasp" = dontDistribute super."gasp"; - "gbu" = dontDistribute super."gbu"; - "gc" = dontDistribute super."gc"; - "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; - "gcodehs" = dontDistribute super."gcodehs"; - "gconf" = dontDistribute super."gconf"; - "gdiff" = dontDistribute super."gdiff"; - "gdiff-ig" = dontDistribute super."gdiff-ig"; - "gdiff-th" = dontDistribute super."gdiff-th"; - "gdo" = dontDistribute super."gdo"; - "gearbox" = dontDistribute super."gearbox"; - "geek" = dontDistribute super."geek"; - "geek-server" = dontDistribute super."geek-server"; - "gelatin" = dontDistribute super."gelatin"; - "gemstone" = dontDistribute super."gemstone"; - "gencheck" = dontDistribute super."gencheck"; - "gender" = dontDistribute super."gender"; - "genders" = dontDistribute super."genders"; - "general-prelude" = dontDistribute super."general-prelude"; - "generator" = dontDistribute super."generator"; - "generators" = dontDistribute super."generators"; - "generic-accessors" = dontDistribute super."generic-accessors"; - "generic-binary" = dontDistribute super."generic-binary"; - "generic-church" = dontDistribute super."generic-church"; - "generic-deepseq" = dontDistribute super."generic-deepseq"; - "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; - "generic-maybe" = dontDistribute super."generic-maybe"; - "generic-pretty" = dontDistribute super."generic-pretty"; - "generic-random" = dontDistribute super."generic-random"; - "generic-records" = dontDistribute super."generic-records"; - "generic-server" = dontDistribute super."generic-server"; - "generic-storable" = dontDistribute super."generic-storable"; - "generic-tree" = dontDistribute super."generic-tree"; - "generic-trie" = dontDistribute super."generic-trie"; - "generic-xml" = dontDistribute super."generic-xml"; - "genericserialize" = dontDistribute super."genericserialize"; - "genetics" = dontDistribute super."genetics"; - "geni-gui" = dontDistribute super."geni-gui"; - "geni-util" = dontDistribute super."geni-util"; - "geniconvert" = dontDistribute super."geniconvert"; - "genifunctors" = dontDistribute super."genifunctors"; - "geniplate" = dontDistribute super."geniplate"; - "geniserver" = dontDistribute super."geniserver"; - "genprog" = dontDistribute super."genprog"; - "gentlemark" = dontDistribute super."gentlemark"; - "genvalidity" = dontDistribute super."genvalidity"; - "genvalidity-containers" = dontDistribute super."genvalidity-containers"; - "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; - "genvalidity-text" = dontDistribute super."genvalidity-text"; - "geo-resolver" = dontDistribute super."geo-resolver"; - "geo-uk" = dontDistribute super."geo-uk"; - "geocalc" = dontDistribute super."geocalc"; - "geocode-google" = dontDistribute super."geocode-google"; - "geodetic" = dontDistribute super."geodetic"; - "geodetics" = dontDistribute super."geodetics"; - "geohash" = dontDistribute super."geohash"; - "geoip2" = dontDistribute super."geoip2"; - "geojson" = dontDistribute super."geojson"; - "geojson-types" = dontDistribute super."geojson-types"; - "geolite-csv" = dontDistribute super."geolite-csv"; - "geom2d" = dontDistribute super."geom2d"; - "getemx" = dontDistribute super."getemx"; - "getflag" = dontDistribute super."getflag"; - "getopt-simple" = dontDistribute super."getopt-simple"; - "gf" = dontDistribute super."gf"; - "ggtsTC" = dontDistribute super."ggtsTC"; - "ghc-core" = dontDistribute super."ghc-core"; - "ghc-core-html" = dontDistribute super."ghc-core-html"; - "ghc-datasize" = dontDistribute super."ghc-datasize"; - "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; - "ghc-dup" = dontDistribute super."ghc-dup"; - "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; - "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; - "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; - "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; - "ghc-imported-from" = dontDistribute super."ghc-imported-from"; - "ghc-make" = dontDistribute super."ghc-make"; - "ghc-man-completion" = dontDistribute super."ghc-man-completion"; - "ghc-mtl" = dontDistribute super."ghc-mtl"; - "ghc-options" = dontDistribute super."ghc-options"; - "ghc-parmake" = dontDistribute super."ghc-parmake"; - "ghc-parser" = dontDistribute super."ghc-parser"; - "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; - "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; - "ghc-prof" = dontDistribute super."ghc-prof"; - "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; - "ghc-server" = dontDistribute super."ghc-server"; - "ghc-session" = dontDistribute super."ghc-session"; - "ghc-simple" = dontDistribute super."ghc-simple"; - "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; - "ghc-syb" = dontDistribute super."ghc-syb"; - "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; - "ghc-typelits-presburger" = dontDistribute super."ghc-typelits-presburger"; - "ghc-vis" = dontDistribute super."ghc-vis"; - "ghci-diagrams" = dontDistribute super."ghci-diagrams"; - "ghci-haskeline" = dontDistribute super."ghci-haskeline"; - "ghci-history-parser" = dontDistribute super."ghci-history-parser"; - "ghci-lib" = dontDistribute super."ghci-lib"; - "ghci-ng" = dontDistribute super."ghci-ng"; - "ghci-pretty" = dontDistribute super."ghci-pretty"; - "ghcjs-ajax" = dontDistribute super."ghcjs-ajax"; - "ghcjs-dom" = dontDistribute super."ghcjs-dom"; - "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; - "ghcjs-dom-jsaddle" = dontDistribute super."ghcjs-dom-jsaddle"; - "ghcjs-dom-jsffi" = dontDistribute super."ghcjs-dom-jsffi"; - "ghcjs-dom-webkit" = dontDistribute super."ghcjs-dom-webkit"; - "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; - "ghclive" = dontDistribute super."ghclive"; - "ghczdecode" = dontDistribute super."ghczdecode"; - "ght" = dontDistribute super."ght"; - "gi-girepository" = dontDistribute super."gi-girepository"; - "gi-gst" = dontDistribute super."gi-gst"; - "gi-gstaudio" = dontDistribute super."gi-gstaudio"; - "gi-gstbase" = dontDistribute super."gi-gstbase"; - "gi-gstvideo" = dontDistribute super."gi-gstvideo"; - "gi-gtk-hs" = dontDistribute super."gi-gtk-hs"; - "gi-gtkosxapplication" = dontDistribute super."gi-gtkosxapplication"; - "gi-gtksource" = dontDistribute super."gi-gtksource"; - "gi-notify" = dontDistribute super."gi-notify"; - "gi-pangocairo" = dontDistribute super."gi-pangocairo"; - "gi-poppler" = dontDistribute super."gi-poppler"; - "gi-vte" = dontDistribute super."gi-vte"; - "gi-webkit2" = dontDistribute super."gi-webkit2"; - "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension"; - "giak" = dontDistribute super."giak"; - "gimlh" = dontDistribute super."gimlh"; - "ginger" = dontDistribute super."ginger"; - "ginsu" = dontDistribute super."ginsu"; - "gist" = dontDistribute super."gist"; - "git" = dontDistribute super."git"; - "git-all" = dontDistribute super."git-all"; - "git-annex" = dontDistribute super."git-annex"; - "git-checklist" = dontDistribute super."git-checklist"; - "git-date" = dontDistribute super."git-date"; - "git-embed" = dontDistribute super."git-embed"; - "git-freq" = dontDistribute super."git-freq"; - "git-gpush" = dontDistribute super."git-gpush"; - "git-jump" = dontDistribute super."git-jump"; - "git-monitor" = dontDistribute super."git-monitor"; - "git-object" = dontDistribute super."git-object"; - "git-repair" = dontDistribute super."git-repair"; - "git-sanity" = dontDistribute super."git-sanity"; - "git-vogue" = dontDistribute super."git-vogue"; - "gitHUD" = dontDistribute super."gitHUD"; - "gitcache" = dontDistribute super."gitcache"; - "gitdo" = dontDistribute super."gitdo"; - "github" = dontDistribute super."github"; - "github-backup" = dontDistribute super."github-backup"; - "github-post-receive" = dontDistribute super."github-post-receive"; - "github-release" = dontDistribute super."github-release"; - "github-utils" = dontDistribute super."github-utils"; - "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; - "gitignore" = dontDistribute super."gitignore"; - "gitit" = dontDistribute super."gitit"; - "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; - "gitlib-cross" = dontDistribute super."gitlib-cross"; - "gitlib-s3" = dontDistribute super."gitlib-s3"; - "gitlib-sample" = dontDistribute super."gitlib-sample"; - "gitlib-utils" = dontDistribute super."gitlib-utils"; - "gitter" = dontDistribute super."gitter"; - "givegif" = dontDistribute super."givegif"; - "gl-capture" = dontDistribute super."gl-capture"; - "glade" = dontDistribute super."glade"; - "gladexml-accessor" = dontDistribute super."gladexml-accessor"; - "glambda" = dontDistribute super."glambda"; - "glapp" = dontDistribute super."glapp"; - "glasso" = dontDistribute super."glasso"; - "glicko" = dontDistribute super."glicko"; - "glider-nlp" = dontDistribute super."glider-nlp"; - "glintcollider" = dontDistribute super."glintcollider"; - "glirc" = dontDistribute super."glirc"; - "gll" = dontDistribute super."gll"; - "global" = dontDistribute super."global"; - "global-config" = dontDistribute super."global-config"; - "global-lock" = dontDistribute super."global-lock"; - "global-variables" = dontDistribute super."global-variables"; - "glome-hs" = dontDistribute super."glome-hs"; - "gloss-accelerate" = dontDistribute super."gloss-accelerate"; - "gloss-algorithms" = dontDistribute super."gloss-algorithms"; - "gloss-banana" = dontDistribute super."gloss-banana"; - "gloss-devil" = dontDistribute super."gloss-devil"; - "gloss-examples" = dontDistribute super."gloss-examples"; - "gloss-game" = dontDistribute super."gloss-game"; - "gloss-juicy" = dontDistribute super."gloss-juicy"; - "gloss-raster" = dontDistribute super."gloss-raster"; - "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; - "gloss-sodium" = dontDistribute super."gloss-sodium"; - "glpk-hs" = dontDistribute super."glpk-hs"; - "glue" = dontDistribute super."glue"; - "glue-common" = dontDistribute super."glue-common"; - "glue-core" = dontDistribute super."glue-core"; - "glue-ekg" = dontDistribute super."glue-ekg"; - "glue-example" = dontDistribute super."glue-example"; - "gluturtle" = dontDistribute super."gluturtle"; - "gmap" = dontDistribute super."gmap"; - "gmndl" = dontDistribute super."gmndl"; - "gnome-desktop" = dontDistribute super."gnome-desktop"; - "gnome-keyring" = dontDistribute super."gnome-keyring"; - "gnomevfs" = dontDistribute super."gnomevfs"; - "gnss-converters" = dontDistribute super."gnss-converters"; - "gnuidn" = dontDistribute super."gnuidn"; - "gnuplot" = dontDistribute super."gnuplot"; - "gnutls" = dontDistribute super."gnutls"; - "goa" = dontDistribute super."goa"; - "goal-core" = dontDistribute super."goal-core"; - "goal-geometry" = dontDistribute super."goal-geometry"; - "goal-probability" = dontDistribute super."goal-probability"; - "goal-simulation" = dontDistribute super."goal-simulation"; - "goatee" = dontDistribute super."goatee"; - "goatee-gtk" = dontDistribute super."goatee-gtk"; - "gofer-prelude" = dontDistribute super."gofer-prelude"; - "gooey" = dontDistribute super."gooey"; - "google-dictionary" = dontDistribute super."google-dictionary"; - "google-drive" = dontDistribute super."google-drive"; - "google-html5-slide" = dontDistribute super."google-html5-slide"; - "google-mail-filters" = dontDistribute super."google-mail-filters"; - "google-oauth2" = dontDistribute super."google-oauth2"; - "google-search" = dontDistribute super."google-search"; - "google-translate" = dontDistribute super."google-translate"; - "googleplus" = dontDistribute super."googleplus"; - "googlepolyline" = dontDistribute super."googlepolyline"; - "gopherbot" = dontDistribute super."gopherbot"; - "gore-and-ash" = dontDistribute super."gore-and-ash"; - "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor"; - "gore-and-ash-async" = dontDistribute super."gore-and-ash-async"; - "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo"; - "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw"; - "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging"; - "gore-and-ash-network" = dontDistribute super."gore-and-ash-network"; - "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl"; - "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; - "gpah" = dontDistribute super."gpah"; - "gpcsets" = dontDistribute super."gpcsets"; - "gpio" = dontDistribute super."gpio"; - "gps" = dontDistribute super."gps"; - "gps2htmlReport" = dontDistribute super."gps2htmlReport"; - "gpx-conduit" = dontDistribute super."gpx-conduit"; - "graceful" = dontDistribute super."graceful"; - "grammar-combinators" = dontDistribute super."grammar-combinators"; - "grapefruit-examples" = dontDistribute super."grapefruit-examples"; - "grapefruit-frp" = dontDistribute super."grapefruit-frp"; - "grapefruit-records" = dontDistribute super."grapefruit-records"; - "grapefruit-ui" = dontDistribute super."grapefruit-ui"; - "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; - "graph-generators" = dontDistribute super."graph-generators"; - "graph-matchings" = dontDistribute super."graph-matchings"; - "graph-rewriting" = dontDistribute super."graph-rewriting"; - "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; - "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; - "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; - "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; - "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; - "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; - "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; - "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; - "graph-serialize" = dontDistribute super."graph-serialize"; - "graph-utils" = dontDistribute super."graph-utils"; - "graph-visit" = dontDistribute super."graph-visit"; - "graphbuilder" = dontDistribute super."graphbuilder"; - "graphene" = dontDistribute super."graphene"; - "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; - "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; - "graphicsFormats" = dontDistribute super."graphicsFormats"; - "graphicstools" = dontDistribute super."graphicstools"; - "graphmod" = dontDistribute super."graphmod"; - "graphql" = dontDistribute super."graphql"; - "graphtype" = dontDistribute super."graphtype"; - "grasp" = dontDistribute super."grasp"; - "gray-code" = dontDistribute super."gray-code"; - "gray-extended" = dontDistribute super."gray-extended"; - "greencard" = dontDistribute super."greencard"; - "greencard-lib" = dontDistribute super."greencard-lib"; - "greg-client" = dontDistribute super."greg-client"; - "gremlin-haskell" = dontDistribute super."gremlin-haskell"; - "greplicate" = dontDistribute super."greplicate"; - "grid" = dontDistribute super."grid"; - "gridfs" = dontDistribute super."gridfs"; - "gridland" = dontDistribute super."gridland"; - "grm" = dontDistribute super."grm"; - "groundhog" = dontDistribute super."groundhog"; - "groundhog-converters" = dontDistribute super."groundhog-converters"; - "groundhog-inspector" = dontDistribute super."groundhog-inspector"; - "groundhog-mysql" = dontDistribute super."groundhog-mysql"; - "groundhog-postgresql" = dontDistribute super."groundhog-postgresql"; - "groundhog-sqlite" = dontDistribute super."groundhog-sqlite"; - "groundhog-th" = dontDistribute super."groundhog-th"; - "group-with" = dontDistribute super."group-with"; - "groupoid" = dontDistribute super."groupoid"; - "growler" = dontDistribute super."growler"; - "gruff" = dontDistribute super."gruff"; - "gruff-examples" = dontDistribute super."gruff-examples"; - "gsasl" = dontDistribute super."gsasl"; - "gsc-weighting" = dontDistribute super."gsc-weighting"; - "gsl-random" = dontDistribute super."gsl-random"; - "gsl-random-fu" = dontDistribute super."gsl-random-fu"; - "gsmenu" = dontDistribute super."gsmenu"; - "gstreamer" = dontDistribute super."gstreamer"; - "gt-tools" = dontDistribute super."gt-tools"; - "gtfs" = dontDistribute super."gtfs"; - "gtk-helpers" = dontDistribute super."gtk-helpers"; - "gtk-jsinput" = dontDistribute super."gtk-jsinput"; - "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; - "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; - "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; - "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; - "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; - "gtk-toy" = dontDistribute super."gtk-toy"; - "gtk-traymanager" = dontDistribute super."gtk-traymanager"; - "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; - "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; - "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; - "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; - "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; - "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; - "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; - "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; - "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; - "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; - "gtkglext" = dontDistribute super."gtkglext"; - "gtkimageview" = dontDistribute super."gtkimageview"; - "gtkrsync" = dontDistribute super."gtkrsync"; - "gtksourceview2" = dontDistribute super."gtksourceview2"; - "guarded-rewriting" = dontDistribute super."guarded-rewriting"; - "guess-combinator" = dontDistribute super."guess-combinator"; - "guid" = dontDistribute super."guid"; - "gulcii" = dontDistribute super."gulcii"; - "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; - "gyah-bin" = dontDistribute super."gyah-bin"; - "h-booru" = dontDistribute super."h-booru"; - "h-gpgme" = dontDistribute super."h-gpgme"; - "h2048" = dontDistribute super."h2048"; - "hArduino" = dontDistribute super."hArduino"; - "hBDD" = dontDistribute super."hBDD"; - "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; - "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; - "hCsound" = dontDistribute super."hCsound"; - "hDFA" = dontDistribute super."hDFA"; - "hF2" = dontDistribute super."hF2"; - "hGelf" = dontDistribute super."hGelf"; - "hLLVM" = dontDistribute super."hLLVM"; - "hMollom" = dontDistribute super."hMollom"; - "hPushover" = dontDistribute super."hPushover"; - "hR" = dontDistribute super."hR"; - "hRESP" = dontDistribute super."hRESP"; - "hS3" = dontDistribute super."hS3"; - "hScraper" = dontDistribute super."hScraper"; - "hSimpleDB" = dontDistribute super."hSimpleDB"; - "hTalos" = dontDistribute super."hTalos"; - "hTensor" = dontDistribute super."hTensor"; - "hVOIDP" = dontDistribute super."hVOIDP"; - "hXmixer" = dontDistribute super."hXmixer"; - "haar" = dontDistribute super."haar"; - "hablog" = dontDistribute super."hablog"; - "hacanon-light" = dontDistribute super."hacanon-light"; - "hack" = dontDistribute super."hack"; - "hack-contrib" = dontDistribute super."hack-contrib"; - "hack-contrib-press" = dontDistribute super."hack-contrib-press"; - "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; - "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; - "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; - "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; - "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; - "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; - "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; - "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; - "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; - "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; - "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; - "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; - "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; - "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; - "hack2" = dontDistribute super."hack2"; - "hack2-contrib" = dontDistribute super."hack2-contrib"; - "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; - "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; - "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; - "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; - "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; - "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; - "hackage-diff" = dontDistribute super."hackage-diff"; - "hackage-plot" = dontDistribute super."hackage-plot"; - "hackage-processing" = dontDistribute super."hackage-processing"; - "hackage-proxy" = dontDistribute super."hackage-proxy"; - "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; - "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; - "hackage-server" = dontDistribute super."hackage-server"; - "hackage-sparks" = dontDistribute super."hackage-sparks"; - "hackage2hwn" = dontDistribute super."hackage2hwn"; - "hackage2twitter" = dontDistribute super."hackage2twitter"; - "hackager" = dontDistribute super."hackager"; - "hackernews" = dontDistribute super."hackernews"; - "hackertyper" = dontDistribute super."hackertyper"; - "hackport" = dontDistribute super."hackport"; - "hactor" = dontDistribute super."hactor"; - "hactors" = dontDistribute super."hactors"; - "haddock" = dontDistribute super."haddock"; - "haddock-leksah" = dontDistribute super."haddock-leksah"; - "haddock-test" = dontDistribute super."haddock-test"; - "haddocset" = dontDistribute super."haddocset"; - "hadoop-formats" = dontDistribute super."hadoop-formats"; - "hadoop-rpc" = dontDistribute super."hadoop-rpc"; - "hadoop-tools" = dontDistribute super."hadoop-tools"; - "haeredes" = dontDistribute super."haeredes"; - "haggis" = dontDistribute super."haggis"; - "haha" = dontDistribute super."haha"; - "hahp" = dontDistribute super."hahp"; - "haiji" = dontDistribute super."haiji"; - "hailgun-send" = dontDistribute super."hailgun-send"; - "hails" = dontDistribute super."hails"; - "hails-bin" = dontDistribute super."hails-bin"; - "hairy" = dontDistribute super."hairy"; - "hakaru" = dontDistribute super."hakaru"; - "hake" = dontDistribute super."hake"; - "hakismet" = dontDistribute super."hakismet"; - "hako" = dontDistribute super."hako"; - "hakyll" = dontDistribute super."hakyll"; - "hakyll-R" = dontDistribute super."hakyll-R"; - "hakyll-agda" = dontDistribute super."hakyll-agda"; - "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; - "hakyll-contrib" = dontDistribute super."hakyll-contrib"; - "hakyll-contrib-csv" = dontDistribute super."hakyll-contrib-csv"; - "hakyll-contrib-elm" = dontDistribute super."hakyll-contrib-elm"; - "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; - "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; - "hakyll-convert" = dontDistribute super."hakyll-convert"; - "hakyll-elm" = dontDistribute super."hakyll-elm"; - "hakyll-filestore" = dontDistribute super."hakyll-filestore"; - "hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup"; - "hakyll-sass" = dontDistribute super."hakyll-sass"; - "hakyll-shakespeare" = dontDistribute super."hakyll-shakespeare"; - "halberd" = dontDistribute super."halberd"; - "halfs" = dontDistribute super."halfs"; - "halipeto" = dontDistribute super."halipeto"; - "halive" = dontDistribute super."halive"; - "halma" = dontDistribute super."halma"; - "haltavista" = dontDistribute super."haltavista"; - "hamid" = dontDistribute super."hamid"; - "hampp" = dontDistribute super."hampp"; - "hamtmap" = dontDistribute super."hamtmap"; - "hamusic" = dontDistribute super."hamusic"; - "handa-data" = dontDistribute super."handa-data"; - "handa-gdata" = dontDistribute super."handa-gdata"; - "handa-geodata" = dontDistribute super."handa-geodata"; - "handa-opengl" = dontDistribute super."handa-opengl"; - "handle-like" = dontDistribute super."handle-like"; - "handsy" = dontDistribute super."handsy"; - "hangman" = dontDistribute super."hangman"; - "hannahci" = dontDistribute super."hannahci"; - "hans" = dontDistribute super."hans"; - "hans-pcap" = dontDistribute super."hans-pcap"; - "hans-pfq" = dontDistribute super."hans-pfq"; - "haphviz" = dontDistribute super."haphviz"; - "happindicator" = dontDistribute super."happindicator"; - "happindicator3" = dontDistribute super."happindicator3"; - "happraise" = dontDistribute super."happraise"; - "happs-hsp" = dontDistribute super."happs-hsp"; - "happs-hsp-template" = dontDistribute super."happs-hsp-template"; - "happs-tutorial" = dontDistribute super."happs-tutorial"; - "happstack" = dontDistribute super."happstack"; - "happstack-auth" = dontDistribute super."happstack-auth"; - "happstack-contrib" = dontDistribute super."happstack-contrib"; - "happstack-data" = dontDistribute super."happstack-data"; - "happstack-dlg" = dontDistribute super."happstack-dlg"; - "happstack-facebook" = dontDistribute super."happstack-facebook"; - "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; - "happstack-fay" = dontDistribute super."happstack-fay"; - "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; - "happstack-foundation" = dontDistribute super."happstack-foundation"; - "happstack-hamlet" = dontDistribute super."happstack-hamlet"; - "happstack-heist" = dontDistribute super."happstack-heist"; - "happstack-helpers" = dontDistribute super."happstack-helpers"; - "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; - "happstack-ixset" = dontDistribute super."happstack-ixset"; - "happstack-lite" = dontDistribute super."happstack-lite"; - "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; - "happstack-plugins" = dontDistribute super."happstack-plugins"; - "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; - "happstack-state" = dontDistribute super."happstack-state"; - "happstack-static-routing" = dontDistribute super."happstack-static-routing"; - "happstack-util" = dontDistribute super."happstack-util"; - "happstack-yui" = dontDistribute super."happstack-yui"; - "happy-meta" = dontDistribute super."happy-meta"; - "happybara" = dontDistribute super."happybara"; - "happybara-webkit" = dontDistribute super."happybara-webkit"; - "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; - "hapstone" = dontDistribute super."hapstone"; - "har" = dontDistribute super."har"; - "harchive" = dontDistribute super."harchive"; - "hardware-edsl" = dontDistribute super."hardware-edsl"; - "hark" = dontDistribute super."hark"; - "harmony" = dontDistribute super."harmony"; - "haroonga" = dontDistribute super."haroonga"; - "haroonga-httpd" = dontDistribute super."haroonga-httpd"; - "harpy" = dontDistribute super."harpy"; - "harvest-api" = dontDistribute super."harvest-api"; - "has" = dontDistribute super."has"; - "has-th" = dontDistribute super."has-th"; - "hascal" = dontDistribute super."hascal"; - "hascar" = dontDistribute super."hascar"; - "hascas" = dontDistribute super."hascas"; - "hascat" = dontDistribute super."hascat"; - "hascat-lib" = dontDistribute super."hascat-lib"; - "hascat-setup" = dontDistribute super."hascat-setup"; - "hascat-system" = dontDistribute super."hascat-system"; - "hash" = dontDistribute super."hash"; - "hashable-generics" = dontDistribute super."hashable-generics"; - "hashabler" = dontDistribute super."hashabler"; - "hashed-storage" = dontDistribute super."hashed-storage"; - "hashids" = dontDistribute super."hashids"; - "hashing" = dontDistribute super."hashing"; - "hashring" = dontDistribute super."hashring"; - "hashtables-plus" = dontDistribute super."hashtables-plus"; - "hasim" = dontDistribute super."hasim"; - "hask" = dontDistribute super."hask"; - "hask-home" = dontDistribute super."hask-home"; - "haskades" = dontDistribute super."haskades"; - "haskakafka" = dontDistribute super."haskakafka"; - "haskanoid" = dontDistribute super."haskanoid"; - "haskarrow" = dontDistribute super."haskarrow"; - "haskbot-core" = dontDistribute super."haskbot-core"; - "haskdeep" = dontDistribute super."haskdeep"; - "haskdogs" = dontDistribute super."haskdogs"; - "haskeem" = dontDistribute super."haskeem"; - "haskeline" = doDistribute super."haskeline_0_7_2_3"; - "haskeline-class" = dontDistribute super."haskeline-class"; - "haskell-aliyun" = dontDistribute super."haskell-aliyun"; - "haskell-awk" = dontDistribute super."haskell-awk"; - "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; - "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; - "haskell-cnc" = dontDistribute super."haskell-cnc"; - "haskell-coffee" = dontDistribute super."haskell-coffee"; - "haskell-compression" = dontDistribute super."haskell-compression"; - "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; - "haskell-docs" = dontDistribute super."haskell-docs"; - "haskell-eigen-util" = dontDistribute super."haskell-eigen-util"; - "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; - "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent"; - "haskell-formatter" = dontDistribute super."haskell-formatter"; - "haskell-ftp" = dontDistribute super."haskell-ftp"; - "haskell-generate" = dontDistribute super."haskell-generate"; - "haskell-google-trends" = dontDistribute super."haskell-google-trends"; - "haskell-igraph" = dontDistribute super."haskell-igraph"; - "haskell-import-graph" = dontDistribute super."haskell-import-graph"; - "haskell-in-space" = dontDistribute super."haskell-in-space"; - "haskell-kubernetes" = dontDistribute super."haskell-kubernetes"; - "haskell-modbus" = dontDistribute super."haskell-modbus"; - "haskell-mpfr" = dontDistribute super."haskell-mpfr"; - "haskell-mpi" = dontDistribute super."haskell-mpi"; - "haskell-openflow" = dontDistribute super."haskell-openflow"; - "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; - "haskell-platform-test" = dontDistribute super."haskell-platform-test"; - "haskell-player" = dontDistribute super."haskell-player"; - "haskell-plot" = dontDistribute super."haskell-plot"; - "haskell-proxy-list" = dontDistribute super."haskell-proxy-list"; - "haskell-qrencode" = dontDistribute super."haskell-qrencode"; - "haskell-read-editor" = dontDistribute super."haskell-read-editor"; - "haskell-reflect" = dontDistribute super."haskell-reflect"; - "haskell-rules" = dontDistribute super."haskell-rules"; - "haskell-src-exts-prisms" = dontDistribute super."haskell-src-exts-prisms"; - "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; - "haskell-src-exts-simple" = dontDistribute super."haskell-src-exts-simple"; - "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; - "haskell-token-utils" = dontDistribute super."haskell-token-utils"; - "haskell-tools-ast" = dontDistribute super."haskell-tools-ast"; - "haskell-tools-ast-fromghc" = dontDistribute super."haskell-tools-ast-fromghc"; - "haskell-tools-ast-gen" = dontDistribute super."haskell-tools-ast-gen"; - "haskell-tools-ast-trf" = dontDistribute super."haskell-tools-ast-trf"; - "haskell-tools-prettyprint" = dontDistribute super."haskell-tools-prettyprint"; - "haskell-tools-refactor" = dontDistribute super."haskell-tools-refactor"; - "haskell-tor" = dontDistribute super."haskell-tor"; - "haskell-type-exts" = dontDistribute super."haskell-type-exts"; - "haskell-typescript" = dontDistribute super."haskell-typescript"; - "haskell-tyrant" = dontDistribute super."haskell-tyrant"; - "haskell-updater" = dontDistribute super."haskell-updater"; - "haskell-xmpp" = dontDistribute super."haskell-xmpp"; - "haskell2010" = dontDistribute super."haskell2010"; - "haskell98" = dontDistribute super."haskell98"; - "haskell98libraries" = dontDistribute super."haskell98libraries"; - "haskelldb" = dontDistribute super."haskelldb"; - "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; - "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; - "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; - "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; - "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; - "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; - "haskelldb-flat" = dontDistribute super."haskelldb-flat"; - "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; - "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; - "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; - "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; - "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; - "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; - "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; - "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; - "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; - "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; - "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; - "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; - "haskelldb-th" = dontDistribute super."haskelldb-th"; - "haskelldb-wx" = dontDistribute super."haskelldb-wx"; - "haskellscrabble" = dontDistribute super."haskellscrabble"; - "haskellscript" = dontDistribute super."haskellscript"; - "haskelm" = dontDistribute super."haskelm"; - "haskelzinc" = dontDistribute super."haskelzinc"; - "haskgame" = dontDistribute super."haskgame"; - "haskheap" = dontDistribute super."haskheap"; - "haskhol-core" = dontDistribute super."haskhol-core"; - "haskmon" = dontDistribute super."haskmon"; - "haskoin" = dontDistribute super."haskoin"; - "haskoin-crypto" = dontDistribute super."haskoin-crypto"; - "haskoin-node" = dontDistribute super."haskoin-node"; - "haskoin-protocol" = dontDistribute super."haskoin-protocol"; - "haskoin-script" = dontDistribute super."haskoin-script"; - "haskoin-util" = dontDistribute super."haskoin-util"; - "haskoin-wallet" = dontDistribute super."haskoin-wallet"; - "haskoon" = dontDistribute super."haskoon"; - "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; - "haskoon-salvia" = dontDistribute super."haskoon-salvia"; - "haskore" = dontDistribute super."haskore"; - "haskore-realtime" = dontDistribute super."haskore-realtime"; - "haskore-supercollider" = dontDistribute super."haskore-supercollider"; - "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; - "haskore-vintage" = dontDistribute super."haskore-vintage"; - "hasktags" = dontDistribute super."hasktags"; - "haslo" = dontDistribute super."haslo"; - "hasloGUI" = dontDistribute super."hasloGUI"; - "hasparql-client" = dontDistribute super."hasparql-client"; - "haspell" = dontDistribute super."haspell"; - "hasql-backend" = dontDistribute super."hasql-backend"; - "hasql-class" = dontDistribute super."hasql-class"; - "hasql-cursor-query" = dontDistribute super."hasql-cursor-query"; - "hasql-cursor-transaction" = dontDistribute super."hasql-cursor-transaction"; - "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; - "hasql-pool" = dontDistribute super."hasql-pool"; - "hasql-postgres" = dontDistribute super."hasql-postgres"; - "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; - "hasql-th" = dontDistribute super."hasql-th"; - "hasql-transaction" = dontDistribute super."hasql-transaction"; - "hastache-aeson" = dontDistribute super."hastache-aeson"; - "haste" = dontDistribute super."haste"; - "haste-compiler" = dontDistribute super."haste-compiler"; - "haste-gapi" = dontDistribute super."haste-gapi"; - "haste-markup" = dontDistribute super."haste-markup"; - "haste-perch" = dontDistribute super."haste-perch"; - "hastily" = dontDistribute super."hastily"; - "hat" = dontDistribute super."hat"; - "hath" = dontDistribute super."hath"; - "hats" = dontDistribute super."hats"; - "hatt" = dontDistribute super."hatt"; - "haverer" = dontDistribute super."haverer"; - "hawitter" = dontDistribute super."hawitter"; - "haxl" = dontDistribute super."haxl"; - "haxl-amazonka" = dontDistribute super."haxl-amazonka"; - "haxl-facebook" = dontDistribute super."haxl-facebook"; - "haxparse" = dontDistribute super."haxparse"; - "haxr" = dontDistribute super."haxr"; - "haxr-th" = dontDistribute super."haxr-th"; - "haxy" = dontDistribute super."haxy"; - "hayland" = dontDistribute super."hayland"; - "hayoo-cli" = dontDistribute super."hayoo-cli"; - "hback" = dontDistribute super."hback"; - "hbb" = dontDistribute super."hbb"; - "hbcd" = dontDistribute super."hbcd"; - "hbeat" = dontDistribute super."hbeat"; - "hblas" = dontDistribute super."hblas"; - "hblock" = dontDistribute super."hblock"; - "hbro" = dontDistribute super."hbro"; - "hbro-contrib" = dontDistribute super."hbro-contrib"; - "hburg" = dontDistribute super."hburg"; - "hcc" = dontDistribute super."hcc"; - "hcg-minus" = dontDistribute super."hcg-minus"; - "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; - "hcheat" = dontDistribute super."hcheat"; - "hchesslib" = dontDistribute super."hchesslib"; - "hcltest" = dontDistribute super."hcltest"; - "hcoap" = dontDistribute super."hcoap"; - "hcron" = dontDistribute super."hcron"; - "hcube" = dontDistribute super."hcube"; - "hcwiid" = dontDistribute super."hcwiid"; - "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; - "hdbc-aeson" = dontDistribute super."hdbc-aeson"; - "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; - "hdbc-tuple" = dontDistribute super."hdbc-tuple"; - "hdbi" = dontDistribute super."hdbi"; - "hdbi-conduit" = dontDistribute super."hdbi-conduit"; - "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; - "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; - "hdbi-tests" = dontDistribute super."hdbi-tests"; - "hdf" = dontDistribute super."hdf"; - "hdigest" = dontDistribute super."hdigest"; - "hdirect" = dontDistribute super."hdirect"; - "hdis86" = dontDistribute super."hdis86"; - "hdiscount" = dontDistribute super."hdiscount"; - "hdm" = dontDistribute super."hdm"; - "hdo" = dontDistribute super."hdo"; - "hdocs" = dontDistribute super."hdocs"; - "hdph" = dontDistribute super."hdph"; - "hdph-closure" = dontDistribute super."hdph-closure"; - "hdr-histogram" = dontDistribute super."hdr-histogram"; - "headergen" = dontDistribute super."headergen"; - "heapsort" = dontDistribute super."heapsort"; - "hecc" = dontDistribute super."hecc"; - "heckle" = dontDistribute super."heckle"; - "hedis-config" = dontDistribute super."hedis-config"; - "hedis-monadic" = dontDistribute super."hedis-monadic"; - "hedis-namespace" = dontDistribute super."hedis-namespace"; - "hedis-pile" = dontDistribute super."hedis-pile"; - "hedis-simple" = dontDistribute super."hedis-simple"; - "hedis-tags" = dontDistribute super."hedis-tags"; - "hedn" = dontDistribute super."hedn"; - "hein" = dontDistribute super."hein"; - "heist" = dontDistribute super."heist"; - "heist-aeson" = dontDistribute super."heist-aeson"; - "heist-async" = dontDistribute super."heist-async"; - "helics" = dontDistribute super."helics"; - "helics-wai" = dontDistribute super."helics-wai"; - "helisp" = dontDistribute super."helisp"; - "helium" = dontDistribute super."helium"; - "helium-overture" = dontDistribute super."helium-overture"; - "helix" = dontDistribute super."helix"; - "hell" = dontDistribute super."hell"; - "hellage" = dontDistribute super."hellage"; - "hellnet" = dontDistribute super."hellnet"; - "hello" = dontDistribute super."hello"; - "helm" = dontDistribute super."helm"; - "help-esb" = dontDistribute super."help-esb"; - "hemkay" = dontDistribute super."hemkay"; - "hemkay-core" = dontDistribute super."hemkay-core"; - "hemokit" = dontDistribute super."hemokit"; - "hen" = dontDistribute super."hen"; - "henet" = dontDistribute super."henet"; - "hepevt" = dontDistribute super."hepevt"; - "her-lexer" = dontDistribute super."her-lexer"; - "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; - "herbalizer" = dontDistribute super."herbalizer"; - "heredocs" = dontDistribute super."heredocs"; - "herf-time" = dontDistribute super."herf-time"; - "hermit" = dontDistribute super."hermit"; - "hermit-syb" = dontDistribute super."hermit-syb"; - "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; - "heroku" = dontDistribute super."heroku"; - "heroku-persistent" = dontDistribute super."heroku-persistent"; - "herringbone" = dontDistribute super."herringbone"; - "herringbone-embed" = dontDistribute super."herringbone-embed"; - "herringbone-wai" = dontDistribute super."herringbone-wai"; - "hesh" = dontDistribute super."hesh"; - "hesql" = dontDistribute super."hesql"; - "hetero-dict" = dontDistribute super."hetero-dict"; - "hetero-map" = dontDistribute super."hetero-map"; - "hetris" = dontDistribute super."hetris"; - "heukarya" = dontDistribute super."heukarya"; - "hevolisa" = dontDistribute super."hevolisa"; - "hevolisa-dph" = dontDistribute super."hevolisa-dph"; - "hexdump" = dontDistribute super."hexdump"; - "hexif" = dontDistribute super."hexif"; - "hexpat" = dontDistribute super."hexpat"; - "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; - "hexpat-lens" = dontDistribute super."hexpat-lens"; - "hexpat-pickle" = dontDistribute super."hexpat-pickle"; - "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; - "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; - "hexpr" = dontDistribute super."hexpr"; - "hexquote" = dontDistribute super."hexquote"; - "hext" = dontDistribute super."hext"; - "heyefi" = dontDistribute super."heyefi"; - "hfann" = dontDistribute super."hfann"; - "hfd" = dontDistribute super."hfd"; - "hfiar" = dontDistribute super."hfiar"; - "hfmt" = dontDistribute super."hfmt"; - "hfoil" = dontDistribute super."hfoil"; - "hfov" = dontDistribute super."hfov"; - "hfractal" = dontDistribute super."hfractal"; - "hfusion" = dontDistribute super."hfusion"; - "hg-buildpackage" = dontDistribute super."hg-buildpackage"; - "hgal" = dontDistribute super."hgal"; - "hgalib" = dontDistribute super."hgalib"; - "hgdbmi" = dontDistribute super."hgdbmi"; - "hgearman" = dontDistribute super."hgearman"; - "hgen" = dontDistribute super."hgen"; - "hgeometric" = dontDistribute super."hgeometric"; - "hgeometry" = dontDistribute super."hgeometry"; - "hgeos" = dontDistribute super."hgeos"; - "hgithub" = dontDistribute super."hgithub"; - "hgl-example" = dontDistribute super."hgl-example"; - "hgmp" = dontDistribute super."hgmp"; - "hgom" = dontDistribute super."hgom"; - "hgopher" = dontDistribute super."hgopher"; - "hgrev" = dontDistribute super."hgrev"; - "hgrib" = dontDistribute super."hgrib"; - "hharp" = dontDistribute super."hharp"; - "hi" = dontDistribute super."hi"; - "hi3status" = dontDistribute super."hi3status"; - "hiccup" = dontDistribute super."hiccup"; - "hichi" = dontDistribute super."hichi"; - "hieraclus" = dontDistribute super."hieraclus"; - "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; - "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; - "hierarchy" = dontDistribute super."hierarchy"; - "hiernotify" = dontDistribute super."hiernotify"; - "highWaterMark" = dontDistribute super."highWaterMark"; - "higher-leveldb" = dontDistribute super."higher-leveldb"; - "higherorder" = dontDistribute super."higherorder"; - "highjson" = dontDistribute super."highjson"; - "highlight-versions" = dontDistribute super."highlight-versions"; - "highlighter" = dontDistribute super."highlighter"; - "highlighter2" = dontDistribute super."highlighter2"; - "hills" = dontDistribute super."hills"; - "himerge" = dontDistribute super."himerge"; - "himg" = dontDistribute super."himg"; - "himpy" = dontDistribute super."himpy"; - "hindley-milner" = dontDistribute super."hindley-milner"; - "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; - "hinduce-classifier" = dontDistribute super."hinduce-classifier"; - "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; - "hinduce-examples" = dontDistribute super."hinduce-examples"; - "hinduce-missingh" = dontDistribute super."hinduce-missingh"; - "hinotify-bytestring" = dontDistribute super."hinotify-bytestring"; - "hinquire" = dontDistribute super."hinquire"; - "hinstaller" = dontDistribute super."hinstaller"; - "hint-server" = dontDistribute super."hint-server"; - "hinvaders" = dontDistribute super."hinvaders"; - "hinze-streams" = dontDistribute super."hinze-streams"; - "hip" = dontDistribute super."hip"; - "hipbot" = dontDistribute super."hipbot"; - "hipchat-hs" = dontDistribute super."hipchat-hs"; - "hipe" = dontDistribute super."hipe"; - "hips" = dontDistribute super."hips"; - "hircules" = dontDistribute super."hircules"; - "hirt" = dontDistribute super."hirt"; - "hissmetrics" = dontDistribute super."hissmetrics"; - "hist-pl" = dontDistribute super."hist-pl"; - "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; - "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; - "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; - "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; - "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; - "hist-pl-types" = dontDistribute super."hist-pl-types"; - "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; - "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; - "historian" = dontDistribute super."historian"; - "hit-graph" = dontDistribute super."hit-graph"; - "hjcase" = dontDistribute super."hjcase"; - "hjpath" = dontDistribute super."hjpath"; - "hjs" = dontDistribute super."hjs"; - "hjson" = dontDistribute super."hjson"; - "hjson-query" = dontDistribute super."hjson-query"; - "hkdf" = dontDistribute super."hkdf"; - "hlatex" = dontDistribute super."hlatex"; - "hlbfgsb" = dontDistribute super."hlbfgsb"; - "hlcm" = dontDistribute super."hlcm"; - "hleap" = dontDistribute super."hleap"; - "hledger-chart" = dontDistribute super."hledger-chart"; - "hledger-diff" = dontDistribute super."hledger-diff"; - "hledger-irr" = dontDistribute super."hledger-irr"; - "hledger-ui" = dontDistribute super."hledger-ui"; - "hledger-vty" = dontDistribute super."hledger-vty"; - "hledger-web" = dontDistribute super."hledger-web"; - "hlibBladeRF" = dontDistribute super."hlibBladeRF"; - "hlibev" = dontDistribute super."hlibev"; - "hlibfam" = dontDistribute super."hlibfam"; - "hlogger" = dontDistribute super."hlogger"; - "hlongurl" = dontDistribute super."hlongurl"; - "hls" = dontDistribute super."hls"; - "hlwm" = dontDistribute super."hlwm"; - "hly" = dontDistribute super."hly"; - "hmark" = dontDistribute super."hmark"; - "hmarkup" = dontDistribute super."hmarkup"; - "hmatrix-banded" = dontDistribute super."hmatrix-banded"; - "hmatrix-csv" = dontDistribute super."hmatrix-csv"; - "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; - "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; - "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; - "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; - "hmatrix-repa" = dontDistribute super."hmatrix-repa"; - "hmatrix-static" = dontDistribute super."hmatrix-static"; - "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; - "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; - "hmatrix-tests" = dontDistribute super."hmatrix-tests"; - "hmeap" = dontDistribute super."hmeap"; - "hmeap-utils" = dontDistribute super."hmeap-utils"; - "hmemdb" = dontDistribute super."hmemdb"; - "hmenu" = dontDistribute super."hmenu"; - "hmidi" = dontDistribute super."hmidi"; - "hmk" = dontDistribute super."hmk"; - "hmm" = dontDistribute super."hmm"; - "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; - "hmp3" = dontDistribute super."hmp3"; - "hmt-diagrams" = dontDistribute super."hmt-diagrams"; - "hmumps" = dontDistribute super."hmumps"; - "hnetcdf" = dontDistribute super."hnetcdf"; - "hnix" = dontDistribute super."hnix"; - "hnn" = dontDistribute super."hnn"; - "hnop" = dontDistribute super."hnop"; - "ho-rewriting" = dontDistribute super."ho-rewriting"; - "hoauth" = dontDistribute super."hoauth"; - "hob" = dontDistribute super."hob"; - "hobbes" = dontDistribute super."hobbes"; - "hobbits" = dontDistribute super."hobbits"; - "hoe" = dontDistribute super."hoe"; - "hofix-mtl" = dontDistribute super."hofix-mtl"; - "hog" = dontDistribute super."hog"; - "hogg" = dontDistribute super."hogg"; - "hogre" = dontDistribute super."hogre"; - "hogre-examples" = dontDistribute super."hogre-examples"; - "hois" = dontDistribute super."hois"; - "hoist-error" = dontDistribute super."hoist-error"; - "hold-em" = dontDistribute super."hold-em"; - "hole" = dontDistribute super."hole"; - "holey-format" = dontDistribute super."holey-format"; - "homeomorphic" = dontDistribute super."homeomorphic"; - "hommage" = dontDistribute super."hommage"; - "hommage-ds" = dontDistribute super."hommage-ds"; - "homoiconic" = dontDistribute super."homoiconic"; - "honi" = dontDistribute super."honi"; - "honk" = dontDistribute super."honk"; - "hoobuddy" = dontDistribute super."hoobuddy"; - "hood" = dontDistribute super."hood"; - "hood-off" = dontDistribute super."hood-off"; - "hood2" = dontDistribute super."hood2"; - "hoodie" = dontDistribute super."hoodie"; - "hoodle" = dontDistribute super."hoodle"; - "hoodle-builder" = dontDistribute super."hoodle-builder"; - "hoodle-core" = dontDistribute super."hoodle-core"; - "hoodle-extra" = dontDistribute super."hoodle-extra"; - "hoodle-parser" = dontDistribute super."hoodle-parser"; - "hoodle-publish" = dontDistribute super."hoodle-publish"; - "hoodle-render" = dontDistribute super."hoodle-render"; - "hoodle-types" = dontDistribute super."hoodle-types"; - "hoogle-index" = dontDistribute super."hoogle-index"; - "hooks-dir" = dontDistribute super."hooks-dir"; - "hoovie" = dontDistribute super."hoovie"; - "hopencc" = dontDistribute super."hopencc"; - "hopencl" = dontDistribute super."hopencl"; - "hopfield" = dontDistribute super."hopfield"; - "hopfield-networks" = dontDistribute super."hopfield-networks"; - "hopfli" = dontDistribute super."hopfli"; - "hoppy-docs" = dontDistribute super."hoppy-docs"; - "hoppy-generator" = dontDistribute super."hoppy-generator"; - "hoppy-runtime" = dontDistribute super."hoppy-runtime"; - "hoppy-std" = dontDistribute super."hoppy-std"; - "hops" = dontDistribute super."hops"; - "hoq" = dontDistribute super."hoq"; - "horizon" = dontDistribute super."horizon"; - "hosc-json" = dontDistribute super."hosc-json"; - "hosc-utils" = dontDistribute super."hosc-utils"; - "hosts-server" = dontDistribute super."hosts-server"; - "hothasktags" = dontDistribute super."hothasktags"; - "hotswap" = dontDistribute super."hotswap"; - "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; - "houseman" = dontDistribute super."houseman"; - "hp2any-core" = dontDistribute super."hp2any-core"; - "hp2any-graph" = dontDistribute super."hp2any-graph"; - "hp2any-manager" = dontDistribute super."hp2any-manager"; - "hp2html" = dontDistribute super."hp2html"; - "hp2pretty" = dontDistribute super."hp2pretty"; - "hpaco" = dontDistribute super."hpaco"; - "hpaco-lib" = dontDistribute super."hpaco-lib"; - "hpage" = dontDistribute super."hpage"; - "hpapi" = dontDistribute super."hpapi"; - "hpaste" = dontDistribute super."hpaste"; - "hpasteit" = dontDistribute super."hpasteit"; - "hpath" = dontDistribute super."hpath"; - "hpc-strobe" = dontDistribute super."hpc-strobe"; - "hpc-tracer" = dontDistribute super."hpc-tracer"; - "hpdft" = dontDistribute super."hpdft"; - "hplayground" = dontDistribute super."hplayground"; - "hplaylist" = dontDistribute super."hplaylist"; - "hpodder" = dontDistribute super."hpodder"; - "hpp" = dontDistribute super."hpp"; - "hpqtypes" = dontDistribute super."hpqtypes"; - "hpqtypes-extras" = dontDistribute super."hpqtypes-extras"; - "hprotoc-fork" = dontDistribute super."hprotoc-fork"; - "hps" = dontDistribute super."hps"; - "hps-cairo" = dontDistribute super."hps-cairo"; - "hps-kmeans" = dontDistribute super."hps-kmeans"; - "hpuz" = dontDistribute super."hpuz"; - "hpygments" = dontDistribute super."hpygments"; - "hpylos" = dontDistribute super."hpylos"; - "hpyrg" = dontDistribute super."hpyrg"; - "hquery" = dontDistribute super."hquery"; - "hranker" = dontDistribute super."hranker"; - "hricket" = dontDistribute super."hricket"; - "hs-blake2" = dontDistribute super."hs-blake2"; - "hs-captcha" = dontDistribute super."hs-captcha"; - "hs-carbon" = dontDistribute super."hs-carbon"; - "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; - "hs-cdb" = dontDistribute super."hs-cdb"; - "hs-di" = dontDistribute super."hs-di"; - "hs-dotnet" = dontDistribute super."hs-dotnet"; - "hs-duktape" = dontDistribute super."hs-duktape"; - "hs-excelx" = dontDistribute super."hs-excelx"; - "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; - "hs-fltk" = dontDistribute super."hs-fltk"; - "hs-gchart" = dontDistribute super."hs-gchart"; - "hs-gen-iface" = dontDistribute super."hs-gen-iface"; - "hs-gizapp" = dontDistribute super."hs-gizapp"; - "hs-inspector" = dontDistribute super."hs-inspector"; - "hs-java" = dontDistribute super."hs-java"; - "hs-json-rpc" = dontDistribute super."hs-json-rpc"; - "hs-logo" = dontDistribute super."hs-logo"; - "hs-mesos" = dontDistribute super."hs-mesos"; - "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; - "hs-pgms" = dontDistribute super."hs-pgms"; - "hs-php-session" = dontDistribute super."hs-php-session"; - "hs-pkg-config" = dontDistribute super."hs-pkg-config"; - "hs-pkpass" = dontDistribute super."hs-pkpass"; - "hs-popen" = dontDistribute super."hs-popen"; - "hs-re" = dontDistribute super."hs-re"; - "hs-scrape" = dontDistribute super."hs-scrape"; - "hs-twitter" = dontDistribute super."hs-twitter"; - "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; - "hs-vcard" = dontDistribute super."hs-vcard"; - "hs-watchman" = dontDistribute super."hs-watchman"; - "hs2048" = dontDistribute super."hs2048"; - "hs2bf" = dontDistribute super."hs2bf"; - "hs2dot" = dontDistribute super."hs2dot"; - "hsConfigure" = dontDistribute super."hsConfigure"; - "hsSqlite3" = dontDistribute super."hsSqlite3"; - "hsXenCtrl" = dontDistribute super."hsXenCtrl"; - "hsay" = dontDistribute super."hsay"; - "hsbackup" = dontDistribute super."hsbackup"; - "hsbencher" = dontDistribute super."hsbencher"; - "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; - "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; - "hsc2hs" = dontDistribute super."hsc2hs"; - "hsc3" = dontDistribute super."hsc3"; - "hsc3-auditor" = dontDistribute super."hsc3-auditor"; - "hsc3-cairo" = dontDistribute super."hsc3-cairo"; - "hsc3-data" = dontDistribute super."hsc3-data"; - "hsc3-db" = dontDistribute super."hsc3-db"; - "hsc3-dot" = dontDistribute super."hsc3-dot"; - "hsc3-forth" = dontDistribute super."hsc3-forth"; - "hsc3-graphs" = dontDistribute super."hsc3-graphs"; - "hsc3-lang" = dontDistribute super."hsc3-lang"; - "hsc3-lisp" = dontDistribute super."hsc3-lisp"; - "hsc3-plot" = dontDistribute super."hsc3-plot"; - "hsc3-process" = dontDistribute super."hsc3-process"; - "hsc3-rec" = dontDistribute super."hsc3-rec"; - "hsc3-rw" = dontDistribute super."hsc3-rw"; - "hsc3-server" = dontDistribute super."hsc3-server"; - "hsc3-sf" = dontDistribute super."hsc3-sf"; - "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; - "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; - "hsc3-utils" = dontDistribute super."hsc3-utils"; - "hscaffold" = dontDistribute super."hscaffold"; - "hscamwire" = dontDistribute super."hscamwire"; - "hscassandra" = dontDistribute super."hscassandra"; - "hscd" = dontDistribute super."hscd"; - "hsclock" = dontDistribute super."hsclock"; - "hscope" = dontDistribute super."hscope"; - "hscrtmpl" = dontDistribute super."hscrtmpl"; - "hscuid" = dontDistribute super."hscuid"; - "hscurses" = dontDistribute super."hscurses"; - "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; - "hsdev" = dontDistribute super."hsdev"; - "hsdif" = dontDistribute super."hsdif"; - "hsdip" = dontDistribute super."hsdip"; - "hsdns-cache" = dontDistribute super."hsdns-cache"; - "hsemail-ns" = dontDistribute super."hsemail-ns"; - "hsenv" = dontDistribute super."hsenv"; - "hserv" = dontDistribute super."hserv"; - "hsfacter" = dontDistribute super."hsfacter"; - "hsfcsh" = dontDistribute super."hsfcsh"; - "hsfilt" = dontDistribute super."hsfilt"; - "hsgnutls" = dontDistribute super."hsgnutls"; - "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; - "hsgsom" = dontDistribute super."hsgsom"; - "hsgtd" = dontDistribute super."hsgtd"; - "hsharc" = dontDistribute super."hsharc"; - "hsilop" = dontDistribute super."hsilop"; - "hsimport" = dontDistribute super."hsimport"; - "hsini" = dontDistribute super."hsini"; - "hskeleton" = dontDistribute super."hskeleton"; - "hslackbuilder" = dontDistribute super."hslackbuilder"; - "hslibsvm" = dontDistribute super."hslibsvm"; - "hslinks" = dontDistribute super."hslinks"; - "hslogger-reader" = dontDistribute super."hslogger-reader"; - "hslogger-template" = dontDistribute super."hslogger-template"; - "hslogger4j" = dontDistribute super."hslogger4j"; - "hslogstash" = dontDistribute super."hslogstash"; - "hsmagick" = dontDistribute super."hsmagick"; - "hsmisc" = dontDistribute super."hsmisc"; - "hsmtpclient" = dontDistribute super."hsmtpclient"; - "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; - "hsnock" = dontDistribute super."hsnock"; - "hsnoise" = dontDistribute super."hsnoise"; - "hsns" = dontDistribute super."hsns"; - "hsnsq" = dontDistribute super."hsnsq"; - "hsntp" = dontDistribute super."hsntp"; - "hsoptions" = dontDistribute super."hsoptions"; - "hsp-cgi" = dontDistribute super."hsp-cgi"; - "hsparklines" = dontDistribute super."hsparklines"; - "hsparql" = dontDistribute super."hsparql"; - "hspear" = dontDistribute super."hspear"; - "hspec-checkers" = dontDistribute super."hspec-checkers"; - "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; - "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; - "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; - "hspec-experimental" = dontDistribute super."hspec-experimental"; - "hspec-hashable" = dontDistribute super."hspec-hashable"; - "hspec-laws" = dontDistribute super."hspec-laws"; - "hspec-monad-control" = dontDistribute super."hspec-monad-control"; - "hspec-server" = dontDistribute super."hspec-server"; - "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; - "hspec-slow" = dontDistribute super."hspec-slow"; - "hspec-snap" = dontDistribute super."hspec-snap"; - "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; - "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; - "hspec-test-framework" = dontDistribute super."hspec-test-framework"; - "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; - "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; - "hspec2" = dontDistribute super."hspec2"; - "hspecVariant" = dontDistribute super."hspecVariant"; - "hspr-sh" = dontDistribute super."hspr-sh"; - "hspread" = dontDistribute super."hspread"; - "hspresent" = dontDistribute super."hspresent"; - "hsprocess" = dontDistribute super."hsprocess"; - "hsql" = dontDistribute super."hsql"; - "hsql-mysql" = dontDistribute super."hsql-mysql"; - "hsql-odbc" = dontDistribute super."hsql-odbc"; - "hsql-postgresql" = dontDistribute super."hsql-postgresql"; - "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; - "hsqml" = dontDistribute super."hsqml"; - "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; - "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; - "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; - "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; - "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; - "hsqml-morris" = dontDistribute super."hsqml-morris"; - "hsreadability" = dontDistribute super."hsreadability"; - "hsrelp" = dontDistribute super."hsrelp"; - "hsseccomp" = dontDistribute super."hsseccomp"; - "hsshellscript" = dontDistribute super."hsshellscript"; - "hssourceinfo" = dontDistribute super."hssourceinfo"; - "hssqlppp" = dontDistribute super."hssqlppp"; - "hssqlppp-th" = dontDistribute super."hssqlppp-th"; - "hstats" = dontDistribute super."hstats"; - "hstest" = dontDistribute super."hstest"; - "hstidy" = dontDistribute super."hstidy"; - "hstorchat" = dontDistribute super."hstorchat"; - "hstradeking" = dontDistribute super."hstradeking"; - "hstyle" = dontDistribute super."hstyle"; - "hstzaar" = dontDistribute super."hstzaar"; - "hsubconvert" = dontDistribute super."hsubconvert"; - "hsverilog" = dontDistribute super."hsverilog"; - "hswip" = dontDistribute super."hswip"; - "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"; - "htestu" = dontDistribute super."htestu"; - "htiled" = dontDistribute super."htiled"; - "htime" = dontDistribute super."htime"; - "html-email-validate" = dontDistribute super."html-email-validate"; - "html-entities" = dontDistribute super."html-entities"; - "html-kure" = dontDistribute super."html-kure"; - "html-minimalist" = dontDistribute super."html-minimalist"; - "html-parse" = dontDistribute super."html-parse"; - "html-rules" = dontDistribute super."html-rules"; - "html-tokenizer" = dontDistribute super."html-tokenizer"; - "html-truncate" = dontDistribute super."html-truncate"; - "html2hamlet" = dontDistribute super."html2hamlet"; - "html5-entity" = dontDistribute super."html5-entity"; - "htodo" = dontDistribute super."htodo"; - "htrace" = dontDistribute super."htrace"; - "hts" = dontDistribute super."hts"; - "htsn" = dontDistribute super."htsn"; - "htsn-common" = dontDistribute super."htsn-common"; - "htsn-import" = dontDistribute super."htsn-import"; - "http-accept" = dontDistribute super."http-accept"; - "http-attoparsec" = dontDistribute super."http-attoparsec"; - "http-client-auth" = dontDistribute super."http-client-auth"; - "http-client-conduit" = dontDistribute super."http-client-conduit"; - "http-client-lens" = dontDistribute super."http-client-lens"; - "http-client-multipart" = dontDistribute super."http-client-multipart"; - "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; - "http-client-session" = dontDistribute super."http-client-session"; - "http-client-streams" = dontDistribute super."http-client-streams"; - "http-conduit-browser" = dontDistribute super."http-conduit-browser"; - "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; - "http-dispatch" = dontDistribute super."http-dispatch"; - "http-encodings" = dontDistribute super."http-encodings"; - "http-enumerator" = dontDistribute super."http-enumerator"; - "http-kinder" = dontDistribute super."http-kinder"; - "http-kit" = dontDistribute super."http-kit"; - "http-listen" = dontDistribute super."http-listen"; - "http-monad" = dontDistribute super."http-monad"; - "http-proxy" = dontDistribute super."http-proxy"; - "http-querystring" = dontDistribute super."http-querystring"; - "http-response-decoder" = dontDistribute super."http-response-decoder"; - "http-server" = dontDistribute super."http-server"; - "http-shed" = dontDistribute super."http-shed"; - "http-test" = dontDistribute super."http-test"; - "http-trace" = dontDistribute super."http-trace"; - "http-wget" = dontDistribute super."http-wget"; - "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; - "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; - "httpspec" = dontDistribute super."httpspec"; - "htune" = dontDistribute super."htune"; - "htzaar" = dontDistribute super."htzaar"; - "hub" = dontDistribute super."hub"; - "hubigraph" = dontDistribute super."hubigraph"; - "hubris" = dontDistribute super."hubris"; - "huckleberry" = dontDistribute super."huckleberry"; - "huff" = dontDistribute super."huff"; - "huffman" = dontDistribute super."huffman"; - "hugs2yc" = dontDistribute super."hugs2yc"; - "hulk" = dontDistribute super."hulk"; - "hums" = dontDistribute super."hums"; - "hunch" = dontDistribute super."hunch"; - "hunit-gui" = dontDistribute super."hunit-gui"; - "hunit-parsec" = dontDistribute super."hunit-parsec"; - "hunit-rematch" = dontDistribute super."hunit-rematch"; - "hunp" = dontDistribute super."hunp"; - "hunt-searchengine" = dontDistribute super."hunt-searchengine"; - "hunt-server" = dontDistribute super."hunt-server"; - "hunt-server-cli" = dontDistribute super."hunt-server-cli"; - "hurdle" = dontDistribute super."hurdle"; - "husk-scheme" = dontDistribute super."husk-scheme"; - "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; - "husky" = dontDistribute super."husky"; - "hutton" = dontDistribute super."hutton"; - "huttons-razor" = dontDistribute super."huttons-razor"; - "huzzy" = dontDistribute super."huzzy"; - "hw-json" = dontDistribute super."hw-json"; - "hw-mquery" = dontDistribute super."hw-mquery"; - "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; - "hws" = dontDistribute super."hws"; - "hwsl2" = dontDistribute super."hwsl2"; - "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; - "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; - "hx" = dontDistribute super."hx"; - "hxmppc" = dontDistribute super."hxmppc"; - "hxournal" = dontDistribute super."hxournal"; - "hxt-binary" = dontDistribute super."hxt-binary"; - "hxt-cache" = dontDistribute super."hxt-cache"; - "hxt-curl" = dontDistribute super."hxt-curl"; - "hxt-expat" = dontDistribute super."hxt-expat"; - "hxt-extras" = dontDistribute super."hxt-extras"; - "hxt-filter" = dontDistribute super."hxt-filter"; - "hxt-relaxng" = dontDistribute super."hxt-relaxng"; - "hxt-tagsoup" = dontDistribute super."hxt-tagsoup"; - "hxt-xpath" = dontDistribute super."hxt-xpath"; - "hxt-xslt" = dontDistribute super."hxt-xslt"; - "hxthelper" = dontDistribute super."hxthelper"; - "hxweb" = dontDistribute super."hxweb"; - "hyahtzee" = dontDistribute super."hyahtzee"; - "hyakko" = dontDistribute super."hyakko"; - "hybrid" = dontDistribute super."hybrid"; - "hydra-hs" = dontDistribute super."hydra-hs"; - "hydra-print" = dontDistribute super."hydra-print"; - "hydrogen" = dontDistribute super."hydrogen"; - "hydrogen-cli" = dontDistribute super."hydrogen-cli"; - "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; - "hydrogen-data" = dontDistribute super."hydrogen-data"; - "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; - "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; - "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; - "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; - "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; - "hydrogen-util" = dontDistribute super."hydrogen-util"; - "hydrogen-version" = dontDistribute super."hydrogen-version"; - "hyena" = dontDistribute super."hyena"; - "hylide" = dontDistribute super."hylide"; - "hylogen" = dontDistribute super."hylogen"; - "hylolib" = dontDistribute super."hylolib"; - "hylotab" = dontDistribute super."hylotab"; - "hyloutils" = dontDistribute super."hyloutils"; - "hyperdrive" = dontDistribute super."hyperdrive"; - "hyperfunctions" = dontDistribute super."hyperfunctions"; - "hyperloglog" = dontDistribute super."hyperloglog"; - "hyperloglogplus" = dontDistribute super."hyperloglogplus"; - "hyperpublic" = dontDistribute super."hyperpublic"; - "hyphenate" = dontDistribute super."hyphenate"; - "hypher" = dontDistribute super."hypher"; - "hzaif" = dontDistribute super."hzaif"; - "hzk" = dontDistribute super."hzk"; - "hzulip" = dontDistribute super."hzulip"; - "i18n" = dontDistribute super."i18n"; - "iCalendar" = dontDistribute super."iCalendar"; - "iException" = dontDistribute super."iException"; - "iap-verifier" = dontDistribute super."iap-verifier"; - "ib-api" = dontDistribute super."ib-api"; - "iban" = dontDistribute super."iban"; - "ibus-hs" = dontDistribute super."ibus-hs"; - "ide-backend" = dontDistribute super."ide-backend"; - "ide-backend-common" = dontDistribute super."ide-backend-common"; - "ide-backend-rts" = dontDistribute super."ide-backend-rts"; - "ide-backend-server" = dontDistribute super."ide-backend-server"; - "ideas" = dontDistribute super."ideas"; - "ideas-math" = dontDistribute super."ideas-math"; - "idempotent" = dontDistribute super."idempotent"; - "identifiers" = dontDistribute super."identifiers"; - "idiii" = dontDistribute super."idiii"; - "idna" = dontDistribute super."idna"; - "idna2008" = dontDistribute super."idna2008"; - "idringen" = dontDistribute super."idringen"; - "ieee" = dontDistribute super."ieee"; - "ieee-utils" = dontDistribute super."ieee-utils"; - "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; - "ieee754-parser" = dontDistribute super."ieee754-parser"; - "ifcxt" = dontDistribute super."ifcxt"; - "iff" = dontDistribute super."iff"; - "ifscs" = dontDistribute super."ifscs"; - "ig" = dontDistribute super."ig"; - "ige-mac-integration" = dontDistribute super."ige-mac-integration"; - "igraph" = dontDistribute super."igraph"; - "igrf" = dontDistribute super."igrf"; - "ihaskell" = dontDistribute super."ihaskell"; - "ihaskell-aeson" = dontDistribute super."ihaskell-aeson"; - "ihaskell-basic" = dontDistribute super."ihaskell-basic"; - "ihaskell-blaze" = dontDistribute super."ihaskell-blaze"; - "ihaskell-charts" = dontDistribute super."ihaskell-charts"; - "ihaskell-diagrams" = dontDistribute super."ihaskell-diagrams"; - "ihaskell-display" = dontDistribute super."ihaskell-display"; - "ihaskell-hatex" = dontDistribute super."ihaskell-hatex"; - "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; - "ihaskell-juicypixels" = dontDistribute super."ihaskell-juicypixels"; - "ihaskell-magic" = dontDistribute super."ihaskell-magic"; - "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; - "ihaskell-plot" = dontDistribute super."ihaskell-plot"; - "ihaskell-rlangqq" = dontDistribute super."ihaskell-rlangqq"; - "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; - "ihttp" = dontDistribute super."ihttp"; - "illuminate" = dontDistribute super."illuminate"; - "image-type" = dontDistribute super."image-type"; - "imagefilters" = dontDistribute super."imagefilters"; - "imagemagick" = dontDistribute super."imagemagick"; - "imagepaste" = dontDistribute super."imagepaste"; - "imap" = dontDistribute super."imap"; - "imapget" = dontDistribute super."imapget"; - "imbib" = dontDistribute super."imbib"; - "imgurder" = dontDistribute super."imgurder"; - "imparse" = dontDistribute super."imparse"; - "imperative-edsl" = dontDistribute super."imperative-edsl"; - "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; - "implicit" = dontDistribute super."implicit"; - "implicit-logging" = dontDistribute super."implicit-logging"; - "implicit-params" = dontDistribute super."implicit-params"; - "imports" = dontDistribute super."imports"; - "impossible" = dontDistribute super."impossible"; - "improve" = dontDistribute super."improve"; - "impure-containers" = dontDistribute super."impure-containers"; - "inc-ref" = dontDistribute super."inc-ref"; - "inch" = dontDistribute super."inch"; - "inchworm" = dontDistribute super."inchworm"; - "incremental-computing" = dontDistribute super."incremental-computing"; - "incremental-maps" = dontDistribute super."incremental-maps"; - "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; - "increments" = dontDistribute super."increments"; - "indentation" = dontDistribute super."indentation"; - "indentation-trifecta" = dontDistribute super."indentation-trifecta"; - "indentparser" = dontDistribute super."indentparser"; - "index-core" = dontDistribute super."index-core"; - "indexed" = dontDistribute super."indexed"; - "indexed-do-notation" = dontDistribute super."indexed-do-notation"; - "indexed-extras" = dontDistribute super."indexed-extras"; - "indexed-free" = dontDistribute super."indexed-free"; - "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; - "indices" = dontDistribute super."indices"; - "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; - "inf-interval" = dontDistribute super."inf-interval"; - "infer-upstream" = dontDistribute super."infer-upstream"; - "infernu" = dontDistribute super."infernu"; - "infinite-search" = dontDistribute super."infinite-search"; - "infinity" = dontDistribute super."infinity"; - "infix" = dontDistribute super."infix"; - "inflist" = dontDistribute super."inflist"; - "influxdb" = dontDistribute super."influxdb"; - "informative" = dontDistribute super."informative"; - "ini-qq" = dontDistribute super."ini-qq"; - "inilist" = dontDistribute super."inilist"; - "inject" = dontDistribute super."inject"; - "inject-function" = dontDistribute super."inject-function"; - "inline-c-win32" = dontDistribute super."inline-c-win32"; - "inline-java" = dontDistribute super."inline-java"; - "inquire" = dontDistribute super."inquire"; - "inserts" = dontDistribute super."inserts"; - "inspection-proxy" = dontDistribute super."inspection-proxy"; - "instance-control" = dontDistribute super."instance-control"; - "instant-aeson" = dontDistribute super."instant-aeson"; - "instant-bytes" = dontDistribute super."instant-bytes"; - "instant-deepseq" = dontDistribute super."instant-deepseq"; - "instant-generics" = dontDistribute super."instant-generics"; - "instant-hashable" = dontDistribute super."instant-hashable"; - "instant-zipper" = dontDistribute super."instant-zipper"; - "instinct" = dontDistribute super."instinct"; - "instrument-chord" = dontDistribute super."instrument-chord"; - "int-cast" = dontDistribute super."int-cast"; - "integer-pure" = dontDistribute super."integer-pure"; - "integer-simple" = dontDistribute super."integer-simple"; - "intel-aes" = dontDistribute super."intel-aes"; - "interchangeable" = dontDistribute super."interchangeable"; - "interleavableGen" = dontDistribute super."interleavableGen"; - "interleavableIO" = dontDistribute super."interleavableIO"; - "interleave" = dontDistribute super."interleave"; - "interlude" = dontDistribute super."interlude"; - "interlude-l" = dontDistribute super."interlude-l"; - "intern" = dontDistribute super."intern"; - "internetmarke" = dontDistribute super."internetmarke"; - "interpol" = dontDistribute super."interpol"; - "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; - "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; - "interpolation" = dontDistribute super."interpolation"; - "interruptible" = dontDistribute super."interruptible"; - "interspersed" = dontDistribute super."interspersed"; - "interval" = dontDistribute super."interval"; - "intricacy" = dontDistribute super."intricacy"; - "intset" = dontDistribute super."intset"; - "invertible" = dontDistribute super."invertible"; - "invertible-syntax" = dontDistribute super."invertible-syntax"; - "io-capture" = dontDistribute super."io-capture"; - "io-reactive" = dontDistribute super."io-reactive"; - "io-streams-http" = dontDistribute super."io-streams-http"; - "io-throttle" = dontDistribute super."io-throttle"; - "ioctl" = dontDistribute super."ioctl"; - "ioref-stable" = dontDistribute super."ioref-stable"; - "iothread" = dontDistribute super."iothread"; - "iotransaction" = dontDistribute super."iotransaction"; - "ip" = dontDistribute super."ip"; - "ip-quoter" = dontDistribute super."ip-quoter"; - "ipatch" = dontDistribute super."ipatch"; - "ipc" = dontDistribute super."ipc"; - "ipcvar" = dontDistribute super."ipcvar"; - "ipopt-hs" = dontDistribute super."ipopt-hs"; - "ipprint" = dontDistribute super."ipprint"; - "iptables-helpers" = dontDistribute super."iptables-helpers"; - "iptadmin" = dontDistribute super."iptadmin"; - "ipython-kernel" = dontDistribute super."ipython-kernel"; - "irc-bytestring" = dontDistribute super."irc-bytestring"; - "irc-colors" = dontDistribute super."irc-colors"; - "irc-core" = dontDistribute super."irc-core"; - "irc-fun-bot" = dontDistribute super."irc-fun-bot"; - "irc-fun-client" = dontDistribute super."irc-fun-client"; - "irc-fun-color" = dontDistribute super."irc-fun-color"; - "irc-fun-messages" = dontDistribute super."irc-fun-messages"; - "irc-fun-types" = dontDistribute super."irc-fun-types"; - "ircbot" = dontDistribute super."ircbot"; - "ircbouncer" = dontDistribute super."ircbouncer"; - "ireal" = dontDistribute super."ireal"; - "iridium" = dontDistribute super."iridium"; - "iron-mq" = dontDistribute super."iron-mq"; - "ironforge" = dontDistribute super."ironforge"; - "is" = dontDistribute super."is"; - "isdicom" = dontDistribute super."isdicom"; - "isevaluated" = dontDistribute super."isevaluated"; - "isiz" = dontDistribute super."isiz"; - "ismtp" = dontDistribute super."ismtp"; - "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; - "isobmff-builder" = dontDistribute super."isobmff-builder"; - "isohunt" = dontDistribute super."isohunt"; - "isotope" = dontDistribute super."isotope"; - "ispositive" = dontDistribute super."ispositive"; - "itanium-abi" = dontDistribute super."itanium-abi"; - "iter-stats" = dontDistribute super."iter-stats"; - "iterIO" = dontDistribute super."iterIO"; - "iteratee" = dontDistribute super."iteratee"; - "iteratee-compress" = dontDistribute super."iteratee-compress"; - "iteratee-mtl" = dontDistribute super."iteratee-mtl"; - "iteratee-parsec" = dontDistribute super."iteratee-parsec"; - "iteratee-stm" = dontDistribute super."iteratee-stm"; - "iterio-server" = dontDistribute super."iterio-server"; - "ivar-simple" = dontDistribute super."ivar-simple"; - "ivor" = dontDistribute super."ivor"; - "ivory" = dontDistribute super."ivory"; - "ivory-artifact" = dontDistribute super."ivory-artifact"; - "ivory-backend-c" = dontDistribute super."ivory-backend-c"; - "ivory-bitdata" = dontDistribute super."ivory-bitdata"; - "ivory-eval" = dontDistribute super."ivory-eval"; - "ivory-examples" = dontDistribute super."ivory-examples"; - "ivory-hw" = dontDistribute super."ivory-hw"; - "ivory-opts" = dontDistribute super."ivory-opts"; - "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; - "ivory-serialize" = dontDistribute super."ivory-serialize"; - "ivory-stdlib" = dontDistribute super."ivory-stdlib"; - "ivy-web" = dontDistribute super."ivy-web"; - "ixdopp" = dontDistribute super."ixdopp"; - "ixmonad" = dontDistribute super."ixmonad"; - "iyql" = dontDistribute super."iyql"; - "j2hs" = dontDistribute super."j2hs"; - "ja-base-extra" = dontDistribute super."ja-base-extra"; - "jack" = dontDistribute super."jack"; - "jack-bindings" = dontDistribute super."jack-bindings"; - "jackminimix" = dontDistribute super."jackminimix"; - "jacobi-roots" = dontDistribute super."jacobi-roots"; - "jail" = dontDistribute super."jail"; - "jalaali" = dontDistribute super."jalaali"; - "jalla" = dontDistribute super."jalla"; - "jammittools" = dontDistribute super."jammittools"; - "jarfind" = dontDistribute super."jarfind"; - "java-bridge" = dontDistribute super."java-bridge"; - "java-bridge-extras" = dontDistribute super."java-bridge-extras"; - "java-character" = dontDistribute super."java-character"; - "java-poker" = dontDistribute super."java-poker"; - "java-reflect" = dontDistribute super."java-reflect"; - "javaclass" = dontDistribute super."javaclass"; - "javasf" = dontDistribute super."javasf"; - "javav" = dontDistribute super."javav"; - "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; - "jdi" = dontDistribute super."jdi"; - "jespresso" = dontDistribute super."jespresso"; - "jmacro-rpc-snap" = dontDistribute super."jmacro-rpc-snap"; - "jobqueue" = dontDistribute super."jobqueue"; - "join" = dontDistribute super."join"; - "joinlist" = dontDistribute super."joinlist"; - "jonathanscard" = dontDistribute super."jonathanscard"; - "jort" = dontDistribute super."jort"; - "jpeg" = dontDistribute super."jpeg"; - "js-good-parts" = dontDistribute super."js-good-parts"; - "jsaddle" = dontDistribute super."jsaddle"; - "jsaddle-dom" = dontDistribute super."jsaddle-dom"; - "jsaddle-hello" = dontDistribute super."jsaddle-hello"; - "jsc" = dontDistribute super."jsc"; - "jsmw" = dontDistribute super."jsmw"; - "json-api" = dontDistribute super."json-api"; - "json-assertions" = dontDistribute super."json-assertions"; - "json-ast" = dontDistribute super."json-ast"; - "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder"; - "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; - "json-b" = dontDistribute super."json-b"; - "json-builder" = dontDistribute super."json-builder"; - "json-encoder" = dontDistribute super."json-encoder"; - "json-enumerator" = dontDistribute super."json-enumerator"; - "json-extra" = dontDistribute super."json-extra"; - "json-fu" = dontDistribute super."json-fu"; - "json-incremental-decoder" = dontDistribute super."json-incremental-decoder"; - "json-litobj" = dontDistribute super."json-litobj"; - "json-pointer" = dontDistribute super."json-pointer"; - "json-pointer-aeson" = dontDistribute super."json-pointer-aeson"; - "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; - "json-python" = dontDistribute super."json-python"; - "json-qq" = dontDistribute super."json-qq"; - "json-rpc" = dontDistribute super."json-rpc"; - "json-rpc-client" = dontDistribute super."json-rpc-client"; - "json-rpc-server" = dontDistribute super."json-rpc-server"; - "json-sop" = dontDistribute super."json-sop"; - "json-state" = dontDistribute super."json-state"; - "json-stream" = dontDistribute super."json-stream"; - "json-togo" = dontDistribute super."json-togo"; - "json-tools" = dontDistribute super."json-tools"; - "json-types" = dontDistribute super."json-types"; - "json2" = dontDistribute super."json2"; - "json2-hdbc" = dontDistribute super."json2-hdbc"; - "json2-types" = dontDistribute super."json2-types"; - "json2yaml" = dontDistribute super."json2yaml"; - "jsonresume" = dontDistribute super."jsonresume"; - "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; - "jsonschema-gen" = dontDistribute super."jsonschema-gen"; - "jsonsql" = dontDistribute super."jsonsql"; - "jsontsv" = dontDistribute super."jsontsv"; - "jspath" = dontDistribute super."jspath"; - "juandelacosa" = dontDistribute super."juandelacosa"; - "judy" = dontDistribute super."judy"; - "jukebox" = dontDistribute super."jukebox"; - "jump" = dontDistribute super."jump"; - "jumpthefive" = dontDistribute super."jumpthefive"; - "jupyter" = dontDistribute super."jupyter"; - "jvm-parser" = dontDistribute super."jvm-parser"; - "kademlia" = dontDistribute super."kademlia"; - "kafka-client" = dontDistribute super."kafka-client"; - "kaleidoscope" = dontDistribute super."kaleidoscope"; - "kangaroo" = dontDistribute super."kangaroo"; - "kanji" = dontDistribute super."kanji"; - "kansas-lava" = dontDistribute super."kansas-lava"; - "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; - "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; - "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; - "karakuri" = dontDistribute super."karakuri"; - "karver" = dontDistribute super."karver"; - "katip" = dontDistribute super."katip"; - "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; - "katt" = dontDistribute super."katt"; - "kawaii" = dontDistribute super."kawaii"; - "kazura-queue" = dontDistribute super."kazura-queue"; - "kbq-gu" = dontDistribute super."kbq-gu"; - "kd-tree" = dontDistribute super."kd-tree"; - "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; - "keenser" = dontDistribute super."keenser"; - "keera-callbacks" = dontDistribute super."keera-callbacks"; - "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; - "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; - "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; - "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; - "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; - "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; - "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; - "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; - "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; - "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; - "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; - "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; - "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; - "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; - "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; - "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; - "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; - "keera-posture" = dontDistribute super."keera-posture"; - "keiretsu" = dontDistribute super."keiretsu"; - "kevin" = dontDistribute super."kevin"; - "keyed" = dontDistribute super."keyed"; - "keyring" = dontDistribute super."keyring"; - "keysafe" = dontDistribute super."keysafe"; - "keystore" = dontDistribute super."keystore"; - "keyvaluehash" = dontDistribute super."keyvaluehash"; - "keyword-args" = dontDistribute super."keyword-args"; - "khph" = dontDistribute super."khph"; - "kibro" = dontDistribute super."kibro"; - "kicad-data" = dontDistribute super."kicad-data"; - "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; - "kickchan" = dontDistribute super."kickchan"; - "kif-parser" = dontDistribute super."kif-parser"; - "kinds" = dontDistribute super."kinds"; - "kit" = dontDistribute super."kit"; - "kmeans-par" = dontDistribute super."kmeans-par"; - "kmeans-vector" = dontDistribute super."kmeans-vector"; - "knead" = dontDistribute super."knead"; - "knead-arithmetic" = dontDistribute super."knead-arithmetic"; - "knots" = dontDistribute super."knots"; - "koellner-phonetic" = dontDistribute super."koellner-phonetic"; - "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; - "korfu" = dontDistribute super."korfu"; - "kqueue" = dontDistribute super."kqueue"; - "krpc" = dontDistribute super."krpc"; - "ks-test" = dontDistribute super."ks-test"; - "ktx" = dontDistribute super."ktx"; - "kure" = dontDistribute super."kure"; - "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; - "kyotocabinet" = dontDistribute super."kyotocabinet"; - "l-bfgs-b" = dontDistribute super."l-bfgs-b"; - "labeled-graph" = dontDistribute super."labeled-graph"; - "labeled-tree" = dontDistribute super."labeled-tree"; - "labels" = dontDistribute super."labels"; - "laborantin-hs" = dontDistribute super."laborantin-hs"; - "labyrinth" = dontDistribute super."labyrinth"; - "labyrinth-server" = dontDistribute super."labyrinth-server"; - "lagrangian" = dontDistribute super."lagrangian"; - "laika" = dontDistribute super."laika"; - "lambda-ast" = dontDistribute super."lambda-ast"; - "lambda-bridge" = dontDistribute super."lambda-bridge"; - "lambda-canvas" = dontDistribute super."lambda-canvas"; - "lambda-devs" = dontDistribute super."lambda-devs"; - "lambda-options" = dontDistribute super."lambda-options"; - "lambda-placeholders" = dontDistribute super."lambda-placeholders"; - "lambda-toolbox" = dontDistribute super."lambda-toolbox"; - "lambda2js" = dontDistribute super."lambda2js"; - "lambdaBase" = dontDistribute super."lambdaBase"; - "lambdaFeed" = dontDistribute super."lambdaFeed"; - "lambdaLit" = dontDistribute super."lambdaLit"; - "lambdabot" = dontDistribute super."lambdabot"; - "lambdabot-core" = dontDistribute super."lambdabot-core"; - "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins"; - "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins"; - "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins"; - "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins"; - "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins"; - "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins"; - "lambdabot-trusted" = dontDistribute super."lambdabot-trusted"; - "lambdabot-utils" = dontDistribute super."lambdabot-utils"; - "lambdacat" = dontDistribute super."lambdacat"; - "lambdacms-core" = dontDistribute super."lambdacms-core"; - "lambdacms-media" = dontDistribute super."lambdacms-media"; - "lambdacube" = dontDistribute super."lambdacube"; - "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; - "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; - "lambdacube-core" = dontDistribute super."lambdacube-core"; - "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; - "lambdacube-engine" = dontDistribute super."lambdacube-engine"; - "lambdacube-examples" = dontDistribute super."lambdacube-examples"; - "lambdacube-gl" = dontDistribute super."lambdacube-gl"; - "lambdacube-ir" = dontDistribute super."lambdacube-ir"; - "lambdacube-samples" = dontDistribute super."lambdacube-samples"; - "lambdatex" = dontDistribute super."lambdatex"; - "lambdatwit" = dontDistribute super."lambdatwit"; - "lambdaya-bus" = dontDistribute super."lambdaya-bus"; - "lambdiff" = dontDistribute super."lambdiff"; - "lame-tester" = dontDistribute super."lame-tester"; - "language-asn1" = dontDistribute super."language-asn1"; - "language-bash" = dontDistribute super."language-bash"; - "language-boogie" = dontDistribute super."language-boogie"; - "language-c-comments" = dontDistribute super."language-c-comments"; - "language-c-inline" = dontDistribute super."language-c-inline"; - "language-cil" = dontDistribute super."language-cil"; - "language-conf" = dontDistribute super."language-conf"; - "language-css" = dontDistribute super."language-css"; - "language-dart" = dontDistribute super."language-dart"; - "language-dot" = dontDistribute super."language-dot"; - "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; - "language-eiffel" = dontDistribute super."language-eiffel"; - "language-gcl" = dontDistribute super."language-gcl"; - "language-go" = dontDistribute super."language-go"; - "language-guess" = dontDistribute super."language-guess"; - "language-hcl" = dontDistribute super."language-hcl"; - "language-java-classfile" = dontDistribute super."language-java-classfile"; - "language-kort" = dontDistribute super."language-kort"; - "language-lua" = dontDistribute super."language-lua"; - "language-lua-qq" = dontDistribute super."language-lua-qq"; - "language-mixal" = dontDistribute super."language-mixal"; - "language-objc" = dontDistribute super."language-objc"; - "language-openscad" = dontDistribute super."language-openscad"; - "language-pig" = dontDistribute super."language-pig"; - "language-python" = dontDistribute super."language-python"; - "language-python-colour" = dontDistribute super."language-python-colour"; - "language-python-test" = dontDistribute super."language-python-test"; - "language-qux" = dontDistribute super."language-qux"; - "language-sh" = dontDistribute super."language-sh"; - "language-slice" = dontDistribute super."language-slice"; - "language-spelling" = dontDistribute super."language-spelling"; - "language-sqlite" = dontDistribute super."language-sqlite"; - "language-typescript" = dontDistribute super."language-typescript"; - "language-vhdl" = dontDistribute super."language-vhdl"; - "language-webidl" = dontDistribute super."language-webidl"; - "large-hashable" = dontDistribute super."large-hashable"; - "lat" = dontDistribute super."lat"; - "latest-npm-version" = dontDistribute super."latest-npm-version"; - "latex" = dontDistribute super."latex"; - "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll"; - "latex-formulae-image" = dontDistribute super."latex-formulae-image"; - "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; - "launchpad-control" = dontDistribute super."launchpad-control"; - "lax" = dontDistribute super."lax"; - "layers" = dontDistribute super."layers"; - "layers-game" = dontDistribute super."layers-game"; - "layout" = dontDistribute super."layout"; - "layout-bootstrap" = dontDistribute super."layout-bootstrap"; - "lazy-io" = dontDistribute super."lazy-io"; - "lazy-io-streams" = dontDistribute super."lazy-io-streams"; - "lazy-search" = dontDistribute super."lazy-search"; - "lazyarray" = dontDistribute super."lazyarray"; - "lazyio" = dontDistribute super."lazyio"; - "lazysmallcheck" = dontDistribute super."lazysmallcheck"; - "lazysplines" = dontDistribute super."lazysplines"; - "lbfgs" = dontDistribute super."lbfgs"; - "lcs" = dontDistribute super."lcs"; - "ld-intervals" = dontDistribute super."ld-intervals"; - "lda" = dontDistribute super."lda"; - "ldap-client" = dontDistribute super."ldap-client"; - "ldif" = dontDistribute super."ldif"; - "leaf" = dontDistribute super."leaf"; - "leaky" = dontDistribute super."leaky"; - "leancheck" = dontDistribute super."leancheck"; - "leankit-api" = dontDistribute super."leankit-api"; - "learn" = dontDistribute super."learn"; - "learn-physics" = dontDistribute super."learn-physics"; - "learn-physics-examples" = dontDistribute super."learn-physics-examples"; - "learning-hmm" = dontDistribute super."learning-hmm"; - "leetify" = dontDistribute super."leetify"; - "legion" = dontDistribute super."legion"; - "leksah" = dontDistribute super."leksah"; - "leksah-server" = dontDistribute super."leksah-server"; - "lendingclub" = dontDistribute super."lendingclub"; - "lens-prelude" = dontDistribute super."lens-prelude"; - "lens-properties" = dontDistribute super."lens-properties"; - "lens-sop" = dontDistribute super."lens-sop"; - "lens-text-encoding" = dontDistribute super."lens-text-encoding"; - "lens-time" = dontDistribute super."lens-time"; - "lens-tutorial" = dontDistribute super."lens-tutorial"; - "lens-utils" = dontDistribute super."lens-utils"; - "lenses" = dontDistribute super."lenses"; - "lensref" = dontDistribute super."lensref"; - "lentil" = dontDistribute super."lentil"; - "lenz" = dontDistribute super."lenz"; - "lenz-template" = dontDistribute super."lenz-template"; - "level-monad" = dontDistribute super."level-monad"; - "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; - "levmar" = dontDistribute super."levmar"; - "levmar-chart" = dontDistribute super."levmar-chart"; - "lfst" = dontDistribute super."lfst"; - "lgtk" = dontDistribute super."lgtk"; - "lha" = dontDistribute super."lha"; - "lhae" = dontDistribute super."lhae"; - "lhc" = dontDistribute super."lhc"; - "lhe" = dontDistribute super."lhe"; - "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; - "lhs2html" = dontDistribute super."lhs2html"; - "lhslatex" = dontDistribute super."lhslatex"; - "libGenI" = dontDistribute super."libGenI"; - "libarchive-conduit" = dontDistribute super."libarchive-conduit"; - "libconfig" = dontDistribute super."libconfig"; - "libcspm" = dontDistribute super."libcspm"; - "libexpect" = dontDistribute super."libexpect"; - "libffi" = dontDistribute super."libffi"; - "libgraph" = dontDistribute super."libgraph"; - "libhbb" = dontDistribute super."libhbb"; - "libjenkins" = dontDistribute super."libjenkins"; - "liblastfm" = dontDistribute super."liblastfm"; - "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; - "libltdl" = dontDistribute super."libltdl"; - "libnvvm" = dontDistribute super."libnvvm"; - "liboleg" = dontDistribute super."liboleg"; - "libpafe" = dontDistribute super."libpafe"; - "libpq" = dontDistribute super."libpq"; - "librandomorg" = dontDistribute super."librandomorg"; - "librato" = dontDistribute super."librato"; - "libravatar" = dontDistribute super."libravatar"; - "libroman" = dontDistribute super."libroman"; - "libssh2" = dontDistribute super."libssh2"; - "libssh2-conduit" = dontDistribute super."libssh2-conduit"; - "libstackexchange" = dontDistribute super."libstackexchange"; - "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; - "libsystemd-journal" = dontDistribute super."libsystemd-journal"; - "libtagc" = dontDistribute super."libtagc"; - "libvirt-hs" = dontDistribute super."libvirt-hs"; - "libvorbis" = dontDistribute super."libvorbis"; - "libxls" = dontDistribute super."libxls"; - "libxml" = dontDistribute super."libxml"; - "libxml-enumerator" = dontDistribute super."libxml-enumerator"; - "libxslt" = dontDistribute super."libxslt"; - "libzfs" = dontDistribute super."libzfs"; - "licensor" = dontDistribute super."licensor"; - "life" = dontDistribute super."life"; - "lifted-protolude" = dontDistribute super."lifted-protolude"; - "lifted-threads" = dontDistribute super."lifted-threads"; - "lifter" = dontDistribute super."lifter"; - "ligature" = dontDistribute super."ligature"; - "ligd" = dontDistribute super."ligd"; - "lighttpd-conf" = dontDistribute super."lighttpd-conf"; - "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; - "lilypond" = dontDistribute super."lilypond"; - "limp" = dontDistribute super."limp"; - "limp-cbc" = dontDistribute super."limp-cbc"; - "lin-alg" = dontDistribute super."lin-alg"; - "linda" = dontDistribute super."linda"; - "lindenmayer" = dontDistribute super."lindenmayer"; - "line-break" = dontDistribute super."line-break"; - "line2pdf" = dontDistribute super."line2pdf"; - "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; - "linear-circuit" = dontDistribute super."linear-circuit"; - "linear-grammar" = dontDistribute super."linear-grammar"; - "linear-maps" = dontDistribute super."linear-maps"; - "linear-opengl" = dontDistribute super."linear-opengl"; - "linear-vect" = dontDistribute super."linear-vect"; - "linearEqSolver" = dontDistribute super."linearEqSolver"; - "linearscan" = dontDistribute super."linearscan"; - "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; - "linebreak" = dontDistribute super."linebreak"; - "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; - "link-relations" = dontDistribute super."link-relations"; - "linkchk" = dontDistribute super."linkchk"; - "linkcore" = dontDistribute super."linkcore"; - "linkedhashmap" = dontDistribute super."linkedhashmap"; - "linklater" = dontDistribute super."linklater"; - "linode" = dontDistribute super."linode"; - "linode-v4" = dontDistribute super."linode-v4"; - "linux-blkid" = dontDistribute super."linux-blkid"; - "linux-cgroup" = dontDistribute super."linux-cgroup"; - "linux-evdev" = dontDistribute super."linux-evdev"; - "linux-inotify" = dontDistribute super."linux-inotify"; - "linux-kmod" = dontDistribute super."linux-kmod"; - "linux-mount" = dontDistribute super."linux-mount"; - "linux-perf" = dontDistribute super."linux-perf"; - "linux-ptrace" = dontDistribute super."linux-ptrace"; - "linux-xattr" = dontDistribute super."linux-xattr"; - "linx-gateway" = dontDistribute super."linx-gateway"; - "lio" = dontDistribute super."lio"; - "lio-eci11" = dontDistribute super."lio-eci11"; - "lio-fs" = dontDistribute super."lio-fs"; - "lio-simple" = dontDistribute super."lio-simple"; - "lipsum-gen" = dontDistribute super."lipsum-gen"; - "liquid" = dontDistribute super."liquid"; - "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; - "liquidhaskell" = dontDistribute super."liquidhaskell"; - "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal"; - "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo"; - "lispparser" = dontDistribute super."lispparser"; - "list-extras" = dontDistribute super."list-extras"; - "list-grouping" = dontDistribute super."list-grouping"; - "list-mux" = dontDistribute super."list-mux"; - "list-remote-forwards" = dontDistribute super."list-remote-forwards"; - "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; - "list-t-html-parser" = dontDistribute super."list-t-html-parser"; - "list-t-http-client" = dontDistribute super."list-t-http-client"; - "list-t-libcurl" = dontDistribute super."list-t-libcurl"; - "list-t-text" = dontDistribute super."list-t-text"; - "list-transformer" = dontDistribute super."list-transformer"; - "list-tries" = dontDistribute super."list-tries"; - "list-zip-def" = dontDistribute super."list-zip-def"; - "listlike-instances" = dontDistribute super."listlike-instances"; - "lists" = dontDistribute super."lists"; - "listsafe" = dontDistribute super."listsafe"; - "lit" = dontDistribute super."lit"; - "literals" = dontDistribute super."literals"; - "live-sequencer" = dontDistribute super."live-sequencer"; - "ll-picosat" = dontDistribute super."ll-picosat"; - "llrbtree" = dontDistribute super."llrbtree"; - "llsd" = dontDistribute super."llsd"; - "llvm" = dontDistribute super."llvm"; - "llvm-analysis" = dontDistribute super."llvm-analysis"; - "llvm-base" = dontDistribute super."llvm-base"; - "llvm-base-types" = dontDistribute super."llvm-base-types"; - "llvm-base-util" = dontDistribute super."llvm-base-util"; - "llvm-data-interop" = dontDistribute super."llvm-data-interop"; - "llvm-extra" = dontDistribute super."llvm-extra"; - "llvm-ffi" = dontDistribute super."llvm-ffi"; - "llvm-ffi-tools" = dontDistribute super."llvm-ffi-tools"; - "llvm-general" = dontDistribute super."llvm-general"; - "llvm-general-pure" = dontDistribute super."llvm-general-pure"; - "llvm-general-quote" = dontDistribute super."llvm-general-quote"; - "llvm-ht" = dontDistribute super."llvm-ht"; - "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; - "llvm-pretty" = dontDistribute super."llvm-pretty"; - "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; - "llvm-tf" = dontDistribute super."llvm-tf"; - "llvm-tools" = dontDistribute super."llvm-tools"; - "lmdb" = dontDistribute super."lmdb"; - "lmonad" = dontDistribute super."lmonad"; - "lmonad-yesod" = dontDistribute super."lmonad-yesod"; - "loadavg" = dontDistribute super."loadavg"; - "local-address" = dontDistribute super."local-address"; - "local-search" = dontDistribute super."local-search"; - "located" = dontDistribute super."located"; - "located-base" = dontDistribute super."located-base"; - "located-monad-logger" = dontDistribute super."located-monad-logger"; - "locators" = dontDistribute super."locators"; - "loch" = dontDistribute super."loch"; - "lock-file" = dontDistribute super."lock-file"; - "locked-poll" = dontDistribute super."locked-poll"; - "lockfree-queue" = dontDistribute super."lockfree-queue"; - "log" = dontDistribute super."log"; - "log-effect" = dontDistribute super."log-effect"; - "log2json" = dontDistribute super."log2json"; - "logentries" = dontDistribute super."logentries"; - "logger" = dontDistribute super."logger"; - "logging" = dontDistribute super."logging"; - "logging-effect" = dontDistribute super."logging-effect"; - "logging-facade-journald" = dontDistribute super."logging-facade-journald"; - "logic-TPTP" = dontDistribute super."logic-TPTP"; - "logic-classes" = dontDistribute super."logic-classes"; - "logicst" = dontDistribute super."logicst"; - "logict-state" = dontDistribute super."logict-state"; - "logplex-parse" = dontDistribute super."logplex-parse"; - "logsink" = dontDistribute super."logsink"; - "lojban" = dontDistribute super."lojban"; - "lojbanParser" = dontDistribute super."lojbanParser"; - "lojbanXiragan" = dontDistribute super."lojbanXiragan"; - "lojysamban" = dontDistribute super."lojysamban"; - "lol" = dontDistribute super."lol"; - "lol-apps" = dontDistribute super."lol-apps"; - "lol-calculus" = dontDistribute super."lol-calculus"; - "lol-typing" = dontDistribute super."lol-typing"; - "loli" = dontDistribute super."loli"; - "lookup-tables" = dontDistribute super."lookup-tables"; - "loop-effin" = dontDistribute super."loop-effin"; - "loop-while" = dontDistribute super."loop-while"; - "loops" = dontDistribute super."loops"; - "loopy" = dontDistribute super."loopy"; - "lord" = dontDistribute super."lord"; - "lorem" = dontDistribute super."lorem"; - "loris" = dontDistribute super."loris"; - "loshadka" = dontDistribute super."loshadka"; - "lostcities" = dontDistribute super."lostcities"; - "lowgl" = dontDistribute super."lowgl"; - "lp-diagrams" = dontDistribute super."lp-diagrams"; - "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; - "ls-usb" = dontDistribute super."ls-usb"; - "lscabal" = dontDistribute super."lscabal"; - "lss" = dontDistribute super."lss"; - "lsystem" = dontDistribute super."lsystem"; - "ltiv1p1" = dontDistribute super."ltiv1p1"; - "ltk" = dontDistribute super."ltk"; - "ltl" = dontDistribute super."ltl"; - "lua-bc" = dontDistribute super."lua-bc"; - "lua-bytecode" = dontDistribute super."lua-bytecode"; - "luachunk" = dontDistribute super."luachunk"; - "luautils" = dontDistribute super."luautils"; - "lub" = dontDistribute super."lub"; - "lucid-foundation" = dontDistribute super."lucid-foundation"; - "lucienne" = dontDistribute super."lucienne"; - "luhn" = dontDistribute super."luhn"; - "lui" = dontDistribute super."lui"; - "luis-client" = dontDistribute super."luis-client"; - "luka" = dontDistribute super."luka"; - "luminance" = dontDistribute super."luminance"; - "luminance-samples" = dontDistribute super."luminance-samples"; - "lushtags" = dontDistribute super."lushtags"; - "luthor" = dontDistribute super."luthor"; - "lvish" = dontDistribute super."lvish"; - "lvmlib" = dontDistribute super."lvmlib"; - "lvmrun" = dontDistribute super."lvmrun"; - "lxc" = dontDistribute super."lxc"; - "lye" = dontDistribute super."lye"; - "lz4" = dontDistribute super."lz4"; - "lzma" = dontDistribute super."lzma"; - "lzma-clib" = dontDistribute super."lzma-clib"; - "lzma-conduit" = dontDistribute super."lzma-conduit"; - "lzma-enumerator" = dontDistribute super."lzma-enumerator"; - "lzma-streams" = dontDistribute super."lzma-streams"; - "maam" = dontDistribute super."maam"; - "mac" = dontDistribute super."mac"; - "macbeth-lib" = dontDistribute super."macbeth-lib"; - "maccatcher" = dontDistribute super."maccatcher"; - "machinecell" = dontDistribute super."machinecell"; - "machines-binary" = dontDistribute super."machines-binary"; - "machines-directory" = dontDistribute super."machines-directory"; - "machines-io" = dontDistribute super."machines-io"; - "machines-process" = dontDistribute super."machines-process"; - "machines-zlib" = dontDistribute super."machines-zlib"; - "macho" = dontDistribute super."macho"; - "maclight" = dontDistribute super."maclight"; - "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; - "mage" = dontDistribute super."mage"; - "magico" = dontDistribute super."magico"; - "magma" = dontDistribute super."magma"; - "mahoro" = dontDistribute super."mahoro"; - "maid" = dontDistribute super."maid"; - "mailbox-count" = dontDistribute super."mailbox-count"; - "mailchimp" = dontDistribute super."mailchimp"; - "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; - "mailgun" = dontDistribute super."mailgun"; - "majordomo" = dontDistribute super."majordomo"; - "majority" = dontDistribute super."majority"; - "make-hard-links" = dontDistribute super."make-hard-links"; - "make-package" = dontDistribute super."make-package"; - "makedo" = dontDistribute super."makedo"; - "manatee" = dontDistribute super."manatee"; - "manatee-all" = dontDistribute super."manatee-all"; - "manatee-anything" = dontDistribute super."manatee-anything"; - "manatee-browser" = dontDistribute super."manatee-browser"; - "manatee-core" = dontDistribute super."manatee-core"; - "manatee-curl" = dontDistribute super."manatee-curl"; - "manatee-editor" = dontDistribute super."manatee-editor"; - "manatee-filemanager" = dontDistribute super."manatee-filemanager"; - "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; - "manatee-ircclient" = dontDistribute super."manatee-ircclient"; - "manatee-mplayer" = dontDistribute super."manatee-mplayer"; - "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; - "manatee-processmanager" = dontDistribute super."manatee-processmanager"; - "manatee-reader" = dontDistribute super."manatee-reader"; - "manatee-template" = dontDistribute super."manatee-template"; - "manatee-terminal" = dontDistribute super."manatee-terminal"; - "manatee-welcome" = dontDistribute super."manatee-welcome"; - "mancala" = dontDistribute super."mancala"; - "mandulia" = dontDistribute super."mandulia"; - "mangopay" = dontDistribute super."mangopay"; - "manifold-random" = dontDistribute super."manifold-random"; - "manifolds" = dontDistribute super."manifolds"; - "map-exts" = dontDistribute super."map-exts"; - "map-syntax" = dontDistribute super."map-syntax"; - "mappy" = dontDistribute super."mappy"; - "marionetta" = dontDistribute super."marionetta"; - "markdown-kate" = dontDistribute super."markdown-kate"; - "markdown-pap" = dontDistribute super."markdown-pap"; - "markdown2svg" = dontDistribute super."markdown2svg"; - "marked-pretty" = dontDistribute super."marked-pretty"; - "markov" = dontDistribute super."markov"; - "markov-chain" = dontDistribute super."markov-chain"; - "markov-processes" = dontDistribute super."markov-processes"; - "markup-preview" = dontDistribute super."markup-preview"; - "marmalade-upload" = dontDistribute super."marmalade-upload"; - "marquise" = dontDistribute super."marquise"; - "mars" = dontDistribute super."mars"; - "marxup" = dontDistribute super."marxup"; - "masakazu-bot" = dontDistribute super."masakazu-bot"; - "mastermind" = dontDistribute super."mastermind"; - "matcher" = dontDistribute super."matcher"; - "matchers" = dontDistribute super."matchers"; - "mathblog" = dontDistribute super."mathblog"; - "mathgenealogy" = dontDistribute super."mathgenealogy"; - "mathista" = dontDistribute super."mathista"; - "mathlink" = dontDistribute super."mathlink"; - "matlab" = dontDistribute super."matlab"; - "matrix-market" = dontDistribute super."matrix-market"; - "matrix-market-pure" = dontDistribute super."matrix-market-pure"; - "matsuri" = dontDistribute super."matsuri"; - "maude" = dontDistribute super."maude"; - "maxent" = dontDistribute super."maxent"; - "maxsharing" = dontDistribute super."maxsharing"; - "maybe-justify" = dontDistribute super."maybe-justify"; - "maybench" = dontDistribute super."maybench"; - "mbox-tools" = dontDistribute super."mbox-tools"; - "mcm" = dontDistribute super."mcm"; - "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; - "mcmc-samplers" = dontDistribute super."mcmc-samplers"; - "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; - "mcpi" = dontDistribute super."mcpi"; - "mdapi" = dontDistribute super."mdapi"; - "mdcat" = dontDistribute super."mdcat"; - "mdo" = dontDistribute super."mdo"; - "mdp" = dontDistribute super."mdp"; - "means" = dontDistribute super."means"; - "mecab" = dontDistribute super."mecab"; - "mech" = dontDistribute super."mech"; - "mecha" = dontDistribute super."mecha"; - "mechs" = dontDistribute super."mechs"; - "mediawiki" = dontDistribute super."mediawiki"; - "mediawiki2latex" = dontDistribute super."mediawiki2latex"; - "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; - "meep" = dontDistribute super."meep"; - "mega-sdist" = dontDistribute super."mega-sdist"; - "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"; - "memcache-haskell" = dontDistribute super."memcache-haskell"; - "memcached" = dontDistribute super."memcached"; - "memcached-binary" = dontDistribute super."memcached-binary"; - "memexml" = dontDistribute super."memexml"; - "memo-ptr" = dontDistribute super."memo-ptr"; - "memo-sqlite" = dontDistribute super."memo-sqlite"; - "memoization-utils" = dontDistribute super."memoization-utils"; - "memoize" = dontDistribute super."memoize"; - "memorypool" = dontDistribute super."memorypool"; - "memscript" = dontDistribute super."memscript"; - "merge-bash-history" = dontDistribute super."merge-bash-history"; - "messente" = dontDistribute super."messente"; - "meta-misc" = dontDistribute super."meta-misc"; - "meta-par" = dontDistribute super."meta-par"; - "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; - "metadata" = dontDistribute super."metadata"; - "metamorphic" = dontDistribute super."metamorphic"; - "metaplug" = dontDistribute super."metaplug"; - "metric" = dontDistribute super."metric"; - "metricsd-client" = dontDistribute super."metricsd-client"; - "metronome" = dontDistribute super."metronome"; - "mezzolens" = dontDistribute super."mezzolens"; - "mfsolve" = dontDistribute super."mfsolve"; - "mgeneric" = dontDistribute super."mgeneric"; - "mi" = dontDistribute super."mi"; - "microbench" = dontDistribute super."microbench"; - "microformats2-types" = dontDistribute super."microformats2-types"; - "microlens-each" = dontDistribute super."microlens-each"; - "micrologger" = dontDistribute super."micrologger"; - "microspec" = dontDistribute super."microspec"; - "microtimer" = dontDistribute super."microtimer"; - "mida" = dontDistribute super."mida"; - "midair" = dontDistribute super."midair"; - "midi" = dontDistribute super."midi"; - "midi-alsa" = dontDistribute super."midi-alsa"; - "midi-music-box" = dontDistribute super."midi-music-box"; - "midi-util" = dontDistribute super."midi-util"; - "midi-utils" = dontDistribute super."midi-utils"; - "midimory" = dontDistribute super."midimory"; - "midisurface" = dontDistribute super."midisurface"; - "mighttpd" = dontDistribute super."mighttpd"; - "mighttpd2" = dontDistribute super."mighttpd2"; - "mikmod" = dontDistribute super."mikmod"; - "mikrokosmos" = dontDistribute super."mikrokosmos"; - "miku" = dontDistribute super."miku"; - "milena" = dontDistribute super."milena"; - "mime" = dontDistribute super."mime"; - "mime-directory" = dontDistribute super."mime-directory"; - "mime-string" = dontDistribute super."mime-string"; - "minecraft-data" = dontDistribute super."minecraft-data"; - "mines" = dontDistribute super."mines"; - "minesweeper" = dontDistribute super."minesweeper"; - "miniball" = dontDistribute super."miniball"; - "miniforth" = dontDistribute super."miniforth"; - "minilens" = dontDistribute super."minilens"; - "minimal-configuration" = dontDistribute super."minimal-configuration"; - "minimorph" = dontDistribute super."minimorph"; - "minimung" = dontDistribute super."minimung"; - "minions" = dontDistribute super."minions"; - "minioperational" = dontDistribute super."minioperational"; - "miniplex" = dontDistribute super."miniplex"; - "minirotate" = dontDistribute super."minirotate"; - "minisat" = dontDistribute super."minisat"; - "ministg" = dontDistribute super."ministg"; - "miniutter" = dontDistribute super."miniutter"; - "minlen" = dontDistribute super."minlen"; - "minst-idx" = dontDistribute super."minst-idx"; - "mios" = dontDistribute super."mios"; - "mirror-tweet" = dontDistribute super."mirror-tweet"; - "missing-py2" = dontDistribute super."missing-py2"; - "mix-arrows" = dontDistribute super."mix-arrows"; - "mixed-strategies" = dontDistribute super."mixed-strategies"; - "mkbndl" = dontDistribute super."mkbndl"; - "mkcabal" = dontDistribute super."mkcabal"; - "ml-w" = dontDistribute super."ml-w"; - "mlist" = dontDistribute super."mlist"; - "mmtl" = dontDistribute super."mmtl"; - "mmtl-base" = dontDistribute super."mmtl-base"; - "mnist-idx" = dontDistribute super."mnist-idx"; - "moan" = dontDistribute super."moan"; - "modbus-tcp" = dontDistribute super."modbus-tcp"; - "modelicaparser" = dontDistribute super."modelicaparser"; - "modsplit" = dontDistribute super."modsplit"; - "modular-arithmetic" = dontDistribute super."modular-arithmetic"; - "modular-prelude" = dontDistribute super."modular-prelude"; - "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; - "module-management" = dontDistribute super."module-management"; - "modulespection" = dontDistribute super."modulespection"; - "modulo" = dontDistribute super."modulo"; - "moe" = dontDistribute super."moe"; - "mohws" = dontDistribute super."mohws"; - "mole" = dontDistribute super."mole"; - "mollie-api-haskell" = dontDistribute super."mollie-api-haskell"; - "monad-abort-fd" = dontDistribute super."monad-abort-fd"; - "monad-atom" = dontDistribute super."monad-atom"; - "monad-atom-simple" = dontDistribute super."monad-atom-simple"; - "monad-bool" = dontDistribute super."monad-bool"; - "monad-classes" = dontDistribute super."monad-classes"; - "monad-codec" = dontDistribute super."monad-codec"; - "monad-connect" = dontDistribute super."monad-connect"; - "monad-dijkstra" = dontDistribute super."monad-dijkstra"; - "monad-exception" = dontDistribute super."monad-exception"; - "monad-fork" = dontDistribute super."monad-fork"; - "monad-gen" = dontDistribute super."monad-gen"; - "monad-hash" = dontDistribute super."monad-hash"; - "monad-interleave" = dontDistribute super."monad-interleave"; - "monad-levels" = dontDistribute super."monad-levels"; - "monad-lgbt" = dontDistribute super."monad-lgbt"; - "monad-log" = dontDistribute super."monad-log"; - "monad-loops-stm" = dontDistribute super."monad-loops-stm"; - "monad-lrs" = dontDistribute super."monad-lrs"; - "monad-memo" = dontDistribute super."monad-memo"; - "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; - "monad-open" = dontDistribute super."monad-open"; - "monad-ox" = dontDistribute super."monad-ox"; - "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; - "monad-param" = dontDistribute super."monad-param"; - "monad-ran" = dontDistribute super."monad-ran"; - "monad-resumption" = dontDistribute super."monad-resumption"; - "monad-st" = dontDistribute super."monad-st"; - "monad-state" = dontDistribute super."monad-state"; - "monad-statevar" = dontDistribute super."monad-statevar"; - "monad-ste" = dontDistribute super."monad-ste"; - "monad-stlike-io" = dontDistribute super."monad-stlike-io"; - "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; - "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"; - "monadIO" = dontDistribute super."monadIO"; - "monadLib-compose" = dontDistribute super."monadLib-compose"; - "monadacme" = dontDistribute super."monadacme"; - "monadbi" = dontDistribute super."monadbi"; - "monadfibre" = dontDistribute super."monadfibre"; - "monadiccp" = dontDistribute super."monadiccp"; - "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; - "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; - "monadlist" = dontDistribute super."monadlist"; - "monadloc-pp" = dontDistribute super."monadloc-pp"; - "monads-fd" = dontDistribute super."monads-fd"; - "monadtransform" = dontDistribute super."monadtransform"; - "monarch" = dontDistribute super."monarch"; - "mondo" = dontDistribute super."mondo"; - "mongodb-queue" = dontDistribute super."mongodb-queue"; - "mongrel2-handler" = dontDistribute super."mongrel2-handler"; - "monitor" = dontDistribute super."monitor"; - "monky" = dontDistribute super."monky"; - "mono-foldable" = dontDistribute super."mono-foldable"; - "monoid-absorbing" = dontDistribute super."monoid-absorbing"; - "monoid-owns" = dontDistribute super."monoid-owns"; - "monoid-record" = dontDistribute super."monoid-record"; - "monoid-statistics" = dontDistribute super."monoid-statistics"; - "monoid-transformer" = dontDistribute super."monoid-transformer"; - "monoidplus" = dontDistribute super."monoidplus"; - "monoids" = dontDistribute super."monoids"; - "monomorphic" = dontDistribute super."monomorphic"; - "montage" = dontDistribute super."montage"; - "montage-client" = dontDistribute super."montage-client"; - "monte-carlo" = dontDistribute super."monte-carlo"; - "monzo" = dontDistribute super."monzo"; - "moo" = dontDistribute super."moo"; - "moonshine" = dontDistribute super."moonshine"; - "morfette" = dontDistribute super."morfette"; - "morfeusz" = dontDistribute super."morfeusz"; - "morph" = dontDistribute super."morph"; - "mosaico-lib" = dontDistribute super."mosaico-lib"; - "mount" = dontDistribute super."mount"; - "mp" = dontDistribute super."mp"; - "mp3decoder" = dontDistribute super."mp3decoder"; - "mpdmate" = dontDistribute super."mpdmate"; - "mpppc" = dontDistribute super."mpppc"; - "mpretty" = dontDistribute super."mpretty"; - "mpris" = dontDistribute super."mpris"; - "mprover" = dontDistribute super."mprover"; - "mps" = dontDistribute super."mps"; - "mpvguihs" = dontDistribute super."mpvguihs"; - "mqtt-hs" = dontDistribute super."mqtt-hs"; - "mrm" = dontDistribute super."mrm"; - "ms" = dontDistribute super."ms"; - "msgpack" = dontDistribute super."msgpack"; - "msgpack-aeson" = dontDistribute super."msgpack-aeson"; - "msgpack-idl" = dontDistribute super."msgpack-idl"; - "msgpack-rpc" = dontDistribute super."msgpack-rpc"; - "msh" = dontDistribute super."msh"; - "msi-kb-backlit" = dontDistribute super."msi-kb-backlit"; - "mstate" = dontDistribute super."mstate"; - "msu" = dontDistribute super."msu"; - "mtgoxapi" = dontDistribute super."mtgoxapi"; - "mtl-c" = dontDistribute super."mtl-c"; - "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; - "mtl-extras" = dontDistribute super."mtl-extras"; - "mtl-tf" = dontDistribute super."mtl-tf"; - "mtl-unleashed" = dontDistribute super."mtl-unleashed"; - "mtlparse" = dontDistribute super."mtlparse"; - "mtlx" = dontDistribute super."mtlx"; - "mtp" = dontDistribute super."mtp"; - "mtree" = dontDistribute super."mtree"; - "mucipher" = dontDistribute super."mucipher"; - "mudbath" = dontDistribute super."mudbath"; - "muesli" = dontDistribute super."muesli"; - "mueval" = dontDistribute super."mueval"; - "mulang" = dontDistribute super."mulang"; - "multext-east-msd" = dontDistribute super."multext-east-msd"; - "multi-cabal" = dontDistribute super."multi-cabal"; - "multiaddr" = dontDistribute super."multiaddr"; - "multifile" = dontDistribute super."multifile"; - "multifocal" = dontDistribute super."multifocal"; - "multihash" = dontDistribute super."multihash"; - "multipart-names" = dontDistribute super."multipart-names"; - "multipass" = dontDistribute super."multipass"; - "multiplate" = dontDistribute super."multiplate"; - "multiplate-simplified" = dontDistribute super."multiplate-simplified"; - "multiplicity" = dontDistribute super."multiplicity"; - "multirec" = dontDistribute super."multirec"; - "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; - "multirec-binary" = dontDistribute super."multirec-binary"; - "multisetrewrite" = dontDistribute super."multisetrewrite"; - "multistate" = dontDistribute super."multistate"; - "muon" = dontDistribute super."muon"; - "murder" = dontDistribute super."murder"; - "murmur" = dontDistribute super."murmur"; - "murmurhash3" = dontDistribute super."murmurhash3"; - "music-articulation" = dontDistribute super."music-articulation"; - "music-diatonic" = dontDistribute super."music-diatonic"; - "music-dynamics" = dontDistribute super."music-dynamics"; - "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; - "music-graphics" = dontDistribute super."music-graphics"; - "music-parts" = dontDistribute super."music-parts"; - "music-pitch" = dontDistribute super."music-pitch"; - "music-pitch-literal" = dontDistribute super."music-pitch-literal"; - "music-preludes" = dontDistribute super."music-preludes"; - "music-score" = dontDistribute super."music-score"; - "music-sibelius" = dontDistribute super."music-sibelius"; - "music-suite" = dontDistribute super."music-suite"; - "music-util" = dontDistribute super."music-util"; - "musicbrainz-email" = dontDistribute super."musicbrainz-email"; - "musicxml" = dontDistribute super."musicxml"; - "musicxml2" = dontDistribute super."musicxml2"; - "mustache-haskell" = dontDistribute super."mustache-haskell"; - "mustache2hs" = dontDistribute super."mustache2hs"; - "mutable-iter" = dontDistribute super."mutable-iter"; - "mute-unmute" = dontDistribute super."mute-unmute"; - "mvc" = dontDistribute super."mvc"; - "mvc-updates" = dontDistribute super."mvc-updates"; - "mvclient" = dontDistribute super."mvclient"; - "myTestlll" = dontDistribute super."myTestlll"; - "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; - "myo" = dontDistribute super."myo"; - "mysnapsession" = dontDistribute super."mysnapsession"; - "mysnapsession-example" = dontDistribute super."mysnapsession-example"; - "mysql" = dontDistribute super."mysql"; - "mysql-effect" = dontDistribute super."mysql-effect"; - "mysql-haskell" = dontDistribute super."mysql-haskell"; - "mysql-simple" = dontDistribute super."mysql-simple"; - "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; - "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; - "mystem" = dontDistribute super."mystem"; - "mywatch" = dontDistribute super."mywatch"; - "mzv" = dontDistribute super."mzv"; - "n-m" = dontDistribute super."n-m"; - "nagios-perfdata" = dontDistribute super."nagios-perfdata"; - "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; - "named-formlet" = dontDistribute super."named-formlet"; - "named-lock" = dontDistribute super."named-lock"; - "named-records" = dontDistribute super."named-records"; - "namelist" = dontDistribute super."namelist"; - "names" = dontDistribute super."names"; - "namespace" = dontDistribute super."namespace"; - "nano-cryptr" = dontDistribute super."nano-cryptr"; - "nano-hmac" = dontDistribute super."nano-hmac"; - "nano-md5" = dontDistribute super."nano-md5"; - "nanoAgda" = dontDistribute super."nanoAgda"; - "nanocurses" = dontDistribute super."nanocurses"; - "nanomsg" = dontDistribute super."nanomsg"; - "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; - "nanoparsec" = dontDistribute super."nanoparsec"; - "nanovg" = dontDistribute super."nanovg"; - "nanq" = dontDistribute super."nanq"; - "narc" = dontDistribute super."narc"; - "nat" = dontDistribute super."nat"; - "native" = dontDistribute super."native"; - "nats-queue" = dontDistribute super."nats-queue"; - "natural-number" = dontDistribute super."natural-number"; - "natural-numbers" = dontDistribute super."natural-numbers"; - "naturalcomp" = dontDistribute super."naturalcomp"; - "naturals" = dontDistribute super."naturals"; - "naver-translate" = dontDistribute super."naver-translate"; - "nbt" = dontDistribute super."nbt"; - "nc-indicators" = dontDistribute super."nc-indicators"; - "ncurses" = dontDistribute super."ncurses"; - "neat" = dontDistribute super."neat"; - "needle" = dontDistribute super."needle"; - "neet" = dontDistribute super."neet"; - "nehe-tuts" = dontDistribute super."nehe-tuts"; - "neil" = dontDistribute super."neil"; - "neither" = dontDistribute super."neither"; - "nemesis" = dontDistribute super."nemesis"; - "nemesis-titan" = dontDistribute super."nemesis-titan"; - "nerf" = dontDistribute super."nerf"; - "nero" = dontDistribute super."nero"; - "nero-wai" = dontDistribute super."nero-wai"; - "nero-warp" = dontDistribute super."nero-warp"; - "nested-routes" = dontDistribute super."nested-routes"; - "nested-sequence" = dontDistribute super."nested-sequence"; - "nested-sets" = dontDistribute super."nested-sets"; - "nestedmap" = dontDistribute super."nestedmap"; - "net-concurrent" = dontDistribute super."net-concurrent"; - "netclock" = dontDistribute super."netclock"; - "netcore" = dontDistribute super."netcore"; - "netlines" = dontDistribute super."netlines"; - "netlink" = dontDistribute super."netlink"; - "netlist" = dontDistribute super."netlist"; - "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; - "netrc" = dontDistribute super."netrc"; - "netspec" = dontDistribute super."netspec"; - "netstring-enumerator" = dontDistribute super."netstring-enumerator"; - "nettle-frp" = dontDistribute super."nettle-frp"; - "nettle-netkit" = dontDistribute super."nettle-netkit"; - "nettle-openflow" = dontDistribute super."nettle-openflow"; - "netwire" = dontDistribute super."netwire"; - "netwire-input" = dontDistribute super."netwire-input"; - "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; - "network-address" = dontDistribute super."network-address"; - "network-api-support" = dontDistribute super."network-api-support"; - "network-bitcoin" = dontDistribute super."network-bitcoin"; - "network-builder" = dontDistribute super."network-builder"; - "network-bytestring" = dontDistribute super."network-bytestring"; - "network-carbon" = dontDistribute super."network-carbon"; - "network-conduit" = dontDistribute super."network-conduit"; - "network-connection" = dontDistribute super."network-connection"; - "network-data" = dontDistribute super."network-data"; - "network-dbus" = dontDistribute super."network-dbus"; - "network-dns" = dontDistribute super."network-dns"; - "network-enumerator" = dontDistribute super."network-enumerator"; - "network-fancy" = dontDistribute super."network-fancy"; - "network-hans" = dontDistribute super."network-hans"; - "network-interfacerequest" = dontDistribute super."network-interfacerequest"; - "network-ip" = dontDistribute super."network-ip"; - "network-metrics" = dontDistribute super."network-metrics"; - "network-minihttp" = dontDistribute super."network-minihttp"; - "network-msg" = dontDistribute super."network-msg"; - "network-msgpack-rpc" = dontDistribute super."network-msgpack-rpc"; - "network-multicast" = dontDistribute super."network-multicast"; - "network-netpacket" = dontDistribute super."network-netpacket"; - "network-pgi" = dontDistribute super."network-pgi"; - "network-protocol-xmpp" = dontDistribute super."network-protocol-xmpp"; - "network-rpca" = dontDistribute super."network-rpca"; - "network-server" = dontDistribute super."network-server"; - "network-service" = dontDistribute super."network-service"; - "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; - "network-simple-tls" = dontDistribute super."network-simple-tls"; - "network-socket-options" = dontDistribute super."network-socket-options"; - "network-stream" = dontDistribute super."network-stream"; - "network-topic-models" = dontDistribute super."network-topic-models"; - "network-transport-amqp" = dontDistribute super."network-transport-amqp"; - "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; - "network-uri-static" = dontDistribute super."network-uri-static"; - "network-wai-router" = dontDistribute super."network-wai-router"; - "network-websocket" = dontDistribute super."network-websocket"; - "networked-game" = dontDistribute super."networked-game"; - "neural" = dontDistribute super."neural"; - "newports" = dontDistribute super."newports"; - "newsynth" = dontDistribute super."newsynth"; - "newt" = dontDistribute super."newt"; - "newtype-deriving" = dontDistribute super."newtype-deriving"; - "newtype-generics" = dontDistribute super."newtype-generics"; - "newtype-th" = dontDistribute super."newtype-th"; - "newtyper" = dontDistribute super."newtyper"; - "nextstep-plist" = dontDistribute super."nextstep-plist"; - "nf" = dontDistribute super."nf"; - "ngrams-loader" = dontDistribute super."ngrams-loader"; - "ngx-export" = dontDistribute super."ngx-export"; - "niagra" = dontDistribute super."niagra"; - "nibblestring" = dontDistribute super."nibblestring"; - "nicify" = dontDistribute super."nicify"; - "nicovideo-translator" = dontDistribute super."nicovideo-translator"; - "nikepub" = dontDistribute super."nikepub"; - "nimber" = dontDistribute super."nimber"; - "nist-beacon" = dontDistribute super."nist-beacon"; - "nitro" = dontDistribute super."nitro"; - "nix-eval" = dontDistribute super."nix-eval"; - "nixfromnpm" = dontDistribute super."nixfromnpm"; - "nixos-types" = dontDistribute super."nixos-types"; - "nkjp" = dontDistribute super."nkjp"; - "nlp-scores" = dontDistribute super."nlp-scores"; - "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; - "nm" = dontDistribute super."nm"; - "nme" = dontDistribute super."nme"; - "nntp" = dontDistribute super."nntp"; - "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; - "no-role-annots" = dontDistribute super."no-role-annots"; - "nofib-analyse" = dontDistribute super."nofib-analyse"; - "nofib-analyze" = dontDistribute super."nofib-analyze"; - "noise" = dontDistribute super."noise"; - "non-empty" = dontDistribute super."non-empty"; - "non-negative" = dontDistribute super."non-negative"; - "nondeterminism" = dontDistribute super."nondeterminism"; - "nonempty-alternative" = dontDistribute super."nonempty-alternative"; - "nonfree" = dontDistribute super."nonfree"; - "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; - "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; - "noodle" = dontDistribute super."noodle"; - "normaldistribution" = dontDistribute super."normaldistribution"; - "normalization-insensitive" = dontDistribute super."normalization-insensitive"; - "not-gloss" = dontDistribute super."not-gloss"; - "not-gloss-examples" = dontDistribute super."not-gloss-examples"; - "not-in-base" = dontDistribute super."not-in-base"; - "notcpp" = dontDistribute super."notcpp"; - "notmuch-haskell" = dontDistribute super."notmuch-haskell"; - "notmuch-web" = dontDistribute super."notmuch-web"; - "notzero" = dontDistribute super."notzero"; - "np-extras" = dontDistribute super."np-extras"; - "np-linear" = dontDistribute super."np-linear"; - "nptools" = dontDistribute super."nptools"; - "nth-prime" = dontDistribute super."nth-prime"; - "ntha" = dontDistribute super."ntha"; - "nthable" = dontDistribute super."nthable"; - "ntp-control" = dontDistribute super."ntp-control"; - "null-canvas" = dontDistribute super."null-canvas"; - "nullary" = dontDistribute super."nullary"; - "nullpipe" = dontDistribute super."nullpipe"; - "number" = dontDistribute super."number"; - "number-length" = dontDistribute super."number-length"; - "numbering" = dontDistribute super."numbering"; - "numerals" = dontDistribute super."numerals"; - "numerals-base" = dontDistribute super."numerals-base"; - "numeric-limits" = dontDistribute super."numeric-limits"; - "numeric-prelude" = dontDistribute super."numeric-prelude"; - "numeric-qq" = dontDistribute super."numeric-qq"; - "numeric-quest" = dontDistribute super."numeric-quest"; - "numeric-ranges" = dontDistribute super."numeric-ranges"; - "numeric-tools" = dontDistribute super."numeric-tools"; - "numericpeano" = dontDistribute super."numericpeano"; - "nums" = dontDistribute super."nums"; - "numtype" = dontDistribute super."numtype"; - "numtype-tf" = dontDistribute super."numtype-tf"; - "nurbs" = dontDistribute super."nurbs"; - "nvim-hs" = dontDistribute super."nvim-hs"; - "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; - "nyan" = dontDistribute super."nyan"; - "nylas" = dontDistribute super."nylas"; - "nymphaea" = dontDistribute super."nymphaea"; - "oanda-rest-api" = dontDistribute super."oanda-rest-api"; - "oauthenticated" = dontDistribute super."oauthenticated"; - "obdd" = dontDistribute super."obdd"; - "oberon0" = dontDistribute super."oberon0"; - "obj" = dontDistribute super."obj"; - "objectid" = dontDistribute super."objectid"; - "observable-sharing" = dontDistribute super."observable-sharing"; - "octohat" = dontDistribute super."octohat"; - "octopus" = dontDistribute super."octopus"; - "oculus" = dontDistribute super."oculus"; - "oden-go-packages" = dontDistribute super."oden-go-packages"; - "off-simple" = dontDistribute super."off-simple"; - "ogmarkup" = dontDistribute super."ogmarkup"; - "ohloh-hs" = dontDistribute super."ohloh-hs"; - "oi" = dontDistribute super."oi"; - "oidc-client" = dontDistribute super."oidc-client"; - "ois-input-manager" = dontDistribute super."ois-input-manager"; - "old-version" = dontDistribute super."old-version"; - "olwrapper" = dontDistribute super."olwrapper"; - "omaketex" = dontDistribute super."omaketex"; - "ombra" = dontDistribute super."ombra"; - "omega" = dontDistribute super."omega"; - "omnicodec" = dontDistribute super."omnicodec"; - "on-a-horse" = dontDistribute super."on-a-horse"; - "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; - "one-liner" = dontDistribute super."one-liner"; - "one-time-password" = dontDistribute super."one-time-password"; - "oneOfN" = dontDistribute super."oneOfN"; - "oneormore" = dontDistribute super."oneormore"; - "only" = dontDistribute super."only"; - "onu-course" = dontDistribute super."onu-course"; - "opaleye-classy" = dontDistribute super."opaleye-classy"; - "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; - "open-haddock" = dontDistribute super."open-haddock"; - "open-pandoc" = dontDistribute super."open-pandoc"; - "open-signals" = dontDistribute super."open-signals"; - "open-symbology" = dontDistribute super."open-symbology"; - "open-typerep" = dontDistribute super."open-typerep"; - "open-union" = dontDistribute super."open-union"; - "open-witness" = dontDistribute super."open-witness"; - "opencog-atomspace" = dontDistribute super."opencog-atomspace"; - "opencv-raw" = dontDistribute super."opencv-raw"; - "opendatatable" = dontDistribute super."opendatatable"; - "openexchangerates" = dontDistribute super."openexchangerates"; - "openflow" = dontDistribute super."openflow"; - "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; - "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; - "opengles" = dontDistribute super."opengles"; - "openid" = dontDistribute super."openid"; - "openpgp" = dontDistribute super."openpgp"; - "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; - "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; - "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; - "openssh-github-keys" = dontDistribute super."openssh-github-keys"; - "openssl-createkey" = dontDistribute super."openssl-createkey"; - "opentheory" = dontDistribute super."opentheory"; - "opentheory-bits" = dontDistribute super."opentheory-bits"; - "opentheory-byte" = dontDistribute super."opentheory-byte"; - "opentheory-char" = dontDistribute super."opentheory-char"; - "opentheory-divides" = dontDistribute super."opentheory-divides"; - "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; - "opentheory-parser" = dontDistribute super."opentheory-parser"; - "opentheory-prime" = dontDistribute super."opentheory-prime"; - "opentheory-primitive" = dontDistribute super."opentheory-primitive"; - "opentheory-probability" = dontDistribute super."opentheory-probability"; - "opentheory-stream" = dontDistribute super."opentheory-stream"; - "opentheory-unicode" = dontDistribute super."opentheory-unicode"; - "operational-alacarte" = dontDistribute super."operational-alacarte"; - "operational-extra" = dontDistribute super."operational-extra"; - "opml" = dontDistribute super."opml"; - "opn" = dontDistribute super."opn"; - "optimal-blocks" = dontDistribute super."optimal-blocks"; - "optimization" = dontDistribute super."optimization"; - "optimusprime" = dontDistribute super."optimusprime"; - "option" = dontDistribute super."option"; - "optional" = dontDistribute super."optional"; - "options-time" = dontDistribute super."options-time"; - "optparse-declarative" = dontDistribute super."optparse-declarative"; - "orc" = dontDistribute super."orc"; - "orchestrate" = dontDistribute super."orchestrate"; - "orchid" = dontDistribute super."orchid"; - "orchid-demo" = dontDistribute super."orchid-demo"; - "ord-adhoc" = dontDistribute super."ord-adhoc"; - "order-maintenance" = dontDistribute super."order-maintenance"; - "order-statistic-tree" = dontDistribute super."order-statistic-tree"; - "order-statistics" = dontDistribute super."order-statistics"; - "ordered" = dontDistribute super."ordered"; - "orders" = dontDistribute super."orders"; - "ordrea" = dontDistribute super."ordrea"; - "organize-imports" = dontDistribute super."organize-imports"; - "orgmode" = dontDistribute super."orgmode"; - "orgmode-parse" = dontDistribute super."orgmode-parse"; - "origami" = dontDistribute super."origami"; - "os-release" = dontDistribute super."os-release"; - "osc" = dontDistribute super."osc"; - "oscpacking" = dontDistribute super."oscpacking"; - "osm-conduit" = dontDistribute super."osm-conduit"; - "osm-download" = dontDistribute super."osm-download"; - "oso2pdf" = dontDistribute super."oso2pdf"; - "osx-ar" = dontDistribute super."osx-ar"; - "ot" = dontDistribute super."ot"; - "ottparse-pretty" = dontDistribute super."ottparse-pretty"; - "overture" = dontDistribute super."overture"; - "pack" = dontDistribute super."pack"; - "package-o-tron" = dontDistribute super."package-o-tron"; - "package-vt" = dontDistribute super."package-vt"; - "packed-dawg" = dontDistribute super."packed-dawg"; - "packedstring" = dontDistribute super."packedstring"; - "packer" = dontDistribute super."packer"; - "packman" = dontDistribute super."packman"; - "packunused" = dontDistribute super."packunused"; - "pacman-memcache" = dontDistribute super."pacman-memcache"; - "padKONTROL" = dontDistribute super."padKONTROL"; - "pagarme" = dontDistribute super."pagarme"; - "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; - "palindromes" = dontDistribute super."palindromes"; - "pam" = dontDistribute super."pam"; - "panda" = dontDistribute super."panda"; - "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; - "pandoc-crossref" = dontDistribute super."pandoc-crossref"; - "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; - "pandoc-include" = dontDistribute super."pandoc-include"; - "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; - "pandoc-lens" = dontDistribute super."pandoc-lens"; - "pandoc-placetable" = dontDistribute super."pandoc-placetable"; - "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; - "pandoc-unlit" = dontDistribute super."pandoc-unlit"; - "papa" = dontDistribute super."papa"; - "papa-base" = dontDistribute super."papa-base"; - "papa-include" = dontDistribute super."papa-include"; - "papa-lens" = dontDistribute super."papa-lens"; - "papa-prelude" = dontDistribute super."papa-prelude"; - "papa-prelude-core" = dontDistribute super."papa-prelude-core"; - "papa-prelude-lens" = dontDistribute super."papa-prelude-lens"; - "papa-prelude-semigroupoids" = dontDistribute super."papa-prelude-semigroupoids"; - "papa-prelude-semigroups" = dontDistribute super."papa-prelude-semigroups"; - "papillon" = dontDistribute super."papillon"; - "pappy" = dontDistribute super."pappy"; - "paprika" = dontDistribute super."paprika"; - "para" = dontDistribute super."para"; - "paragon" = dontDistribute super."paragon"; - "parallel-tasks" = dontDistribute super."parallel-tasks"; - "parallel-tree-search" = dontDistribute super."parallel-tree-search"; - "parameterized-data" = dontDistribute super."parameterized-data"; - "paranoia" = dontDistribute super."paranoia"; - "parco" = dontDistribute super."parco"; - "parco-attoparsec" = dontDistribute super."parco-attoparsec"; - "parco-parsec" = dontDistribute super."parco-parsec"; - "parcom-lib" = dontDistribute super."parcom-lib"; - "parconc-examples" = dontDistribute super."parconc-examples"; - "parport" = dontDistribute super."parport"; - "parse-dimacs" = dontDistribute super."parse-dimacs"; - "parse-help" = dontDistribute super."parse-help"; - "parsec-extra" = dontDistribute super."parsec-extra"; - "parsec-numbers" = dontDistribute super."parsec-numbers"; - "parsec-parsers" = dontDistribute super."parsec-parsers"; - "parsec-permutation" = dontDistribute super."parsec-permutation"; - "parsec-pratt" = dontDistribute super."parsec-pratt"; - "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; - "parsec-trace" = dontDistribute super."parsec-trace"; - "parsec-utils" = dontDistribute super."parsec-utils"; - "parsec1" = dontDistribute super."parsec1"; - "parsec2" = dontDistribute super."parsec2"; - "parsec3" = dontDistribute super."parsec3"; - "parsec3-numbers" = dontDistribute super."parsec3-numbers"; - "parsedate" = dontDistribute super."parsedate"; - "parseerror-eq" = dontDistribute super."parseerror-eq"; - "parsek" = dontDistribute super."parsek"; - "parsely" = dontDistribute super."parsely"; - "parser-helper" = dontDistribute super."parser-helper"; - "parser241" = dontDistribute super."parser241"; - "parsergen" = dontDistribute super."parsergen"; - "parsestar" = dontDistribute super."parsestar"; - "parsimony" = dontDistribute super."parsimony"; - "partage" = dontDistribute super."partage"; - "partial" = dontDistribute super."partial"; - "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; - "partial-lens" = dontDistribute super."partial-lens"; - "partial-uri" = dontDistribute super."partial-uri"; - "partly" = dontDistribute super."partly"; - "passage" = dontDistribute super."passage"; - "passwords" = dontDistribute super."passwords"; - "pasta" = dontDistribute super."pasta"; - "pastis" = dontDistribute super."pastis"; - "pasty" = dontDistribute super."pasty"; - "patch-combinators" = dontDistribute super."patch-combinators"; - "patch-image" = dontDistribute super."patch-image"; - "patches-vector" = dontDistribute super."patches-vector"; - "pathfinding" = dontDistribute super."pathfinding"; - "pathfindingcore" = dontDistribute super."pathfindingcore"; - "pathtype" = dontDistribute super."pathtype"; - "patronscraper" = dontDistribute super."patronscraper"; - "patterns" = dontDistribute super."patterns"; - "paymill" = dontDistribute super."paymill"; - "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; - "paypal-api" = dontDistribute super."paypal-api"; - "pb" = dontDistribute super."pb"; - "pbc4hs" = dontDistribute super."pbc4hs"; - "pcap-conduit" = dontDistribute super."pcap-conduit"; - "pcap-enumerator" = dontDistribute super."pcap-enumerator"; - "pcd-loader" = dontDistribute super."pcd-loader"; - "pcf" = dontDistribute super."pcf"; - "pcg-random" = dontDistribute super."pcg-random"; - "pcre-less" = dontDistribute super."pcre-less"; - "pcre-light-extra" = dontDistribute super."pcre-light-extra"; - "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; - "pdf2line" = dontDistribute super."pdf2line"; - "pdfsplit" = dontDistribute super."pdfsplit"; - "pdynload" = dontDistribute super."pdynload"; - "peakachu" = dontDistribute super."peakachu"; - "peano" = dontDistribute super."peano"; - "peano-inf" = dontDistribute super."peano-inf"; - "pec" = dontDistribute super."pec"; - "pecoff" = dontDistribute super."pecoff"; - "peg" = dontDistribute super."peg"; - "peggy" = dontDistribute super."peggy"; - "pell" = dontDistribute super."pell"; - "penn-treebank" = dontDistribute super."penn-treebank"; - "penny" = dontDistribute super."penny"; - "penny-bin" = dontDistribute super."penny-bin"; - "penny-lib" = dontDistribute super."penny-lib"; - "peparser" = dontDistribute super."peparser"; - "perceptron" = dontDistribute super."perceptron"; - "perdure" = dontDistribute super."perdure"; - "perfecthash" = dontDistribute super."perfecthash"; - "period" = dontDistribute super."period"; - "periodic" = dontDistribute super."periodic"; - "perm" = dontDistribute super."perm"; - "permute" = dontDistribute super."permute"; - "persist2er" = dontDistribute super."persist2er"; - "persistent-audit" = dontDistribute super."persistent-audit"; - "persistent-cereal" = dontDistribute super."persistent-cereal"; - "persistent-database-url" = dontDistribute super."persistent-database-url"; - "persistent-equivalence" = dontDistribute super."persistent-equivalence"; - "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; - "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; - "persistent-iproute" = dontDistribute super."persistent-iproute"; - "persistent-map" = dontDistribute super."persistent-map"; - "persistent-mongoDB" = dontDistribute super."persistent-mongoDB"; - "persistent-mysql" = dontDistribute super."persistent-mysql"; - "persistent-odbc" = dontDistribute super."persistent-odbc"; - "persistent-parser" = dontDistribute super."persistent-parser"; - "persistent-protobuf" = dontDistribute super."persistent-protobuf"; - "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; - "persistent-vector" = dontDistribute super."persistent-vector"; - "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; - "persona" = dontDistribute super."persona"; - "persona-idp" = dontDistribute super."persona-idp"; - "pesca" = dontDistribute super."pesca"; - "peyotls" = dontDistribute super."peyotls"; - "peyotls-codec" = dontDistribute super."peyotls-codec"; - "pez" = dontDistribute super."pez"; - "pg-harness" = dontDistribute super."pg-harness"; - "pg-harness-client" = dontDistribute super."pg-harness-client"; - "pg-harness-server" = dontDistribute super."pg-harness-server"; - "pg-store" = dontDistribute super."pg-store"; - "pgdl" = dontDistribute super."pgdl"; - "pgm" = dontDistribute super."pgm"; - "pgsql-simple" = dontDistribute super."pgsql-simple"; - "pgstream" = dontDistribute super."pgstream"; - "phasechange" = dontDistribute super."phasechange"; - "phash" = dontDistribute super."phash"; - "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"; - "phooey" = dontDistribute super."phooey"; - "photoname" = dontDistribute super."photoname"; - "phraskell" = dontDistribute super."phraskell"; - "phybin" = dontDistribute super."phybin"; - "pi-calculus" = dontDistribute super."pi-calculus"; - "pi-forall" = dontDistribute super."pi-forall"; - "pia-forward" = dontDistribute super."pia-forward"; - "pianola" = dontDistribute super."pianola"; - "picologic" = dontDistribute super."picologic"; - "picosat" = dontDistribute super."picosat"; - "piet" = dontDistribute super."piet"; - "piki" = dontDistribute super."piki"; - "pipe-enumerator" = dontDistribute super."pipe-enumerator"; - "pipeclip" = dontDistribute super."pipeclip"; - "pipes-async" = dontDistribute super."pipes-async"; - "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; - "pipes-binary" = dontDistribute super."pipes-binary"; - "pipes-bzip" = dontDistribute super."pipes-bzip"; - "pipes-cellular" = dontDistribute super."pipes-cellular"; - "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; - "pipes-cereal" = dontDistribute super."pipes-cereal"; - "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; - "pipes-conduit" = dontDistribute super."pipes-conduit"; - "pipes-core" = dontDistribute super."pipes-core"; - "pipes-courier" = dontDistribute super."pipes-courier"; - "pipes-errors" = dontDistribute super."pipes-errors"; - "pipes-extra" = dontDistribute super."pipes-extra"; - "pipes-files" = dontDistribute super."pipes-files"; - "pipes-interleave" = dontDistribute super."pipes-interleave"; - "pipes-io" = dontDistribute super."pipes-io"; - "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv"; - "pipes-lzma" = dontDistribute super."pipes-lzma"; - "pipes-network-tls" = dontDistribute super."pipes-network-tls"; - "pipes-p2p" = dontDistribute super."pipes-p2p"; - "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; - "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; - "pipes-protolude" = dontDistribute super."pipes-protolude"; - "pipes-rt" = dontDistribute super."pipes-rt"; - "pipes-s3" = dontDistribute super."pipes-s3"; - "pipes-shell" = dontDistribute super."pipes-shell"; - "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; - "pipes-transduce" = dontDistribute super."pipes-transduce"; - "pipes-vector" = dontDistribute super."pipes-vector"; - "pipes-websockets" = dontDistribute super."pipes-websockets"; - "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; - "pipes-zlib" = dontDistribute super."pipes-zlib"; - "pisigma" = dontDistribute super."pisigma"; - "pit" = dontDistribute super."pit"; - "pitchtrack" = dontDistribute super."pitchtrack"; - "pivotal-tracker" = dontDistribute super."pivotal-tracker"; - "pkcs1" = dontDistribute super."pkcs1"; - "pkcs7" = dontDistribute super."pkcs7"; - "pkggraph" = dontDistribute super."pkggraph"; - "pktree" = dontDistribute super."pktree"; - "plailude" = dontDistribute super."plailude"; - "planar-graph" = dontDistribute super."planar-graph"; - "plat" = dontDistribute super."plat"; - "playlists" = dontDistribute super."playlists"; - "plist" = dontDistribute super."plist"; - "plist-buddy" = dontDistribute super."plist-buddy"; - "plivo" = dontDistribute super."plivo"; - "plot" = dontDistribute super."plot"; - "plot-gtk" = dontDistribute super."plot-gtk"; - "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; - "plot-gtk3" = dontDistribute super."plot-gtk3"; - "plot-lab" = dontDistribute super."plot-lab"; - "plotfont" = dontDistribute super."plotfont"; - "plotserver-api" = dontDistribute super."plotserver-api"; - "plugins" = dontDistribute super."plugins"; - "plugins-auto" = dontDistribute super."plugins-auto"; - "plugins-multistage" = dontDistribute super."plugins-multistage"; - "plumbers" = dontDistribute super."plumbers"; - "ply-loader" = dontDistribute super."ply-loader"; - "png-file" = dontDistribute super."png-file"; - "pngload" = dontDistribute super."pngload"; - "pngload-fixed" = dontDistribute super."pngload-fixed"; - "pnm" = dontDistribute super."pnm"; - "pocket-dns" = dontDistribute super."pocket-dns"; - "pointedalternative" = dontDistribute super."pointedalternative"; - "pointfree" = dontDistribute super."pointfree"; - "pointless-haskell" = dontDistribute super."pointless-haskell"; - "pointless-lenses" = dontDistribute super."pointless-lenses"; - "pointless-rewrite" = dontDistribute super."pointless-rewrite"; - "pokemon-go-protobuf-types" = dontDistribute super."pokemon-go-protobuf-types"; - "poker-eval" = dontDistribute super."poker-eval"; - "pokitdok" = dontDistribute super."pokitdok"; - "polar" = dontDistribute super."polar"; - "polar-configfile" = dontDistribute super."polar-configfile"; - "polar-shader" = dontDistribute super."polar-shader"; - "polh-lexicon" = dontDistribute super."polh-lexicon"; - "polimorf" = dontDistribute super."polimorf"; - "poll" = dontDistribute super."poll"; - "poly-arity" = dontDistribute super."poly-arity"; - "poly-control" = dontDistribute super."poly-control"; - "polyToMonoid" = dontDistribute super."polyToMonoid"; - "polymap" = dontDistribute super."polymap"; - "polynom" = dontDistribute super."polynom"; - "polynomial" = dontDistribute super."polynomial"; - "polyseq" = dontDistribute super."polyseq"; - "polysoup" = dontDistribute super."polysoup"; - "polytypeable" = dontDistribute super."polytypeable"; - "polytypeable-utils" = dontDistribute super."polytypeable-utils"; - "pomodoro" = dontDistribute super."pomodoro"; - "ponder" = dontDistribute super."ponder"; - "pong-server" = dontDistribute super."pong-server"; - "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; - "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; - "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; - "pony" = dontDistribute super."pony"; - "pool" = dontDistribute super."pool"; - "pool-conduit" = dontDistribute super."pool-conduit"; - "pooled-io" = dontDistribute super."pooled-io"; - "pop3-client" = dontDistribute super."pop3-client"; - "popenhs" = dontDistribute super."popenhs"; - "poppler" = dontDistribute super."poppler"; - "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; - "portable-lines" = dontDistribute super."portable-lines"; - "portaudio" = dontDistribute super."portaudio"; - "porte" = dontDistribute super."porte"; - "porter" = dontDistribute super."porter"; - "ports" = dontDistribute super."ports"; - "ports-tools" = dontDistribute super."ports-tools"; - "positive" = dontDistribute super."positive"; - "posix-acl" = dontDistribute super."posix-acl"; - "posix-error-codes" = dontDistribute super."posix-error-codes"; - "posix-escape" = dontDistribute super."posix-escape"; - "posix-filelock" = dontDistribute super."posix-filelock"; - "posix-paths" = dontDistribute super."posix-paths"; - "posix-pty" = dontDistribute super."posix-pty"; - "posix-timer" = dontDistribute super."posix-timer"; - "posix-waitpid" = dontDistribute super."posix-waitpid"; - "possible" = dontDistribute super."possible"; - "postcodes" = dontDistribute super."postcodes"; - "postgres-tmp" = dontDistribute super."postgres-tmp"; - "postgresql-config" = dontDistribute super."postgresql-config"; - "postgresql-connector" = dontDistribute super."postgresql-connector"; - "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; - "postgresql-cube" = dontDistribute super."postgresql-cube"; - "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; - "postgresql-orm" = dontDistribute super."postgresql-orm"; - "postgresql-simple-bind" = dontDistribute super."postgresql-simple-bind"; - "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; - "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; - "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; - "postgresql-typed" = dontDistribute super."postgresql-typed"; - "postgrest" = dontDistribute super."postgrest"; - "postgrest-ws" = dontDistribute super."postgrest-ws"; - "postie" = dontDistribute super."postie"; - "postmark" = dontDistribute super."postmark"; - "postmaster" = dontDistribute super."postmaster"; - "potato-tool" = dontDistribute super."potato-tool"; - "potrace" = dontDistribute super."potrace"; - "potrace-diagrams" = dontDistribute super."potrace-diagrams"; - "powermate" = dontDistribute super."powermate"; - "powerpc" = dontDistribute super."powerpc"; - "ppm" = dontDistribute super."ppm"; - "pqc" = dontDistribute super."pqc"; - "pqueue" = dontDistribute super."pqueue"; - "pqueue-mtl" = dontDistribute super."pqueue-mtl"; - "practice-room" = dontDistribute super."practice-room"; - "precis" = dontDistribute super."precis"; - "pred-trie" = dontDistribute super."pred-trie"; - "predicates" = dontDistribute super."predicates"; - "predictive" = dontDistribute super."predictive"; - "prednote-test" = dontDistribute super."prednote-test"; - "prefork" = dontDistribute super."prefork"; - "pregame" = dontDistribute super."pregame"; - "preliminaries" = dontDistribute super."preliminaries"; - "prelude-compat" = dontDistribute super."prelude-compat"; - "prelude-edsl" = dontDistribute super."prelude-edsl"; - "prelude-generalize" = dontDistribute super."prelude-generalize"; - "prelude-plus" = dontDistribute super."prelude-plus"; - "prelude-prime" = dontDistribute super."prelude-prime"; - "prelude2010" = dontDistribute super."prelude2010"; - "preprocess-haskell" = dontDistribute super."preprocess-haskell"; - "preprocessor" = dontDistribute super."preprocessor"; - "present" = dontDistribute super."present"; - "press" = dontDistribute super."press"; - "presto-hdbc" = dontDistribute super."presto-hdbc"; - "prettify" = dontDistribute super."prettify"; - "pretty-compact" = dontDistribute super."pretty-compact"; - "pretty-error" = dontDistribute super."pretty-error"; - "pretty-ncols" = dontDistribute super."pretty-ncols"; - "pretty-sop" = dontDistribute super."pretty-sop"; - "pretty-tree" = dontDistribute super."pretty-tree"; - "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; - "prim-spoon" = dontDistribute super."prim-spoon"; - "prim-uniq" = dontDistribute super."prim-uniq"; - "primitive-simd" = dontDistribute super."primitive-simd"; - "primula-board" = dontDistribute super."primula-board"; - "primula-bot" = dontDistribute super."primula-bot"; - "pringletons" = dontDistribute super."pringletons"; - "print-debugger" = dontDistribute super."print-debugger"; - "printf-mauke" = dontDistribute super."printf-mauke"; - "printf-safe" = dontDistribute super."printf-safe"; - "printxosd" = dontDistribute super."printxosd"; - "priority-queue" = dontDistribute super."priority-queue"; - "priority-sync" = dontDistribute super."priority-sync"; - "privileged-concurrency" = dontDistribute super."privileged-concurrency"; - "prizm" = dontDistribute super."prizm"; - "probability" = dontDistribute super."probability"; - "probable" = dontDistribute super."probable"; - "proc" = dontDistribute super."proc"; - "proc-net" = dontDistribute super."proc-net"; - "process-conduit" = dontDistribute super."process-conduit"; - "process-iterio" = dontDistribute super."process-iterio"; - "process-leksah" = dontDistribute super."process-leksah"; - "process-listlike" = dontDistribute super."process-listlike"; - "process-progress" = dontDistribute super."process-progress"; - "process-qq" = dontDistribute super."process-qq"; - "process-streaming" = dontDistribute super."process-streaming"; - "processing" = dontDistribute super."processing"; - "processing-for-haskell" = dontDistribute super."processing-for-haskell"; - "processor-creative-kit" = dontDistribute super."processor-creative-kit"; - "procrastinating-structure" = dontDistribute super."procrastinating-structure"; - "procrastinating-variable" = dontDistribute super."procrastinating-variable"; - "procstat" = dontDistribute super."procstat"; - "proctest" = dontDistribute super."proctest"; - "prof2dot" = dontDistribute super."prof2dot"; - "prof2pretty" = dontDistribute super."prof2pretty"; - "progress" = dontDistribute super."progress"; - "progressbar" = dontDistribute super."progressbar"; - "progression" = dontDistribute super."progression"; - "progressive" = dontDistribute super."progressive"; - "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; - "projection" = dontDistribute super."projection"; - "prolog" = dontDistribute super."prolog"; - "prolog-graph" = dontDistribute super."prolog-graph"; - "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; - "prologue" = dontDistribute super."prologue"; - "prometheus" = dontDistribute super."prometheus"; - "promise" = dontDistribute super."promise"; - "promises" = dontDistribute super."promises"; - "propane" = dontDistribute super."propane"; - "propellor" = dontDistribute super."propellor"; - "properties" = dontDistribute super."properties"; - "property-list" = dontDistribute super."property-list"; - "proplang" = dontDistribute super."proplang"; - "props" = dontDistribute super."props"; - "prosper" = dontDistribute super."prosper"; - "proteaaudio" = dontDistribute super."proteaaudio"; - "proto-lens" = dontDistribute super."proto-lens"; - "proto-lens-arbitrary" = dontDistribute super."proto-lens-arbitrary"; - "proto-lens-combinators" = dontDistribute super."proto-lens-combinators"; - "proto-lens-optparse" = dontDistribute super."proto-lens-optparse"; - "proto-lens-protoc" = dontDistribute super."proto-lens-protoc"; - "protobuf-native" = dontDistribute super."protobuf-native"; - "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; - "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; - "proton-haskell" = dontDistribute super."proton-haskell"; - "prototype" = dontDistribute super."prototype"; - "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; - "proxy-kindness" = dontDistribute super."proxy-kindness"; - "psc-ide" = dontDistribute super."psc-ide"; - "pseudo-boolean" = dontDistribute super."pseudo-boolean"; - "pseudo-trie" = dontDistribute super."pseudo-trie"; - "pseudomacros" = dontDistribute super."pseudomacros"; - "psi" = dontDistribute super."psi"; - "pstemmer" = dontDistribute super."pstemmer"; - "pub" = dontDistribute super."pub"; - "publicsuffixlist" = dontDistribute super."publicsuffixlist"; - "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; - "pubnub" = dontDistribute super."pubnub"; - "pubsub" = dontDistribute super."pubsub"; - "puffytools" = dontDistribute super."puffytools"; - "pugixml" = dontDistribute super."pugixml"; - "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; - "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; - "pugs-compat" = dontDistribute super."pugs-compat"; - "pugs-hsregex" = dontDistribute super."pugs-hsregex"; - "pulse" = dontDistribute super."pulse"; - "pulse-simple" = dontDistribute super."pulse-simple"; - "pulseaudio" = dontDistribute super."pulseaudio"; - "punkt" = dontDistribute super."punkt"; - "punycode" = dontDistribute super."punycode"; - "puppetresources" = dontDistribute super."puppetresources"; - "pure-fft" = dontDistribute super."pure-fft"; - "pure-priority-queue" = dontDistribute super."pure-priority-queue"; - "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; - "pure-zlib" = dontDistribute super."pure-zlib"; - "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; - "pursuit-client" = dontDistribute super."pursuit-client"; - "push-notify" = dontDistribute super."push-notify"; - "push-notify-ccs" = dontDistribute super."push-notify-ccs"; - "push-notify-general" = dontDistribute super."push-notify-general"; - "pusher-haskell" = dontDistribute super."pusher-haskell"; - "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; - "pusher-ws" = dontDistribute super."pusher-ws"; - "pushme" = dontDistribute super."pushme"; - "putlenses" = dontDistribute super."putlenses"; - "puzzle-draw" = dontDistribute super."puzzle-draw"; - "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; - "pvd" = dontDistribute super."pvd"; - "pwstore-cli" = dontDistribute super."pwstore-cli"; - "pxsl-tools" = dontDistribute super."pxsl-tools"; - "pyffi" = dontDistribute super."pyffi"; - "pyfi" = dontDistribute super."pyfi"; - "python-pickle" = dontDistribute super."python-pickle"; - "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; - "qd" = dontDistribute super."qd"; - "qd-vec" = dontDistribute super."qd-vec"; - "qed" = dontDistribute super."qed"; - "qhull-simple" = dontDistribute super."qhull-simple"; - "qrcode" = dontDistribute super."qrcode"; - "qt" = dontDistribute super."qt"; - "qtah-cpp-qt5" = dontDistribute super."qtah-cpp-qt5"; - "qtah-examples" = dontDistribute super."qtah-examples"; - "qtah-generator" = dontDistribute super."qtah-generator"; - "qtah-qt5" = dontDistribute super."qtah-qt5"; - "quack" = dontDistribute super."quack"; - "quadratic-irrational" = dontDistribute super."quadratic-irrational"; - "quandl-api" = dontDistribute super."quandl-api"; - "quantfin" = dontDistribute super."quantfin"; - "quantities" = dontDistribute super."quantities"; - "quantum-arrow" = dontDistribute super."quantum-arrow"; - "qudb" = dontDistribute super."qudb"; - "quenya-verb" = dontDistribute super."quenya-verb"; - "querystring-pickle" = dontDistribute super."querystring-pickle"; - "queue" = dontDistribute super."queue"; - "queuelike" = dontDistribute super."queuelike"; - "quick-generator" = dontDistribute super."quick-generator"; - "quick-schema" = dontDistribute super."quick-schema"; - "quickbooks" = dontDistribute super."quickbooks"; - "quickcheck-poly" = dontDistribute super."quickcheck-poly"; - "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; - "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; - "quickcheck-regex" = dontDistribute super."quickcheck-regex"; - "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; - "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; - "quickcheck-script" = dontDistribute super."quickcheck-script"; - "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; - "quicklz" = dontDistribute super."quicklz"; - "quickpull" = dontDistribute super."quickpull"; - "quickset" = dontDistribute super."quickset"; - "quickspec" = dontDistribute super."quickspec"; - "quickterm" = dontDistribute super."quickterm"; - "quicktest" = dontDistribute super."quicktest"; - "quickwebapp" = dontDistribute super."quickwebapp"; - "quipper" = dontDistribute super."quipper"; - "quiver" = dontDistribute super."quiver"; - "quiver-binary" = dontDistribute super."quiver-binary"; - "quiver-bytestring" = dontDistribute super."quiver-bytestring"; - "quiver-cell" = dontDistribute super."quiver-cell"; - "quiver-csv" = dontDistribute super."quiver-csv"; - "quiver-enumerator" = dontDistribute super."quiver-enumerator"; - "quiver-groups" = dontDistribute super."quiver-groups"; - "quiver-http" = dontDistribute super."quiver-http"; - "quiver-instances" = dontDistribute super."quiver-instances"; - "quiver-interleave" = dontDistribute super."quiver-interleave"; - "quiver-sort" = dontDistribute super."quiver-sort"; - "quoridor-hs" = dontDistribute super."quoridor-hs"; - "qux" = dontDistribute super."qux"; - "raaz" = dontDistribute super."raaz"; - "rabocsv2qif" = dontDistribute super."rabocsv2qif"; - "rad" = dontDistribute super."rad"; - "radian" = dontDistribute super."radian"; - "radium" = dontDistribute super."radium"; - "radium-formula-parser" = dontDistribute super."radium-formula-parser"; - "radix" = dontDistribute super."radix"; - "rados-haskell" = dontDistribute super."rados-haskell"; - "raft" = dontDistribute super."raft"; - "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; - "rainbow-tests" = dontDistribute super."rainbow-tests"; - "rake" = dontDistribute super."rake"; - "rakhana" = dontDistribute super."rakhana"; - "ralist" = dontDistribute super."ralist"; - "rallod" = dontDistribute super."rallod"; - "raml" = dontDistribute super."raml"; - "rand-vars" = dontDistribute super."rand-vars"; - "randfile" = dontDistribute super."randfile"; - "random-access-list" = dontDistribute super."random-access-list"; - "random-derive" = dontDistribute super."random-derive"; - "random-eff" = dontDistribute super."random-eff"; - "random-effin" = dontDistribute super."random-effin"; - "random-extras" = dontDistribute super."random-extras"; - "random-fu-multivariate" = dontDistribute super."random-fu-multivariate"; - "random-hypergeometric" = dontDistribute super."random-hypergeometric"; - "random-stream" = dontDistribute super."random-stream"; - "random-strings" = dontDistribute super."random-strings"; - "random-variates" = dontDistribute super."random-variates"; - "randomgen" = dontDistribute super."randomgen"; - "randproc" = dontDistribute super."randproc"; - "randsolid" = dontDistribute super."randsolid"; - "range-space" = dontDistribute super."range-space"; - "rangemin" = dontDistribute super."rangemin"; - "ranges" = dontDistribute super."ranges"; - "rapid" = dontDistribute super."rapid"; - "rascal" = dontDistribute super."rascal"; - "rate-limit" = dontDistribute super."rate-limit"; - "ratio-int" = dontDistribute super."ratio-int"; - "raven-haskell" = dontDistribute super."raven-haskell"; - "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; - "raw-feldspar" = dontDistribute super."raw-feldspar"; - "rawr" = dontDistribute super."rawr"; - "rawstring-qm" = dontDistribute super."rawstring-qm"; - "razom-text-util" = dontDistribute super."razom-text-util"; - "rbr" = dontDistribute super."rbr"; - "rclient" = dontDistribute super."rclient"; - "rcu" = dontDistribute super."rcu"; - "rdf" = dontDistribute super."rdf"; - "rdf4h" = dontDistribute super."rdf4h"; - "rdioh" = dontDistribute super."rdioh"; - "rdtsc" = dontDistribute super."rdtsc"; - "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; - "re2" = dontDistribute super."re2"; - "react-flux" = dontDistribute super."react-flux"; - "react-flux-servant" = dontDistribute super."react-flux-servant"; - "react-haskell" = dontDistribute super."react-haskell"; - "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server"; - "reaction-logic" = dontDistribute super."reaction-logic"; - "reactive" = dontDistribute super."reactive"; - "reactive-bacon" = dontDistribute super."reactive-bacon"; - "reactive-balsa" = dontDistribute super."reactive-balsa"; - "reactive-banana" = dontDistribute super."reactive-banana"; - "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; - "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; - "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; - "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; - "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; - "reactive-glut" = dontDistribute super."reactive-glut"; - "reactive-haskell" = dontDistribute super."reactive-haskell"; - "reactive-io" = dontDistribute super."reactive-io"; - "reactive-thread" = dontDistribute super."reactive-thread"; - "reactivity" = dontDistribute super."reactivity"; - "reactor" = dontDistribute super."reactor"; - "read-bounded" = dontDistribute super."read-bounded"; - "readline-statevar" = dontDistribute super."readline-statevar"; - "readpyc" = dontDistribute super."readpyc"; - "readshp" = dontDistribute super."readshp"; - "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; - "reasonable-lens" = dontDistribute super."reasonable-lens"; - "reasonable-operational" = dontDistribute super."reasonable-operational"; - "recaptcha" = dontDistribute super."recaptcha"; - "record" = dontDistribute super."record"; - "record-aeson" = dontDistribute super."record-aeson"; - "record-gl" = dontDistribute super."record-gl"; - "record-preprocessor" = dontDistribute super."record-preprocessor"; - "record-syntax" = dontDistribute super."record-syntax"; - "records" = dontDistribute super."records"; - "records-th" = dontDistribute super."records-th"; - "recursion-schemes" = dontDistribute super."recursion-schemes"; - "recursive-line-count" = dontDistribute super."recursive-line-count"; - "redHandlers" = dontDistribute super."redHandlers"; - "reddit" = dontDistribute super."reddit"; - "redis" = dontDistribute super."redis"; - "redis-hs" = dontDistribute super."redis-hs"; - "redis-job-queue" = dontDistribute super."redis-job-queue"; - "redis-simple" = dontDistribute super."redis-simple"; - "redo" = dontDistribute super."redo"; - "reedsolomon" = dontDistribute super."reedsolomon"; - "reenact" = dontDistribute super."reenact"; - "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; - "ref" = dontDistribute super."ref"; - "ref-mtl" = dontDistribute super."ref-mtl"; - "ref-tf" = dontDistribute super."ref-tf"; - "refcount" = dontDistribute super."refcount"; - "reference" = dontDistribute super."reference"; - "references" = dontDistribute super."references"; - "refh" = dontDistribute super."refh"; - "refined" = dontDistribute super."refined"; - "reflection-extras" = dontDistribute super."reflection-extras"; - "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; - "reflex" = dontDistribute super."reflex"; - "reflex-animation" = dontDistribute super."reflex-animation"; - "reflex-dom" = dontDistribute super."reflex-dom"; - "reflex-dom-colonnade" = dontDistribute super."reflex-dom-colonnade"; - "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; - "reflex-dom-helpers" = dontDistribute super."reflex-dom-helpers"; - "reflex-gloss" = dontDistribute super."reflex-gloss"; - "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; - "reflex-jsx" = dontDistribute super."reflex-jsx"; - "reflex-orphans" = dontDistribute super."reflex-orphans"; - "reflex-transformers" = dontDistribute super."reflex-transformers"; - "regex-deriv" = dontDistribute super."regex-deriv"; - "regex-dfa" = dontDistribute super."regex-dfa"; - "regex-easy" = dontDistribute super."regex-easy"; - "regex-genex" = dontDistribute super."regex-genex"; - "regex-parsec" = dontDistribute super."regex-parsec"; - "regex-pderiv" = dontDistribute super."regex-pderiv"; - "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; - "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; - "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; - "regex-tdfa-rc" = dontDistribute super."regex-tdfa-rc"; - "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; - "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; - "regex-tre" = dontDistribute super."regex-tre"; - "regex-type" = dontDistribute super."regex-type"; - "regex-xmlschema" = dontDistribute super."regex-xmlschema"; - "regexchar" = dontDistribute super."regexchar"; - "regexdot" = dontDistribute super."regexdot"; - "regexp-tries" = dontDistribute super."regexp-tries"; - "regexpr" = dontDistribute super."regexpr"; - "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; - "regexqq" = dontDistribute super."regexqq"; - "regional-pointers" = dontDistribute super."regional-pointers"; - "regions" = dontDistribute super."regions"; - "regions-monadsfd" = dontDistribute super."regions-monadsfd"; - "regions-monadstf" = dontDistribute super."regions-monadstf"; - "regions-mtl" = dontDistribute super."regions-mtl"; - "register-machine-typelevel" = dontDistribute super."register-machine-typelevel"; - "regress" = dontDistribute super."regress"; - "regular" = dontDistribute super."regular"; - "regular-extras" = dontDistribute super."regular-extras"; - "regular-web" = dontDistribute super."regular-web"; - "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; - "reheat" = dontDistribute super."reheat"; - "rehoo" = dontDistribute super."rehoo"; - "rei" = dontDistribute super."rei"; - "reified-records" = dontDistribute super."reified-records"; - "reify" = dontDistribute super."reify"; - "relacion" = dontDistribute super."relacion"; - "relation" = dontDistribute super."relation"; - "relational-postgresql8" = dontDistribute super."relational-postgresql8"; - "relational-record-examples" = dontDistribute super."relational-record-examples"; - "relative-date" = dontDistribute super."relative-date"; - "relit" = dontDistribute super."relit"; - "reload" = dontDistribute super."reload"; - "rematch" = dontDistribute super."rematch"; - "rematch-text" = dontDistribute super."rematch-text"; - "remote" = dontDistribute super."remote"; - "remote-debugger" = dontDistribute super."remote-debugger"; - "remote-json" = dontDistribute super."remote-json"; - "remote-json-client" = dontDistribute super."remote-json-client"; - "remote-json-server" = dontDistribute super."remote-json-server"; - "remote-monad" = dontDistribute super."remote-monad"; - "remotion" = dontDistribute super."remotion"; - "reord" = dontDistribute super."reord"; - "reorderable" = dontDistribute super."reorderable"; - "repa-array" = dontDistribute super."repa-array"; - "repa-bytestring" = dontDistribute super."repa-bytestring"; - "repa-convert" = dontDistribute super."repa-convert"; - "repa-devil" = dontDistribute super."repa-devil"; - "repa-eval" = dontDistribute super."repa-eval"; - "repa-examples" = dontDistribute super."repa-examples"; - "repa-fftw" = dontDistribute super."repa-fftw"; - "repa-flow" = dontDistribute super."repa-flow"; - "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; - "repa-plugin" = dontDistribute super."repa-plugin"; - "repa-scalar" = dontDistribute super."repa-scalar"; - "repa-series" = dontDistribute super."repa-series"; - "repa-sndfile" = dontDistribute super."repa-sndfile"; - "repa-stream" = dontDistribute super."repa-stream"; - "repa-v4l2" = dontDistribute super."repa-v4l2"; - "repl" = dontDistribute super."repl"; - "repl-toolkit" = dontDistribute super."repl-toolkit"; - "replicant" = dontDistribute super."replicant"; - "repline" = dontDistribute super."repline"; - "repo-based-blog" = dontDistribute super."repo-based-blog"; - "repr" = dontDistribute super."repr"; - "repr-tree-syb" = dontDistribute super."repr-tree-syb"; - "representable-functors" = dontDistribute super."representable-functors"; - "representable-profunctors" = dontDistribute super."representable-profunctors"; - "representable-tries" = dontDistribute super."representable-tries"; - "reqcatcher" = dontDistribute super."reqcatcher"; - "request-monad" = dontDistribute super."request-monad"; - "reserve" = dontDistribute super."reserve"; - "resistor-cube" = dontDistribute super."resistor-cube"; - "resource-effect" = dontDistribute super."resource-effect"; - "resource-embed" = dontDistribute super."resource-embed"; - "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; - "resource-pool-monad" = dontDistribute super."resource-pool-monad"; - "resource-simple" = dontDistribute super."resource-simple"; - "respond" = dontDistribute super."respond"; - "rest-example" = dontDistribute super."rest-example"; - "rest-snap" = dontDistribute super."rest-snap"; - "restful-snap" = dontDistribute super."restful-snap"; - "restricted-workers" = dontDistribute super."restricted-workers"; - "restyle" = dontDistribute super."restyle"; - "resumable-exceptions" = dontDistribute super."resumable-exceptions"; - "rethinkdb-model" = dontDistribute super."rethinkdb-model"; - "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; - "retryer" = dontDistribute super."retryer"; - "revdectime" = dontDistribute super."revdectime"; - "reverse-apply" = dontDistribute super."reverse-apply"; - "reverse-arguments" = dontDistribute super."reverse-arguments"; - "reverse-geocoding" = dontDistribute super."reverse-geocoding"; - "reversi" = dontDistribute super."reversi"; - "rewrite" = dontDistribute super."rewrite"; - "rewriting" = dontDistribute super."rewriting"; - "rex" = dontDistribute super."rex"; - "rezoom" = dontDistribute super."rezoom"; - "rfc3339" = dontDistribute super."rfc3339"; - "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; - "riak" = dontDistribute super."riak"; - "riak-protobuf" = dontDistribute super."riak-protobuf"; - "richreports" = dontDistribute super."richreports"; - "riemann" = dontDistribute super."riemann"; - "riff" = dontDistribute super."riff"; - "ring-buffer" = dontDistribute super."ring-buffer"; - "riot" = dontDistribute super."riot"; - "ripple" = dontDistribute super."ripple"; - "ripple-federation" = dontDistribute super."ripple-federation"; - "risc386" = dontDistribute super."risc386"; - "rison" = dontDistribute super."rison"; - "rivers" = dontDistribute super."rivers"; - "rivet" = dontDistribute super."rivet"; - "rivet-adaptor-postgresql" = dontDistribute super."rivet-adaptor-postgresql"; - "rivet-autoimporter" = dontDistribute super."rivet-autoimporter"; - "rivet-core" = dontDistribute super."rivet-core"; - "rivet-migration" = dontDistribute super."rivet-migration"; - "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; - "rlglue" = dontDistribute super."rlglue"; - "rlist" = dontDistribute super."rlist"; - "rlwe-challenges" = dontDistribute super."rlwe-challenges"; - "rmonad" = dontDistribute super."rmonad"; - "rncryptor" = dontDistribute super."rncryptor"; - "robin" = dontDistribute super."robin"; - "robot" = dontDistribute super."robot"; - "robots-txt" = dontDistribute super."robots-txt"; - "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; - "roguestar" = dontDistribute super."roguestar"; - "roguestar-engine" = dontDistribute super."roguestar-engine"; - "roguestar-gl" = dontDistribute super."roguestar-gl"; - "roguestar-glut" = dontDistribute super."roguestar-glut"; - "rollbar" = dontDistribute super."rollbar"; - "roller" = dontDistribute super."roller"; - "rolling-queue" = dontDistribute super."rolling-queue"; - "roman-numerals" = dontDistribute super."roman-numerals"; - "romkan" = dontDistribute super."romkan"; - "roots" = dontDistribute super."roots"; - "rope" = dontDistribute super."rope"; - "rosa" = dontDistribute super."rosa"; - "rose-trie" = dontDistribute super."rose-trie"; - "roshask" = dontDistribute super."roshask"; - "rosmsg" = dontDistribute super."rosmsg"; - "rosmsg-bin" = dontDistribute super."rosmsg-bin"; - "rospkg" = dontDistribute super."rospkg"; - "rosso" = dontDistribute super."rosso"; - "rot13" = dontDistribute super."rot13"; - "roundRobin" = dontDistribute super."roundRobin"; - "rounding" = dontDistribute super."rounding"; - "roundtrip" = dontDistribute super."roundtrip"; - "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; - "roundtrip-string" = dontDistribute super."roundtrip-string"; - "roundtrip-xml" = dontDistribute super."roundtrip-xml"; - "route-generator" = dontDistribute super."route-generator"; - "route-planning" = dontDistribute super."route-planning"; - "rowrecord" = dontDistribute super."rowrecord"; - "rpc" = dontDistribute super."rpc"; - "rpc-framework" = dontDistribute super."rpc-framework"; - "rpf" = dontDistribute super."rpf"; - "rpm" = dontDistribute super."rpm"; - "rsagl" = dontDistribute super."rsagl"; - "rsagl-frp" = dontDistribute super."rsagl-frp"; - "rsagl-math" = dontDistribute super."rsagl-math"; - "rspp" = dontDistribute super."rspp"; - "rss" = dontDistribute super."rss"; - "rss2irc" = dontDistribute super."rss2irc"; - "rtcm" = dontDistribute super."rtcm"; - "rtld" = dontDistribute super."rtld"; - "rtlsdr" = dontDistribute super."rtlsdr"; - "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; - "rtorrent-state" = dontDistribute super."rtorrent-state"; - "rts-loader" = dontDistribute super."rts-loader"; - "rubberband" = dontDistribute super."rubberband"; - "ruby-marshal" = dontDistribute super."ruby-marshal"; - "ruby-qq" = dontDistribute super."ruby-qq"; - "ruff" = dontDistribute super."ruff"; - "ruin" = dontDistribute super."ruin"; - "ruler" = dontDistribute super."ruler"; - "ruler-core" = dontDistribute super."ruler-core"; - "rungekutta" = dontDistribute super."rungekutta"; - "runghc" = dontDistribute super."runghc"; - "rwlock" = dontDistribute super."rwlock"; - "rws" = dontDistribute super."rws"; - "s-cargot" = dontDistribute super."s-cargot"; - "safe-access" = dontDistribute super."safe-access"; - "safe-failure" = dontDistribute super."safe-failure"; - "safe-failure-cme" = dontDistribute super."safe-failure-cme"; - "safe-freeze" = dontDistribute super."safe-freeze"; - "safe-globals" = dontDistribute super."safe-globals"; - "safe-lazy-io" = dontDistribute super."safe-lazy-io"; - "safe-length" = dontDistribute super."safe-length"; - "safe-plugins" = dontDistribute super."safe-plugins"; - "safe-printf" = dontDistribute super."safe-printf"; - "safeint" = dontDistribute super."safeint"; - "safepath" = dontDistribute super."safepath"; - "safer-file-handles" = dontDistribute super."safer-file-handles"; - "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; - "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; - "saferoute" = dontDistribute super."saferoute"; - "sai-shape-syb" = dontDistribute super."sai-shape-syb"; - "saltine" = dontDistribute super."saltine"; - "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; - "salvia" = dontDistribute super."salvia"; - "salvia-demo" = dontDistribute super."salvia-demo"; - "salvia-extras" = dontDistribute super."salvia-extras"; - "salvia-protocol" = dontDistribute super."salvia-protocol"; - "salvia-sessions" = dontDistribute super."salvia-sessions"; - "salvia-websocket" = dontDistribute super."salvia-websocket"; - "sample-frame" = dontDistribute super."sample-frame"; - "sample-frame-np" = dontDistribute super."sample-frame-np"; - "samtools" = dontDistribute super."samtools"; - "samtools-conduit" = dontDistribute super."samtools-conduit"; - "samtools-enumerator" = dontDistribute super."samtools-enumerator"; - "samtools-iteratee" = dontDistribute super."samtools-iteratee"; - "sandlib" = dontDistribute super."sandlib"; - "sarasvati" = dontDistribute super."sarasvati"; - "sarsi" = dontDistribute super."sarsi"; - "sasl" = dontDistribute super."sasl"; - "sat" = dontDistribute super."sat"; - "sat-micro-hs" = dontDistribute super."sat-micro-hs"; - "satchmo" = dontDistribute super."satchmo"; - "satchmo-backends" = dontDistribute super."satchmo-backends"; - "satchmo-examples" = dontDistribute super."satchmo-examples"; - "satchmo-funsat" = dontDistribute super."satchmo-funsat"; - "satchmo-minisat" = dontDistribute super."satchmo-minisat"; - "satchmo-toysat" = dontDistribute super."satchmo-toysat"; - "sbp" = dontDistribute super."sbp"; - "sbp2udp" = dontDistribute super."sbp2udp"; - "sbvPlugin" = dontDistribute super."sbvPlugin"; - "sc3-rdu" = dontDistribute super."sc3-rdu"; - "scalable-server" = dontDistribute super."scalable-server"; - "scaleimage" = dontDistribute super."scaleimage"; - "scalp-webhooks" = dontDistribute super."scalp-webhooks"; - "scan" = dontDistribute super."scan"; - "scan-vector-machine" = dontDistribute super."scan-vector-machine"; - "scanner-attoparsec" = dontDistribute super."scanner-attoparsec"; - "scat" = dontDistribute super."scat"; - "scc" = dontDistribute super."scc"; - "scenegraph" = dontDistribute super."scenegraph"; - "scgi" = dontDistribute super."scgi"; - "schedevr" = dontDistribute super."schedevr"; - "schedule-planner" = dontDistribute super."schedule-planner"; - "schedyield" = dontDistribute super."schedyield"; - "scholdoc" = dontDistribute super."scholdoc"; - "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; - "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; - "scholdoc-types" = dontDistribute super."scholdoc-types"; - "schonfinkeling" = dontDistribute super."schonfinkeling"; - "sci-ratio" = dontDistribute super."sci-ratio"; - "science-constants" = dontDistribute super."science-constants"; - "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; - "scion" = dontDistribute super."scion"; - "scion-browser" = dontDistribute super."scion-browser"; - "scons2dot" = dontDistribute super."scons2dot"; - "scope" = dontDistribute super."scope"; - "scope-cairo" = dontDistribute super."scope-cairo"; - "scottish" = dontDistribute super."scottish"; - "scotty-binding-play" = dontDistribute super."scotty-binding-play"; - "scotty-blaze" = dontDistribute super."scotty-blaze"; - "scotty-cookie" = dontDistribute super."scotty-cookie"; - "scotty-fay" = dontDistribute super."scotty-fay"; - "scotty-hastache" = dontDistribute super."scotty-hastache"; - "scotty-params-parser" = dontDistribute super."scotty-params-parser"; - "scotty-resource" = dontDistribute super."scotty-resource"; - "scotty-rest" = dontDistribute super."scotty-rest"; - "scotty-session" = dontDistribute super."scotty-session"; - "scotty-tls" = dontDistribute super."scotty-tls"; - "scotty-view" = dontDistribute super."scotty-view"; - "scp-streams" = dontDistribute super."scp-streams"; - "scrabble-bot" = dontDistribute super."scrabble-bot"; - "scrobble" = dontDistribute super."scrobble"; - "scroll" = dontDistribute super."scroll"; - "scrz" = dontDistribute super."scrz"; - "scyther-proof" = dontDistribute super."scyther-proof"; - "sde-solver" = dontDistribute super."sde-solver"; - "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; - "sdl2-cairo" = dontDistribute super."sdl2-cairo"; - "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; - "sdl2-compositor" = dontDistribute super."sdl2-compositor"; - "sdl2-image" = dontDistribute super."sdl2-image"; - "sdl2-ttf" = dontDistribute super."sdl2-ttf"; - "sdnv" = dontDistribute super."sdnv"; - "sdr" = dontDistribute super."sdr"; - "seacat" = dontDistribute super."seacat"; - "seal-module" = dontDistribute super."seal-module"; - "search" = dontDistribute super."search"; - "sec" = dontDistribute super."sec"; - "secd" = dontDistribute super."secd"; - "secdh" = dontDistribute super."secdh"; - "seclib" = dontDistribute super."seclib"; - "second-transfer" = dontDistribute super."second-transfer"; - "secret-santa" = dontDistribute super."secret-santa"; - "secret-sharing" = dontDistribute super."secret-sharing"; - "secrm" = dontDistribute super."secrm"; - "secure-sockets" = dontDistribute super."secure-sockets"; - "sednaDBXML" = dontDistribute super."sednaDBXML"; - "select" = dontDistribute super."select"; - "selectors" = dontDistribute super."selectors"; - "selenium" = dontDistribute super."selenium"; - "selenium-server" = dontDistribute super."selenium-server"; - "selfrestart" = dontDistribute super."selfrestart"; - "selinux" = dontDistribute super."selinux"; - "semaphore-plus" = dontDistribute super."semaphore-plus"; - "semi-iso" = dontDistribute super."semi-iso"; - "semibounded-lattices" = dontDistribute super."semibounded-lattices"; - "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; - "semigroups-actions" = dontDistribute super."semigroups-actions"; - "semiring" = dontDistribute super."semiring"; - "semver-range" = dontDistribute super."semver-range"; - "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; - "sensei" = dontDistribute super."sensei"; - "sensenet" = dontDistribute super."sensenet"; - "sentence-jp" = dontDistribute super."sentence-jp"; - "sentry" = dontDistribute super."sentry"; - "senza" = dontDistribute super."senza"; - "separated" = dontDistribute super."separated"; - "seqaid" = dontDistribute super."seqaid"; - "seqid" = dontDistribute super."seqid"; - "seqid-streams" = dontDistribute super."seqid-streams"; - "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; - "sequence" = dontDistribute super."sequence"; - "sequent-core" = dontDistribute super."sequent-core"; - "sequential-index" = dontDistribute super."sequential-index"; - "sequor" = dontDistribute super."sequor"; - "serial" = dontDistribute super."serial"; - "serial-test-generators" = dontDistribute super."serial-test-generators"; - "serialport" = dontDistribute super."serialport"; - "serpentine" = dontDistribute super."serpentine"; - "serv" = dontDistribute super."serv"; - "serv-wai" = dontDistribute super."serv-wai"; - "servant-auth-hmac" = dontDistribute super."servant-auth-hmac"; - "servant-auth-token" = dontDistribute super."servant-auth-token"; - "servant-auth-token-api" = dontDistribute super."servant-auth-token-api"; - "servant-csharp" = dontDistribute super."servant-csharp"; - "servant-ede" = dontDistribute super."servant-ede"; - "servant-elm" = dontDistribute super."servant-elm"; - "servant-examples" = dontDistribute super."servant-examples"; - "servant-github" = dontDistribute super."servant-github"; - "servant-github-webhook" = dontDistribute super."servant-github-webhook"; - "servant-haxl-client" = dontDistribute super."servant-haxl-client"; - "servant-jquery" = dontDistribute super."servant-jquery"; - "servant-matrix-param" = dontDistribute super."servant-matrix-param"; - "servant-pandoc" = dontDistribute super."servant-pandoc"; - "servant-pool" = dontDistribute super."servant-pool"; - "servant-postgresql" = dontDistribute super."servant-postgresql"; - "servant-quickcheck" = dontDistribute super."servant-quickcheck"; - "servant-response" = dontDistribute super."servant-response"; - "servant-router" = dontDistribute super."servant-router"; - "servant-scotty" = dontDistribute super."servant-scotty"; - "servant-smsc-ru" = dontDistribute super."servant-smsc-ru"; - "server-generic" = dontDistribute super."server-generic"; - "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent"; - "serversession-backend-redis" = dontDistribute super."serversession-backend-redis"; - "serversession-frontend-snap" = dontDistribute super."serversession-frontend-snap"; - "ses-html" = dontDistribute super."ses-html"; - "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; - "sessions" = dontDistribute super."sessions"; - "set-cover" = dontDistribute super."set-cover"; - "set-extra" = dontDistribute super."set-extra"; - "set-with" = dontDistribute super."set-with"; - "setdown" = dontDistribute super."setdown"; - "setgame" = dontDistribute super."setgame"; - "setops" = dontDistribute super."setops"; - "setters" = dontDistribute super."setters"; - "settings" = dontDistribute super."settings"; - "sexp" = dontDistribute super."sexp"; - "sexp-grammar" = dontDistribute super."sexp-grammar"; - "sexp-show" = dontDistribute super."sexp-show"; - "sexpr" = dontDistribute super."sexpr"; - "sext" = dontDistribute super."sext"; - "sfml-audio" = dontDistribute super."sfml-audio"; - "sfmt" = dontDistribute super."sfmt"; - "sfnt2woff" = dontDistribute super."sfnt2woff"; - "sgd" = dontDistribute super."sgd"; - "sgf" = dontDistribute super."sgf"; - "sgrep" = dontDistribute super."sgrep"; - "sha-streams" = dontDistribute super."sha-streams"; - "shadower" = dontDistribute super."shadower"; - "shadowsocks" = dontDistribute super."shadowsocks"; - "shady-gen" = dontDistribute super."shady-gen"; - "shady-graphics" = dontDistribute super."shady-graphics"; - "shake-cabal-build" = dontDistribute super."shake-cabal-build"; - "shake-extras" = dontDistribute super."shake-extras"; - "shake-minify" = dontDistribute super."shake-minify"; - "shake-pack" = dontDistribute super."shake-pack"; - "shake-persist" = dontDistribute super."shake-persist"; - "shaker" = dontDistribute super."shaker"; - "shakespeare-babel" = dontDistribute super."shakespeare-babel"; - "shakespeare-css" = dontDistribute super."shakespeare-css"; - "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; - "shakespeare-js" = dontDistribute super."shakespeare-js"; - "shakespeare-sass" = dontDistribute super."shakespeare-sass"; - "shakespeare-text" = dontDistribute super."shakespeare-text"; - "shana" = dontDistribute super."shana"; - "shapefile" = dontDistribute super."shapefile"; - "shapely-data" = dontDistribute super."shapely-data"; - "sharc-timbre" = dontDistribute super."sharc-timbre"; - "shared-buffer" = dontDistribute super."shared-buffer"; - "shared-fields" = dontDistribute super."shared-fields"; - "shared-memory" = dontDistribute super."shared-memory"; - "sharedio" = dontDistribute super."sharedio"; - "she" = dontDistribute super."she"; - "shelduck" = dontDistribute super."shelduck"; - "shell-escape" = dontDistribute super."shell-escape"; - "shell-monad" = dontDistribute super."shell-monad"; - "shell-pipe" = dontDistribute super."shell-pipe"; - "shellish" = dontDistribute super."shellish"; - "shellmate" = dontDistribute super."shellmate"; - "shellmate-extras" = dontDistribute super."shellmate-extras"; - "shelltestrunner" = dontDistribute super."shelltestrunner"; - "shelly-extra" = dontDistribute super."shelly-extra"; - "shine" = dontDistribute super."shine"; - "shine-varying" = dontDistribute super."shine-varying"; - "shivers-cfg" = dontDistribute super."shivers-cfg"; - "shoap" = dontDistribute super."shoap"; - "shortcircuit" = dontDistribute super."shortcircuit"; - "shorten-strings" = dontDistribute super."shorten-strings"; - "show" = dontDistribute super."show"; - "showdown" = dontDistribute super."showdown"; - "shpider" = dontDistribute super."shpider"; - "shplit" = dontDistribute super."shplit"; - "shqq" = dontDistribute super."shqq"; - "shuffle" = dontDistribute super."shuffle"; - "sieve" = dontDistribute super."sieve"; - "sifflet" = dontDistribute super."sifflet"; - "sifflet-lib" = dontDistribute super."sifflet-lib"; - "sign" = dontDistribute super."sign"; - "signals" = dontDistribute super."signals"; - "signed-multiset" = dontDistribute super."signed-multiset"; - "simd" = dontDistribute super."simd"; - "simgi" = dontDistribute super."simgi"; - "simple-actors" = dontDistribute super."simple-actors"; - "simple-atom" = dontDistribute super."simple-atom"; - "simple-bluetooth" = dontDistribute super."simple-bluetooth"; - "simple-c-value" = dontDistribute super."simple-c-value"; - "simple-conduit" = dontDistribute super."simple-conduit"; - "simple-config" = dontDistribute super."simple-config"; - "simple-css" = dontDistribute super."simple-css"; - "simple-effects" = dontDistribute super."simple-effects"; - "simple-eval" = dontDistribute super."simple-eval"; - "simple-firewire" = dontDistribute super."simple-firewire"; - "simple-form" = dontDistribute super."simple-form"; - "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; - "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; - "simple-get-opt" = dontDistribute super."simple-get-opt"; - "simple-index" = dontDistribute super."simple-index"; - "simple-log-syslog" = dontDistribute super."simple-log-syslog"; - "simple-logger" = dontDistribute super."simple-logger"; - "simple-neural-networks" = dontDistribute super."simple-neural-networks"; - "simple-nix" = dontDistribute super."simple-nix"; - "simple-observer" = dontDistribute super."simple-observer"; - "simple-pascal" = dontDistribute super."simple-pascal"; - "simple-pipe" = dontDistribute super."simple-pipe"; - "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; - "simple-rope" = dontDistribute super."simple-rope"; - "simple-server" = dontDistribute super."simple-server"; - "simple-sessions" = dontDistribute super."simple-sessions"; - "simple-sql-parser" = dontDistribute super."simple-sql-parser"; - "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; - "simple-tabular" = dontDistribute super."simple-tabular"; - "simple-tar" = dontDistribute super."simple-tar"; - "simple-vec3" = dontDistribute super."simple-vec3"; - "simple-zipper" = dontDistribute super."simple-zipper"; - "simpleargs" = dontDistribute super."simpleargs"; - "simpleirc" = dontDistribute super."simpleirc"; - "simpleirc-lens" = dontDistribute super."simpleirc-lens"; - "simplenote" = dontDistribute super."simplenote"; - "simpleprelude" = dontDistribute super."simpleprelude"; - "simplesmtpclient" = dontDistribute super."simplesmtpclient"; - "simplessh" = dontDistribute super."simplessh"; - "simplest-sqlite" = dontDistribute super."simplest-sqlite"; - "simplex" = dontDistribute super."simplex"; - "simplex-basic" = dontDistribute super."simplex-basic"; - "simseq" = dontDistribute super."simseq"; - "simtreelo" = dontDistribute super."simtreelo"; - "sindre" = dontDistribute super."sindre"; - "singleton-nats" = dontDistribute super."singleton-nats"; - "sink" = dontDistribute super."sink"; - "siphon" = dontDistribute super."siphon"; - "sirkel" = dontDistribute super."sirkel"; - "sitemap" = dontDistribute super."sitemap"; - "size-based" = dontDistribute super."size-based"; - "sized" = dontDistribute super."sized"; - "sized-types" = dontDistribute super."sized-types"; - "sized-vector" = dontDistribute super."sized-vector"; - "sizes" = dontDistribute super."sizes"; - "sjsp" = dontDistribute super."sjsp"; - "skeleton" = dontDistribute super."skeleton"; - "skell" = dontDistribute super."skell"; - "skemmtun" = dontDistribute super."skemmtun"; - "skulk" = dontDistribute super."skulk"; - "skype4hs" = dontDistribute super."skype4hs"; - "skypelogexport" = dontDistribute super."skypelogexport"; - "slack" = dontDistribute super."slack"; - "slack-api" = dontDistribute super."slack-api"; - "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; - "sleep" = dontDistribute super."sleep"; - "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; - "slidemews" = dontDistribute super."slidemews"; - "slim" = dontDistribute super."slim"; - "sloane" = dontDistribute super."sloane"; - "slot-lambda" = dontDistribute super."slot-lambda"; - "sloth" = dontDistribute super."sloth"; - "smallarray" = dontDistribute super."smallarray"; - "smallcheck-laws" = dontDistribute super."smallcheck-laws"; - "smallcheck-lens" = dontDistribute super."smallcheck-lens"; - "smallcheck-series" = dontDistribute super."smallcheck-series"; - "smallpt-hs" = dontDistribute super."smallpt-hs"; - "smallstring" = dontDistribute super."smallstring"; - "smaoin" = dontDistribute super."smaoin"; - "smartGroup" = dontDistribute super."smartGroup"; - "smartcheck" = dontDistribute super."smartcheck"; - "smartconstructor" = dontDistribute super."smartconstructor"; - "smartword" = dontDistribute super."smartword"; - "sme" = dontDistribute super."sme"; - "smerdyakov" = dontDistribute super."smerdyakov"; - "smt-lib" = dontDistribute super."smt-lib"; - "smtlib2" = dontDistribute super."smtlib2"; - "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; - "smtp2mta" = dontDistribute super."smtp2mta"; - "smtps-gmail" = dontDistribute super."smtps-gmail"; - "snake" = dontDistribute super."snake"; - "snake-game" = dontDistribute super."snake-game"; - "snap" = dontDistribute super."snap"; - "snap-accept" = dontDistribute super."snap-accept"; - "snap-app" = dontDistribute super."snap-app"; - "snap-auth-cli" = dontDistribute super."snap-auth-cli"; - "snap-blaze" = dontDistribute super."snap-blaze"; - "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; - "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; - "snap-cors" = dontDistribute super."snap-cors"; - "snap-elm" = dontDistribute super."snap-elm"; - "snap-error-collector" = dontDistribute super."snap-error-collector"; - "snap-extras" = dontDistribute super."snap-extras"; - "snap-language" = dontDistribute super."snap-language"; - "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; - "snap-loader-static" = dontDistribute super."snap-loader-static"; - "snap-predicates" = dontDistribute super."snap-predicates"; - "snap-routes" = dontDistribute super."snap-routes"; - "snap-templates" = dontDistribute super."snap-templates"; - "snap-testing" = dontDistribute super."snap-testing"; - "snap-utils" = dontDistribute super."snap-utils"; - "snap-web-routes" = dontDistribute super."snap-web-routes"; - "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; - "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; - "snaplet-amqp" = dontDistribute super."snaplet-amqp"; - "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; - "snaplet-coffee" = dontDistribute super."snaplet-coffee"; - "snaplet-css-min" = dontDistribute super."snaplet-css-min"; - "snaplet-environments" = dontDistribute super."snaplet-environments"; - "snaplet-fay" = dontDistribute super."snaplet-fay"; - "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; - "snaplet-hasql" = dontDistribute super."snaplet-hasql"; - "snaplet-haxl" = dontDistribute super."snaplet-haxl"; - "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; - "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; - "snaplet-i18n" = dontDistribute super."snaplet-i18n"; - "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; - "snaplet-lss" = dontDistribute super."snaplet-lss"; - "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; - "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; - "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; - "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; - "snaplet-oauth" = dontDistribute super."snaplet-oauth"; - "snaplet-persistent" = dontDistribute super."snaplet-persistent"; - "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; - "snaplet-postmark" = dontDistribute super."snaplet-postmark"; - "snaplet-purescript" = dontDistribute super."snaplet-purescript"; - "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; - "snaplet-redis" = dontDistribute super."snaplet-redis"; - "snaplet-redson" = dontDistribute super."snaplet-redson"; - "snaplet-rest" = dontDistribute super."snaplet-rest"; - "snaplet-riak" = dontDistribute super."snaplet-riak"; - "snaplet-sass" = dontDistribute super."snaplet-sass"; - "snaplet-scoped-session" = dontDistribute super."snaplet-scoped-session"; - "snaplet-sedna" = dontDistribute super."snaplet-sedna"; - "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; - "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; - "snaplet-stripe" = dontDistribute super."snaplet-stripe"; - "snaplet-tasks" = dontDistribute super."snaplet-tasks"; - "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; - "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; - "snappy" = dontDistribute super."snappy"; - "snappy-conduit" = dontDistribute super."snappy-conduit"; - "snappy-framing" = dontDistribute super."snappy-framing"; - "snappy-iteratee" = dontDistribute super."snappy-iteratee"; - "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; - "sneakyterm" = dontDistribute super."sneakyterm"; - "sneathlane-haste" = dontDistribute super."sneathlane-haste"; - "snippet-extractor" = dontDistribute super."snippet-extractor"; - "snm" = dontDistribute super."snm"; - "snmp" = dontDistribute super."snmp"; - "snorkels" = dontDistribute super."snorkels"; - "snow-white" = dontDistribute super."snow-white"; - "snowball" = dontDistribute super."snowball"; - "snowflake-core" = dontDistribute super."snowflake-core"; - "snowflake-server" = dontDistribute super."snowflake-server"; - "snowglobe" = dontDistribute super."snowglobe"; - "sock2stream" = dontDistribute super."sock2stream"; - "sockaddr" = dontDistribute super."sockaddr"; - "socket-activation" = dontDistribute super."socket-activation"; - "socket-io" = dontDistribute super."socket-io"; - "socket-sctp" = dontDistribute super."socket-sctp"; - "socketio" = dontDistribute super."socketio"; - "socketson" = dontDistribute super."socketson"; - "sodium" = dontDistribute super."sodium"; - "soegtk" = dontDistribute super."soegtk"; - "solr" = dontDistribute super."solr"; - "sonic-visualiser" = dontDistribute super."sonic-visualiser"; - "sophia" = dontDistribute super."sophia"; - "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; - "sorted" = dontDistribute super."sorted"; - "sorting" = dontDistribute super."sorting"; - "sorty" = dontDistribute super."sorty"; - "sound-collage" = dontDistribute super."sound-collage"; - "sounddelay" = dontDistribute super."sounddelay"; - "source-code-server" = dontDistribute super."source-code-server"; - "sousit" = dontDistribute super."sousit"; - "sox" = dontDistribute super."sox"; - "soxlib" = dontDistribute super."soxlib"; - "soyuz" = dontDistribute super."soyuz"; - "spacefill" = dontDistribute super."spacefill"; - "spacepart" = dontDistribute super."spacepart"; - "spaceprobe" = dontDistribute super."spaceprobe"; - "spanout" = dontDistribute super."spanout"; - "sparkle" = dontDistribute super."sparkle"; - "sparse" = dontDistribute super."sparse"; - "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; - "sparsebit" = dontDistribute super."sparsebit"; - "sparsecheck" = dontDistribute super."sparsecheck"; - "sparser" = dontDistribute super."sparser"; - "spata" = dontDistribute super."spata"; - "spatial-math" = dontDistribute super."spatial-math"; - "spawn" = dontDistribute super."spawn"; - "spe" = dontDistribute super."spe"; - "special-functors" = dontDistribute super."special-functors"; - "special-keys" = dontDistribute super."special-keys"; - "specialize-th" = dontDistribute super."specialize-th"; - "species" = dontDistribute super."species"; - "speculation-transformers" = dontDistribute super."speculation-transformers"; - "spelling-suggest" = dontDistribute super."spelling-suggest"; - "sphero" = dontDistribute super."sphero"; - "sphinx-cli" = dontDistribute super."sphinx-cli"; - "spice" = dontDistribute super."spice"; - "spike" = dontDistribute super."spike"; - "spine" = dontDistribute super."spine"; - "spir-v" = dontDistribute super."spir-v"; - "splay" = dontDistribute super."splay"; - "splaytree" = dontDistribute super."splaytree"; - "spline3" = dontDistribute super."spline3"; - "splines" = dontDistribute super."splines"; - "split-channel" = dontDistribute super."split-channel"; - "split-record" = dontDistribute super."split-record"; - "split-tchan" = dontDistribute super."split-tchan"; - "splitter" = dontDistribute super."splitter"; - "splot" = dontDistribute super."splot"; - "spoonutil" = dontDistribute super."spoonutil"; - "spoty" = dontDistribute super."spoty"; - "spreadsheet" = dontDistribute super."spreadsheet"; - "spritz" = dontDistribute super."spritz"; - "sproxy" = dontDistribute super."sproxy"; - "sproxy-web" = dontDistribute super."sproxy-web"; - "spsa" = dontDistribute super."spsa"; - "spy" = dontDistribute super."spy"; - "sql-simple" = dontDistribute super."sql-simple"; - "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; - "sql-simple-pool" = dontDistribute super."sql-simple-pool"; - "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; - "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; - "sqlite" = dontDistribute super."sqlite"; - "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; - "sqlvalue-list" = dontDistribute super."sqlvalue-list"; - "squeeze" = dontDistribute super."squeeze"; - "sr-extra" = dontDistribute super."sr-extra"; - "srcinst" = dontDistribute super."srcinst"; - "srec" = dontDistribute super."srec"; - "sscgi" = dontDistribute super."sscgi"; - "sscript" = dontDistribute super."sscript"; - "ssh" = dontDistribute super."ssh"; - "sshd-lint" = dontDistribute super."sshd-lint"; - "sshtun" = dontDistribute super."sshtun"; - "sssp" = dontDistribute super."sssp"; - "sstable" = dontDistribute super."sstable"; - "ssv" = dontDistribute super."ssv"; - "stable-heap" = dontDistribute super."stable-heap"; - "stable-maps" = dontDistribute super."stable-maps"; - "stable-marriage" = dontDistribute super."stable-marriage"; - "stable-memo" = dontDistribute super."stable-memo"; - "stable-tree" = dontDistribute super."stable-tree"; - "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; - "stack-prism" = dontDistribute super."stack-prism"; - "stack-run" = dontDistribute super."stack-run"; - "stackage" = dontDistribute super."stackage"; - "stackage-build-plan" = dontDistribute super."stackage-build-plan"; - "stackage-cabal" = dontDistribute super."stackage-cabal"; - "stackage-cli" = dontDistribute super."stackage-cli"; - "stackage-install" = dontDistribute super."stackage-install"; - "stackage-metadata" = dontDistribute super."stackage-metadata"; - "stackage-sandbox" = dontDistribute super."stackage-sandbox"; - "stackage-setup" = dontDistribute super."stackage-setup"; - "stackage-update" = dontDistribute super."stackage-update"; - "stackage-upload" = dontDistribute super."stackage-upload"; - "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; - "standalone-haddock" = dontDistribute super."standalone-haddock"; - "star-to-star" = dontDistribute super."star-to-star"; - "star-to-star-contra" = dontDistribute super."star-to-star-contra"; - "starling" = dontDistribute super."starling"; - "starrover2" = dontDistribute super."starrover2"; - "stash" = dontDistribute super."stash"; - "state" = dontDistribute super."state"; - "state-bag" = dontDistribute super."state-bag"; - "state-record" = dontDistribute super."state-record"; - "statechart" = dontDistribute super."statechart"; - "stateful-mtl" = dontDistribute super."stateful-mtl"; - "statethread" = dontDistribute super."statethread"; - "statgrab" = dontDistribute super."statgrab"; - "static-hash" = dontDistribute super."static-hash"; - "static-resources" = dontDistribute super."static-resources"; - "staticanalysis" = dontDistribute super."staticanalysis"; - "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; - "statistics-fusion" = dontDistribute super."statistics-fusion"; - "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; - "statistics-linreg" = dontDistribute super."statistics-linreg"; - "stats" = dontDistribute super."stats"; - "statsd" = dontDistribute super."statsd"; - "statsd-client" = dontDistribute super."statsd-client"; - "statsd-datadog" = dontDistribute super."statsd-datadog"; - "statvfs" = dontDistribute super."statvfs"; - "stb-image" = dontDistribute super."stb-image"; - "stb-truetype" = dontDistribute super."stb-truetype"; - "stdata" = dontDistribute super."stdata"; - "stdf" = dontDistribute super."stdf"; - "steambrowser" = dontDistribute super."steambrowser"; - "steeloverseer" = dontDistribute super."steeloverseer"; - "stemmer" = dontDistribute super."stemmer"; - "step-function" = dontDistribute super."step-function"; - "stepwise" = dontDistribute super."stepwise"; - "stgi" = dontDistribute super."stgi"; - "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; - "stitch" = dontDistribute super."stitch"; - "stm-channelize" = dontDistribute super."stm-channelize"; - "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; - "stm-firehose" = dontDistribute super."stm-firehose"; - "stm-io-hooks" = dontDistribute super."stm-io-hooks"; - "stm-lifted" = dontDistribute super."stm-lifted"; - "stm-linkedlist" = dontDistribute super."stm-linkedlist"; - "stm-orelse-io" = dontDistribute super."stm-orelse-io"; - "stm-promise" = dontDistribute super."stm-promise"; - "stm-queue-extras" = dontDistribute super."stm-queue-extras"; - "stm-sbchan" = dontDistribute super."stm-sbchan"; - "stm-split" = dontDistribute super."stm-split"; - "stm-tlist" = dontDistribute super."stm-tlist"; - "stmcontrol" = dontDistribute super."stmcontrol"; - "stochastic" = dontDistribute super."stochastic"; - "stomp-conduit" = dontDistribute super."stomp-conduit"; - "stomp-patterns" = dontDistribute super."stomp-patterns"; - "stomp-queue" = dontDistribute super."stomp-queue"; - "stompl" = dontDistribute super."stompl"; - "storable" = dontDistribute super."storable"; - "storable-static-array" = dontDistribute super."storable-static-array"; - "storable-tuple" = dontDistribute super."storable-tuple"; - "storablevector" = dontDistribute super."storablevector"; - "storablevector-carray" = dontDistribute super."storablevector-carray"; - "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; - "str" = dontDistribute super."str"; - "stratum-tool" = dontDistribute super."stratum-tool"; - "stratux" = dontDistribute super."stratux"; - "stratux-http" = dontDistribute super."stratux-http"; - "stratux-types" = dontDistribute super."stratux-types"; - "stratux-websockets" = dontDistribute super."stratux-websockets"; - "stream" = dontDistribute super."stream"; - "stream-fusion" = dontDistribute super."stream-fusion"; - "stream-monad" = dontDistribute super."stream-monad"; - "streamed" = dontDistribute super."streamed"; - "streaming-eversion" = dontDistribute super."streaming-eversion"; - "streaming-histogram" = dontDistribute super."streaming-histogram"; - "streaming-png" = dontDistribute super."streaming-png"; - "streaming-utils" = dontDistribute super."streaming-utils"; - "streaming-wai" = dontDistribute super."streaming-wai"; - "strict-concurrency" = dontDistribute super."strict-concurrency"; - "strict-data" = dontDistribute super."strict-data"; - "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; - "strict-identity" = dontDistribute super."strict-identity"; - "strict-io" = dontDistribute super."strict-io"; - "strictify" = dontDistribute super."strictify"; - "strictly" = dontDistribute super."strictly"; - "string" = dontDistribute super."string"; - "string-convert" = dontDistribute super."string-convert"; - "string-quote" = dontDistribute super."string-quote"; - "string-similarity" = dontDistribute super."string-similarity"; - "string-typelits" = dontDistribute super."string-typelits"; - "stringlike" = dontDistribute super."stringlike"; - "stringprep" = dontDistribute super."stringprep"; - "strings" = dontDistribute super."strings"; - "stringtable-atom" = dontDistribute super."stringtable-atom"; - "strio" = dontDistribute super."strio"; - "stripe" = dontDistribute super."stripe"; - "stripe-haskell" = dontDistribute super."stripe-haskell"; - "stripe-http-streams" = dontDistribute super."stripe-http-streams"; - "strptime" = dontDistribute super."strptime"; - "structs" = dontDistribute super."structs"; - "structural-induction" = dontDistribute super."structural-induction"; - "structural-traversal" = dontDistribute super."structural-traversal"; - "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; - "structured-mongoDB" = dontDistribute super."structured-mongoDB"; - "structures" = dontDistribute super."structures"; - "stunclient" = dontDistribute super."stunclient"; - "stunts" = dontDistribute super."stunts"; - "stylized" = dontDistribute super."stylized"; - "sub-state" = dontDistribute super."sub-state"; - "subhask" = dontDistribute super."subhask"; - "subleq-toolchain" = dontDistribute super."subleq-toolchain"; - "subnet" = dontDistribute super."subnet"; - "subtitleParser" = dontDistribute super."subtitleParser"; - "subtitles" = dontDistribute super."subtitles"; - "subwordgraph" = dontDistribute super."subwordgraph"; - "suffixarray" = dontDistribute super."suffixarray"; - "suffixtree" = dontDistribute super."suffixtree"; - "sugarhaskell" = dontDistribute super."sugarhaskell"; - "suitable" = dontDistribute super."suitable"; - "sump" = dontDistribute super."sump"; - "sunlight" = dontDistribute super."sunlight"; - "sunroof-compiler" = dontDistribute super."sunroof-compiler"; - "sunroof-examples" = dontDistribute super."sunroof-examples"; - "sunroof-server" = dontDistribute super."sunroof-server"; - "super-user-spark" = dontDistribute super."super-user-spark"; - "supercollider-ht" = dontDistribute super."supercollider-ht"; - "supercollider-midi" = dontDistribute super."supercollider-midi"; - "superdoc" = dontDistribute super."superdoc"; - "supermonad" = dontDistribute super."supermonad"; - "supero" = dontDistribute super."supero"; - "supervisor" = dontDistribute super."supervisor"; - "supplemented" = dontDistribute super."supplemented"; - "suspend" = dontDistribute super."suspend"; - "svg2q" = dontDistribute super."svg2q"; - "svgcairo" = dontDistribute super."svgcairo"; - "svgutils" = dontDistribute super."svgutils"; - "svm" = dontDistribute super."svm"; - "svm-light-utils" = dontDistribute super."svm-light-utils"; - "svm-simple" = dontDistribute super."svm-simple"; - "svndump" = dontDistribute super."svndump"; - "swapper" = dontDistribute super."swapper"; - "swearjure" = dontDistribute super."swearjure"; - "swf" = dontDistribute super."swf"; - "swift-lda" = dontDistribute super."swift-lda"; - "swish" = dontDistribute super."swish"; - "sws" = dontDistribute super."sws"; - "syb-extras" = dontDistribute super."syb-extras"; - "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; - "sylvia" = dontDistribute super."sylvia"; - "sym" = dontDistribute super."sym"; - "sym-plot" = dontDistribute super."sym-plot"; - "symengine-hs" = dontDistribute super."symengine-hs"; - "symon" = dontDistribute super."symon"; - "sync" = dontDistribute super."sync"; - "sync-mht" = dontDistribute super."sync-mht"; - "synchronous-channels" = dontDistribute super."synchronous-channels"; - "syncthing-hs" = dontDistribute super."syncthing-hs"; - "synt" = dontDistribute super."synt"; - "syntactic" = dontDistribute super."syntactic"; - "syntactical" = dontDistribute super."syntactical"; - "syntax" = dontDistribute super."syntax"; - "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; - "syntax-example" = dontDistribute super."syntax-example"; - "syntax-example-json" = dontDistribute super."syntax-example-json"; - "syntax-pretty" = dontDistribute super."syntax-pretty"; - "syntax-printer" = dontDistribute super."syntax-printer"; - "syntax-trees" = dontDistribute super."syntax-trees"; - "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; - "synthesizer" = dontDistribute super."synthesizer"; - "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; - "synthesizer-core" = dontDistribute super."synthesizer-core"; - "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; - "synthesizer-filter" = dontDistribute super."synthesizer-filter"; - "synthesizer-inference" = dontDistribute super."synthesizer-inference"; - "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; - "synthesizer-midi" = dontDistribute super."synthesizer-midi"; - "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; - "sys-process" = dontDistribute super."sys-process"; - "system-canonicalpath" = dontDistribute super."system-canonicalpath"; - "system-command" = dontDistribute super."system-command"; - "system-gpio" = dontDistribute super."system-gpio"; - "system-info" = dontDistribute super."system-info"; - "system-inotify" = dontDistribute super."system-inotify"; - "system-lifted" = dontDistribute super."system-lifted"; - "system-locale" = dontDistribute super."system-locale"; - "system-random-effect" = dontDistribute super."system-random-effect"; - "system-test" = dontDistribute super."system-test"; - "system-time-monotonic" = dontDistribute super."system-time-monotonic"; - "system-util" = dontDistribute super."system-util"; - "system-uuid" = dontDistribute super."system-uuid"; - "systemd" = dontDistribute super."systemd"; - "systemstats" = dontDistribute super."systemstats"; - "t-regex" = dontDistribute super."t-regex"; - "t3-client" = dontDistribute super."t3-client"; - "t3-game" = dontDistribute super."t3-game"; - "t3-server" = dontDistribute super."t3-server"; - "ta" = dontDistribute super."ta"; - "table" = dontDistribute super."table"; - "table-layout" = dontDistribute super."table-layout"; - "table-tennis" = dontDistribute super."table-tennis"; - "tableaux" = dontDistribute super."tableaux"; - "tables" = dontDistribute super."tables"; - "tablestorage" = dontDistribute super."tablestorage"; - "tabloid" = dontDistribute super."tabloid"; - "taffybar" = dontDistribute super."taffybar"; - "tag-bits" = dontDistribute super."tag-bits"; - "tag-stream" = dontDistribute super."tag-stream"; - "tagchup" = dontDistribute super."tagchup"; - "tagged-exception-core" = dontDistribute super."tagged-exception-core"; - "tagged-list" = dontDistribute super."tagged-list"; - "tagged-th" = dontDistribute super."tagged-th"; - "tagged-timers" = dontDistribute super."tagged-timers"; - "tagged-transformer" = dontDistribute super."tagged-transformer"; - "tagging" = dontDistribute super."tagging"; - "taglib" = dontDistribute super."taglib"; - "taglib-api" = dontDistribute super."taglib-api"; - "tagset-positional" = dontDistribute super."tagset-positional"; - "tagsoup-ht" = dontDistribute super."tagsoup-ht"; - "tagsoup-megaparsec" = dontDistribute super."tagsoup-megaparsec"; - "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; - "tai64" = dontDistribute super."tai64"; - "tak" = dontDistribute super."tak"; - "tak-ai" = dontDistribute super."tak-ai"; - "takahashi" = dontDistribute super."takahashi"; - "takusen-oracle" = dontDistribute super."takusen-oracle"; - "tal" = dontDistribute super."tal"; - "tamarin-prover" = dontDistribute super."tamarin-prover"; - "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; - "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; - "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; - "tamper" = dontDistribute super."tamper"; - "target" = dontDistribute super."target"; - "task" = dontDistribute super."task"; - "task-distribution" = dontDistribute super."task-distribution"; - "taskpool" = dontDistribute super."taskpool"; - "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; - "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters"; - "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; - "tasty-integrate" = dontDistribute super."tasty-integrate"; - "tasty-laws" = dontDistribute super."tasty-laws"; - "tasty-lens" = dontDistribute super."tasty-lens"; - "tasty-tap" = dontDistribute super."tasty-tap"; - "tateti-tateti" = dontDistribute super."tateti-tateti"; - "tau" = dontDistribute super."tau"; - "tbox" = dontDistribute super."tbox"; - "tcache-AWS" = dontDistribute super."tcache-AWS"; - "tccli" = dontDistribute super."tccli"; - "tce-conf" = dontDistribute super."tce-conf"; - "tconfig" = dontDistribute super."tconfig"; - "tcp" = dontDistribute super."tcp"; - "tdd-util" = dontDistribute super."tdd-util"; - "tdoc" = dontDistribute super."tdoc"; - "teams" = dontDistribute super."teams"; - "teeth" = dontDistribute super."teeth"; - "telegram" = dontDistribute super."telegram"; - "telegram-api" = dontDistribute super."telegram-api"; - "teleport" = dontDistribute super."teleport"; - "tellbot" = dontDistribute super."tellbot"; - "template-default" = dontDistribute super."template-default"; - "template-haskell-util" = dontDistribute super."template-haskell-util"; - "template-hsml" = dontDistribute super."template-hsml"; - "template-yj" = dontDistribute super."template-yj"; - "templateify" = dontDistribute super."templateify"; - "templatepg" = dontDistribute super."templatepg"; - "templater" = dontDistribute super."templater"; - "tempo" = dontDistribute super."tempo"; - "tempodb" = dontDistribute super."tempodb"; - "temporal-csound" = dontDistribute super."temporal-csound"; - "temporal-media" = dontDistribute super."temporal-media"; - "temporal-music-notation" = dontDistribute super."temporal-music-notation"; - "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; - "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; - "temporary-resourcet" = dontDistribute super."temporary-resourcet"; - "tempus" = dontDistribute super."tempus"; - "tempus-fugit" = dontDistribute super."tempus-fugit"; - "tensor" = dontDistribute super."tensor"; - "term-rewriting" = dontDistribute super."term-rewriting"; - "termbox-bindings" = dontDistribute super."termbox-bindings"; - "termination-combinators" = dontDistribute super."termination-combinators"; - "terminfo" = doDistribute super."terminfo_0_4_0_2"; - "terminfo-hs" = dontDistribute super."terminfo-hs"; - "termplot" = dontDistribute super."termplot"; - "terntup" = dontDistribute super."terntup"; - "terrahs" = dontDistribute super."terrahs"; - "tersmu" = dontDistribute super."tersmu"; - "test-framework-doctest" = dontDistribute super."test-framework-doctest"; - "test-framework-golden" = dontDistribute super."test-framework-golden"; - "test-framework-program" = dontDistribute super."test-framework-program"; - "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; - "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; - "test-framework-skip" = dontDistribute super."test-framework-skip"; - "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; - "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; - "test-invariant" = dontDistribute super."test-invariant"; - "test-pkg" = dontDistribute super."test-pkg"; - "test-sandbox" = dontDistribute super."test-sandbox"; - "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; - "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; - "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; - "test-shouldbe" = dontDistribute super."test-shouldbe"; - "testPkg" = dontDistribute super."testPkg"; - "testbench" = dontDistribute super."testbench"; - "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; - "testloop" = dontDistribute super."testloop"; - "testpack" = dontDistribute super."testpack"; - "testpattern" = dontDistribute super."testpattern"; - "testrunner" = dontDistribute super."testrunner"; - "tetris" = dontDistribute super."tetris"; - "tex2txt" = dontDistribute super."tex2txt"; - "texrunner" = dontDistribute super."texrunner"; - "text-and-plots" = dontDistribute super."text-and-plots"; - "text-format-simple" = dontDistribute super."text-format-simple"; - "text-icu-normalized" = dontDistribute super."text-icu-normalized"; - "text-icu-translit" = dontDistribute super."text-icu-translit"; - "text-json-qq" = dontDistribute super."text-json-qq"; - "text-latin1" = dontDistribute super."text-latin1"; - "text-lips" = dontDistribute super."text-lips"; - "text-loc" = dontDistribute super."text-loc"; - "text-locale-encoding" = dontDistribute super."text-locale-encoding"; - "text-markup" = dontDistribute super."text-markup"; - "text-normal" = dontDistribute super."text-normal"; - "text-position" = dontDistribute super."text-position"; - "text-printer" = dontDistribute super."text-printer"; - "text-regex-replace" = dontDistribute super."text-regex-replace"; - "text-register-machine" = dontDistribute super."text-register-machine"; - "text-render" = dontDistribute super."text-render"; - "text-stream-decode" = dontDistribute super."text-stream-decode"; - "text-utf7" = dontDistribute super."text-utf7"; - "text-xml-generic" = dontDistribute super."text-xml-generic"; - "text-xml-qq" = dontDistribute super."text-xml-qq"; - "text-zipper" = dontDistribute super."text-zipper"; - "text-zipper-monad" = dontDistribute super."text-zipper-monad"; - "text1" = dontDistribute super."text1"; - "textPlot" = dontDistribute super."textPlot"; - "textmatetags" = dontDistribute super."textmatetags"; - "textocat-api" = dontDistribute super."textocat-api"; - "texts" = dontDistribute super."texts"; - "textual" = dontDistribute super."textual"; - "tfp" = dontDistribute super."tfp"; - "tfp-th" = dontDistribute super."tfp-th"; - "tftp" = dontDistribute super."tftp"; - "tga" = dontDistribute super."tga"; - "th-alpha" = dontDistribute super."th-alpha"; - "th-build" = dontDistribute super."th-build"; - "th-cas" = dontDistribute super."th-cas"; - "th-context" = dontDistribute super."th-context"; - "th-fold" = dontDistribute super."th-fold"; - "th-inline-io-action" = dontDistribute super."th-inline-io-action"; - "th-instance-reification" = dontDistribute super."th-instance-reification"; - "th-instances" = dontDistribute super."th-instances"; - "th-kinds" = dontDistribute super."th-kinds"; - "th-kinds-fork" = dontDistribute super."th-kinds-fork"; - "th-sccs" = dontDistribute super."th-sccs"; - "th-traced" = dontDistribute super."th-traced"; - "th-typegraph" = dontDistribute super."th-typegraph"; - "themoviedb" = dontDistribute super."themoviedb"; - "themplate" = dontDistribute super."themplate"; - "thentos-cookie-session" = dontDistribute super."thentos-cookie-session"; - "theoremquest" = dontDistribute super."theoremquest"; - "theoremquest-client" = dontDistribute super."theoremquest-client"; - "thespian" = dontDistribute super."thespian"; - "theta-functions" = dontDistribute super."theta-functions"; - "thih" = dontDistribute super."thih"; - "thimk" = dontDistribute super."thimk"; - "thorn" = dontDistribute super."thorn"; - "thread-local-storage" = dontDistribute super."thread-local-storage"; - "threadPool" = dontDistribute super."threadPool"; - "threadmanager" = dontDistribute super."threadmanager"; - "threads-pool" = dontDistribute super."threads-pool"; - "threads-supervisor" = dontDistribute super."threads-supervisor"; - "threadscope" = dontDistribute super."threadscope"; - "threefish" = dontDistribute super."threefish"; - "threepenny-gui" = dontDistribute super."threepenny-gui"; - "thrift" = dontDistribute super."thrift"; - "thrist" = dontDistribute super."thrist"; - "throttle" = dontDistribute super."throttle"; - "throttled-io-loop" = dontDistribute super."throttled-io-loop"; - "thumbnail" = dontDistribute super."thumbnail"; - "tianbar" = dontDistribute super."tianbar"; - "tic-tac-toe" = dontDistribute super."tic-tac-toe"; - "tickle" = dontDistribute super."tickle"; - "tictactoe3d" = dontDistribute super."tictactoe3d"; - "tidal-midi" = dontDistribute super."tidal-midi"; - "tidal-serial" = dontDistribute super."tidal-serial"; - "tidal-vis" = dontDistribute super."tidal-vis"; - "tie-knot" = dontDistribute super."tie-knot"; - "tiempo" = dontDistribute super."tiempo"; - "tiger" = dontDistribute super."tiger"; - "tight-apply" = dontDistribute super."tight-apply"; - "tightrope" = dontDistribute super."tightrope"; - "tighttp" = dontDistribute super."tighttp"; - "tilings" = dontDistribute super."tilings"; - "timberc" = dontDistribute super."timberc"; - "time-cache" = dontDistribute super."time-cache"; - "time-extras" = dontDistribute super."time-extras"; - "time-exts" = dontDistribute super."time-exts"; - "time-http" = dontDistribute super."time-http"; - "time-interval" = dontDistribute super."time-interval"; - "time-io-access" = dontDistribute super."time-io-access"; - "time-out" = dontDistribute super."time-out"; - "time-patterns" = dontDistribute super."time-patterns"; - "time-qq" = dontDistribute super."time-qq"; - "time-recurrence" = dontDistribute super."time-recurrence"; - "time-series" = dontDistribute super."time-series"; - "time-units" = dontDistribute super."time-units"; - "time-w3c" = dontDistribute super."time-w3c"; - "timecalc" = dontDistribute super."timecalc"; - "timeconsole" = dontDistribute super."timeconsole"; - "timeless" = dontDistribute super."timeless"; - "timelike" = dontDistribute super."timelike"; - "timelike-clock" = dontDistribute super."timelike-clock"; - "timelike-time" = dontDistribute super."timelike-time"; - "timeout" = dontDistribute super."timeout"; - "timeout-control" = dontDistribute super."timeout-control"; - "timeout-with-results" = dontDistribute super."timeout-with-results"; - "timeparsers" = dontDistribute super."timeparsers"; - "timeplot" = dontDistribute super."timeplot"; - "timeprint" = dontDistribute super."timeprint"; - "timers" = dontDistribute super."timers"; - "timers-updatable" = dontDistribute super."timers-updatable"; - "timespan" = dontDistribute super."timespan"; - "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; - "timestamper" = dontDistribute super."timestamper"; - "timezone-olson-th" = dontDistribute super."timezone-olson-th"; - "timing-convenience" = dontDistribute super."timing-convenience"; - "tinyMesh" = dontDistribute super."tinyMesh"; - "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; - "tip-lib" = dontDistribute super."tip-lib"; - "tiphys" = dontDistribute super."tiphys"; - "titlecase" = dontDistribute super."titlecase"; - "tkhs" = dontDistribute super."tkhs"; - "tkyprof" = dontDistribute super."tkyprof"; - "tld" = dontDistribute super."tld"; - "tls-extra" = dontDistribute super."tls-extra"; - "tmpl" = dontDistribute super."tmpl"; - "tn" = dontDistribute super."tn"; - "tnet" = dontDistribute super."tnet"; - "to-haskell" = dontDistribute super."to-haskell"; - "to-string-class" = dontDistribute super."to-string-class"; - "to-string-instances" = dontDistribute super."to-string-instances"; - "todos" = dontDistribute super."todos"; - "tofromxml" = dontDistribute super."tofromxml"; - "toilet" = dontDistribute super."toilet"; - "tokenify" = dontDistribute super."tokenify"; - "tokenize" = dontDistribute super."tokenize"; - "toktok" = dontDistribute super."toktok"; - "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; - "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; - "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; - "toml" = dontDistribute super."toml"; - "toolshed" = dontDistribute super."toolshed"; - "topkata" = dontDistribute super."topkata"; - "torch" = dontDistribute super."torch"; - "torrent" = dontDistribute super."torrent"; - "total" = dontDistribute super."total"; - "total-alternative" = dontDistribute super."total-alternative"; - "total-map" = dontDistribute super."total-map"; - "total-maps" = dontDistribute super."total-maps"; - "touched" = dontDistribute super."touched"; - "toysolver" = dontDistribute super."toysolver"; - "tpar" = dontDistribute super."tpar"; - "tpdb" = dontDistribute super."tpdb"; - "trace" = dontDistribute super."trace"; - "trace-call" = dontDistribute super."trace-call"; - "trace-function-call" = dontDistribute super."trace-function-call"; - "traced" = dontDistribute super."traced"; - "tracer" = dontDistribute super."tracer"; - "tracetree" = dontDistribute super."tracetree"; - "tracker" = dontDistribute super."tracker"; - "tracy" = dontDistribute super."tracy"; - "traildb" = dontDistribute super."traildb"; - "trajectory" = dontDistribute super."trajectory"; - "transactional-events" = dontDistribute super."transactional-events"; - "transf" = dontDistribute super."transf"; - "transformations" = dontDistribute super."transformations"; - "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compose" = dontDistribute super."transformers-compose"; - "transformers-convert" = dontDistribute super."transformers-convert"; - "transformers-eff" = dontDistribute super."transformers-eff"; - "transformers-free" = dontDistribute super."transformers-free"; - "transformers-runnable" = dontDistribute super."transformers-runnable"; - "transformers-supply" = dontDistribute super."transformers-supply"; - "translatable-intset" = dontDistribute super."translatable-intset"; - "translate" = dontDistribute super."translate"; - "travis" = dontDistribute super."travis"; - "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; - "trawl" = dontDistribute super."trawl"; - "traypoweroff" = dontDistribute super."traypoweroff"; - "tree-monad" = dontDistribute super."tree-monad"; - "treemap" = dontDistribute super."treemap"; - "treemap-html" = dontDistribute super."treemap-html"; - "treemap-html-tools" = dontDistribute super."treemap-html-tools"; - "treersec" = dontDistribute super."treersec"; - "treeviz" = dontDistribute super."treeviz"; - "tremulous-query" = dontDistribute super."tremulous-query"; - "trhsx" = dontDistribute super."trhsx"; - "triangulation" = dontDistribute super."triangulation"; - "trimpolya" = dontDistribute super."trimpolya"; - "tripLL" = dontDistribute super."tripLL"; - "trivia" = dontDistribute super."trivia"; - "trivial-constraint" = dontDistribute super."trivial-constraint"; - "tropical" = dontDistribute super."tropical"; - "truelevel" = dontDistribute super."truelevel"; - "trurl" = dontDistribute super."trurl"; - "truthful" = dontDistribute super."truthful"; - "tsession" = dontDistribute super."tsession"; - "tsession-happstack" = dontDistribute super."tsession-happstack"; - "tskiplist" = dontDistribute super."tskiplist"; - "tslib" = dontDistribute super."tslib"; - "tslogger" = dontDistribute super."tslogger"; - "tsp-viz" = dontDistribute super."tsp-viz"; - "tsparse" = dontDistribute super."tsparse"; - "tst" = dontDistribute super."tst"; - "tsvsql" = dontDistribute super."tsvsql"; - "ttask" = dontDistribute super."ttask"; - "tubes" = dontDistribute super."tubes"; - "tuntap" = dontDistribute super."tuntap"; - "tup-functor" = dontDistribute super."tup-functor"; - "tuple-gen" = dontDistribute super."tuple-gen"; - "tuple-generic" = dontDistribute super."tuple-generic"; - "tuple-hlist" = dontDistribute super."tuple-hlist"; - "tuple-lenses" = dontDistribute super."tuple-lenses"; - "tuple-morph" = dontDistribute super."tuple-morph"; - "tupleinstances" = dontDistribute super."tupleinstances"; - "turing" = dontDistribute super."turing"; - "turing-machines" = dontDistribute super."turing-machines"; - "turing-music" = dontDistribute super."turing-music"; - "turingMachine" = dontDistribute super."turingMachine"; - "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; - "turni" = dontDistribute super."turni"; - "tweak" = dontDistribute super."tweak"; - "twee" = dontDistribute super."twee"; - "twentefp" = dontDistribute super."twentefp"; - "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; - "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; - "twentefp-graphs" = dontDistribute super."twentefp-graphs"; - "twentefp-number" = dontDistribute super."twentefp-number"; - "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; - "twentefp-trees" = dontDistribute super."twentefp-trees"; - "twentefp-websockets" = dontDistribute super."twentefp-websockets"; - "twentyseven" = dontDistribute super."twentyseven"; - "twhs" = dontDistribute super."twhs"; - "twidge" = dontDistribute super."twidge"; - "twilight-stm" = dontDistribute super."twilight-stm"; - "twilio" = dontDistribute super."twilio"; - "twill" = dontDistribute super."twill"; - "twiml" = dontDistribute super."twiml"; - "twine" = dontDistribute super."twine"; - "twisty" = dontDistribute super."twisty"; - "twitch" = dontDistribute super."twitch"; - "twitter" = dontDistribute super."twitter"; - "twitter-enumerator" = dontDistribute super."twitter-enumerator"; - "tx" = dontDistribute super."tx"; - "txt-sushi" = dontDistribute super."txt-sushi"; - "txt2rtf" = dontDistribute super."txt2rtf"; - "txtblk" = dontDistribute super."txtblk"; - "ty" = dontDistribute super."ty"; - "typalyze" = dontDistribute super."typalyze"; - "type-booleans" = dontDistribute super."type-booleans"; - "type-cache" = dontDistribute super."type-cache"; - "type-cereal" = dontDistribute super."type-cereal"; - "type-combinators" = dontDistribute super."type-combinators"; - "type-combinators-quote" = dontDistribute super."type-combinators-quote"; - "type-digits" = dontDistribute super."type-digits"; - "type-equality" = dontDistribute super."type-equality"; - "type-equality-check" = dontDistribute super."type-equality-check"; - "type-functions" = dontDistribute super."type-functions"; - "type-hint" = dontDistribute super."type-hint"; - "type-int" = dontDistribute super."type-int"; - "type-iso" = dontDistribute super."type-iso"; - "type-level" = dontDistribute super."type-level"; - "type-level-bst" = dontDistribute super."type-level-bst"; - "type-level-natural-number" = dontDistribute super."type-level-natural-number"; - "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; - "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; - "type-level-sets" = dontDistribute super."type-level-sets"; - "type-level-tf" = dontDistribute super."type-level-tf"; - "type-natural" = dontDistribute super."type-natural"; - "type-operators" = dontDistribute super."type-operators"; - "type-ord" = dontDistribute super."type-ord"; - "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; - "type-prelude" = dontDistribute super."type-prelude"; - "type-settheory" = dontDistribute super."type-settheory"; - "type-spine" = dontDistribute super."type-spine"; - "type-structure" = dontDistribute super."type-structure"; - "type-sub-th" = dontDistribute super."type-sub-th"; - "type-unary" = dontDistribute super."type-unary"; - "typeable-th" = dontDistribute super."typeable-th"; - "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; - "typed-wire" = dontDistribute super."typed-wire"; - "typed-wire-utils" = dontDistribute super."typed-wire-utils"; - "typedquery" = dontDistribute super."typedquery"; - "typehash" = dontDistribute super."typehash"; - "typelevel" = dontDistribute super."typelevel"; - "typelevel-tensor" = dontDistribute super."typelevel-tensor"; - "typeof" = dontDistribute super."typeof"; - "typeparams" = dontDistribute super."typeparams"; - "types-compat" = dontDistribute super."types-compat"; - "typesafe-endian" = dontDistribute super."typesafe-endian"; - "typescript-docs" = dontDistribute super."typescript-docs"; - "typical" = dontDistribute super."typical"; - "tz" = dontDistribute super."tz"; - "uAgda" = dontDistribute super."uAgda"; - "uacpid" = dontDistribute super."uacpid"; - "uber" = dontDistribute super."uber"; - "uberlast" = dontDistribute super."uberlast"; - "uconv" = dontDistribute super."uconv"; - "udbus" = dontDistribute super."udbus"; - "udbus-model" = dontDistribute super."udbus-model"; - "udcode" = dontDistribute super."udcode"; - "udev" = dontDistribute super."udev"; - "uhc-light" = dontDistribute super."uhc-light"; - "uhc-util" = dontDistribute super."uhc-util"; - "uhexdump" = dontDistribute super."uhexdump"; - "uhttpc" = dontDistribute super."uhttpc"; - "ui-command" = dontDistribute super."ui-command"; - "uid" = dontDistribute super."uid"; - "una" = dontDistribute super."una"; - "unagi-bloomfilter" = dontDistribute super."unagi-bloomfilter"; - "unagi-chan" = dontDistribute super."unagi-chan"; - "unagi-streams" = dontDistribute super."unagi-streams"; - "unamb" = dontDistribute super."unamb"; - "unamb-custom" = dontDistribute super."unamb-custom"; - "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; - "unboxed-containers" = dontDistribute super."unboxed-containers"; - "unbreak" = dontDistribute super."unbreak"; - "ungadtagger" = dontDistribute super."ungadtagger"; - "uni-events" = dontDistribute super."uni-events"; - "uni-graphs" = dontDistribute super."uni-graphs"; - "uni-htk" = dontDistribute super."uni-htk"; - "uni-posixutil" = dontDistribute super."uni-posixutil"; - "uni-reactor" = dontDistribute super."uni-reactor"; - "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; - "uni-util" = dontDistribute super."uni-util"; - "unicode" = dontDistribute super."unicode"; - "unicode-names" = dontDistribute super."unicode-names"; - "unicode-normalization" = dontDistribute super."unicode-normalization"; - "unicode-prelude" = dontDistribute super."unicode-prelude"; - "unicode-properties" = dontDistribute super."unicode-properties"; - "unicode-symbols" = dontDistribute super."unicode-symbols"; - "unicoder" = dontDistribute super."unicoder"; - "uniform-io" = dontDistribute super."uniform-io"; - "uniform-pair" = dontDistribute super."uniform-pair"; - "union-find-array" = dontDistribute super."union-find-array"; - "union-map" = dontDistribute super."union-map"; - "unique" = dontDistribute super."unique"; - "unique-logic" = dontDistribute super."unique-logic"; - "unique-logic-tf" = dontDistribute super."unique-logic-tf"; - "uniqueid" = dontDistribute super."uniqueid"; - "unit" = dontDistribute super."unit"; - "units-attoparsec" = dontDistribute super."units-attoparsec"; - "unittyped" = dontDistribute super."unittyped"; - "universal-binary" = dontDistribute super."universal-binary"; - "universe-th" = dontDistribute super."universe-th"; - "unix-fcntl" = dontDistribute super."unix-fcntl"; - "unix-handle" = dontDistribute super."unix-handle"; - "unix-io-extra" = dontDistribute super."unix-io-extra"; - "unix-memory" = dontDistribute super."unix-memory"; - "unix-process-conduit" = dontDistribute super."unix-process-conduit"; - "unix-pty-light" = dontDistribute super."unix-pty-light"; - "unlambda" = dontDistribute super."unlambda"; - "unlit" = dontDistribute super."unlit"; - "unm-hip" = dontDistribute super."unm-hip"; - "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; - "unordered-graphs" = dontDistribute super."unordered-graphs"; - "unpack-funcs" = dontDistribute super."unpack-funcs"; - "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; - "unsafe" = dontDistribute super."unsafe"; - "unsafe-promises" = dontDistribute super."unsafe-promises"; - "unsafely" = dontDistribute super."unsafely"; - "unsafeperformst" = dontDistribute super."unsafeperformst"; - "unscramble" = dontDistribute super."unscramble"; - "unsequential" = dontDistribute super."unsequential"; - "unusable-pkg" = dontDistribute super."unusable-pkg"; - "unused" = dontDistribute super."unused"; - "uom-plugin" = dontDistribute super."uom-plugin"; - "up" = dontDistribute super."up"; - "up-grade" = dontDistribute super."up-grade"; - "uploadcare" = dontDistribute super."uploadcare"; - "upskirt" = dontDistribute super."upskirt"; - "ureader" = dontDistribute super."ureader"; - "urembed" = dontDistribute super."urembed"; - "uri" = dontDistribute super."uri"; - "uri-conduit" = dontDistribute super."uri-conduit"; - "uri-enumerator" = dontDistribute super."uri-enumerator"; - "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; - "uri-template" = dontDistribute super."uri-template"; - "uri-templater" = dontDistribute super."uri-templater"; - "url-generic" = dontDistribute super."url-generic"; - "urlcheck" = dontDistribute super."urlcheck"; - "urldecode" = dontDistribute super."urldecode"; - "urldisp-happstack" = dontDistribute super."urldisp-happstack"; - "urlencoded" = dontDistribute super."urlencoded"; - "urn" = dontDistribute super."urn"; - "urxml" = dontDistribute super."urxml"; - "usb" = dontDistribute super."usb"; - "usb-enumerator" = dontDistribute super."usb-enumerator"; - "usb-hid" = dontDistribute super."usb-hid"; - "usb-id-database" = dontDistribute super."usb-id-database"; - "usb-iteratee" = dontDistribute super."usb-iteratee"; - "usb-safe" = dontDistribute super."usb-safe"; - "users-persistent" = dontDistribute super."users-persistent"; - "utc" = dontDistribute super."utc"; - "utf8-env" = dontDistribute super."utf8-env"; - "utf8-prelude" = dontDistribute super."utf8-prelude"; - "uu-cco" = dontDistribute super."uu-cco"; - "uu-cco-examples" = dontDistribute super."uu-cco-examples"; - "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; - "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; - "uu-options" = dontDistribute super."uu-options"; - "uu-tc" = dontDistribute super."uu-tc"; - "uuagc" = dontDistribute super."uuagc"; - "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; - "uuagc-cabal" = dontDistribute super."uuagc-cabal"; - "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; - "uuagd" = dontDistribute super."uuagd"; - "uuid-aeson" = dontDistribute super."uuid-aeson"; - "uuid-le" = dontDistribute super."uuid-le"; - "uuid-quasi" = dontDistribute super."uuid-quasi"; - "uulib" = dontDistribute super."uulib"; - "uvector" = dontDistribute super."uvector"; - "uvector-algorithms" = dontDistribute super."uvector-algorithms"; - "uxadt" = dontDistribute super."uxadt"; - "uzbl-with-source" = dontDistribute super."uzbl-with-source"; - "v4l2" = dontDistribute super."v4l2"; - "v4l2-examples" = dontDistribute super."v4l2-examples"; - "vacuum" = dontDistribute super."vacuum"; - "vacuum-cairo" = dontDistribute super."vacuum-cairo"; - "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; - "vacuum-opengl" = dontDistribute super."vacuum-opengl"; - "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; - "valid-names" = dontDistribute super."valid-names"; - "validate" = dontDistribute super."validate"; - "validated-literals" = dontDistribute super."validated-literals"; - "validations" = dontDistribute super."validations"; - "validity" = dontDistribute super."validity"; - "validity-containers" = dontDistribute super."validity-containers"; - "value-supply" = dontDistribute super."value-supply"; - "vampire" = dontDistribute super."vampire"; - "var" = dontDistribute super."var"; - "varan" = dontDistribute super."varan"; - "variable-precision" = dontDistribute super."variable-precision"; - "variables" = dontDistribute super."variables"; - "vaultaire-common" = dontDistribute super."vaultaire-common"; - "vcache" = dontDistribute super."vcache"; - "vcache-trie" = dontDistribute super."vcache-trie"; - "vcard" = dontDistribute super."vcard"; - "vcatt" = dontDistribute super."vcatt"; - "vcd" = dontDistribute super."vcd"; - "vcs-revision" = dontDistribute super."vcs-revision"; - "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; - "vcsgui" = dontDistribute super."vcsgui"; - "vect" = dontDistribute super."vect"; - "vect-floating" = dontDistribute super."vect-floating"; - "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; - "vect-opengl" = dontDistribute super."vect-opengl"; - "vector-binary" = dontDistribute super."vector-binary"; - "vector-bytes-instances" = dontDistribute super."vector-bytes-instances"; - "vector-bytestring" = dontDistribute super."vector-bytestring"; - "vector-clock" = dontDistribute super."vector-clock"; - "vector-conduit" = dontDistribute super."vector-conduit"; - "vector-functorlazy" = dontDistribute super."vector-functorlazy"; - "vector-heterogenous" = dontDistribute super."vector-heterogenous"; - "vector-instances-collections" = dontDistribute super."vector-instances-collections"; - "vector-mmap" = dontDistribute super."vector-mmap"; - "vector-random" = dontDistribute super."vector-random"; - "vector-read-instances" = dontDistribute super."vector-read-instances"; - "vector-sized" = dontDistribute super."vector-sized"; - "vector-space-map" = dontDistribute super."vector-space-map"; - "vector-space-opengl" = dontDistribute super."vector-space-opengl"; - "vector-space-points" = dontDistribute super."vector-space-points"; - "vector-static" = dontDistribute super."vector-static"; - "vector-strategies" = dontDistribute super."vector-strategies"; - "verbalexpressions" = dontDistribute super."verbalexpressions"; - "verbosity" = dontDistribute super."verbosity"; - "verdict" = dontDistribute super."verdict"; - "verdict-json" = dontDistribute super."verdict-json"; - "verilog" = dontDistribute super."verilog"; - "vhdl" = dontDistribute super."vhdl"; - "views" = dontDistribute super."views"; - "vigilance" = dontDistribute super."vigilance"; - "vimeta" = dontDistribute super."vimeta"; - "vimus" = dontDistribute super."vimus"; - "vintage-basic" = dontDistribute super."vintage-basic"; - "vinyl-gl" = dontDistribute super."vinyl-gl"; - "vinyl-json" = dontDistribute super."vinyl-json"; - "vinyl-operational" = dontDistribute super."vinyl-operational"; - "vinyl-plus" = dontDistribute super."vinyl-plus"; - "vinyl-vectors" = dontDistribute super."vinyl-vectors"; - "virthualenv" = dontDistribute super."virthualenv"; - "visibility" = dontDistribute super."visibility"; - "vision" = dontDistribute super."vision"; - "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; - "visual-prof" = dontDistribute super."visual-prof"; - "vivid" = dontDistribute super."vivid"; - "vk-aws-route53" = dontDistribute super."vk-aws-route53"; - "vk-posix-pty" = dontDistribute super."vk-posix-pty"; - "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; - "vorbiscomment" = dontDistribute super."vorbiscomment"; - "vowpal-utils" = dontDistribute super."vowpal-utils"; - "voyeur" = dontDistribute super."voyeur"; - "vrpn" = dontDistribute super."vrpn"; - "vte" = dontDistribute super."vte"; - "vtegtk3" = dontDistribute super."vtegtk3"; - "vty-examples" = dontDistribute super."vty-examples"; - "vty-menu" = dontDistribute super."vty-menu"; - "vty-ui" = dontDistribute super."vty-ui"; - "vty-ui-extras" = dontDistribute super."vty-ui-extras"; - "vulkan" = dontDistribute super."vulkan"; - "wacom-daemon" = dontDistribute super."wacom-daemon"; - "waddle" = dontDistribute super."waddle"; - "wai-accept-language" = dontDistribute super."wai-accept-language"; - "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; - "wai-devel" = dontDistribute super."wai-devel"; - "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; - "wai-dispatch" = dontDistribute super."wai-dispatch"; - "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; - "wai-graceful" = dontDistribute super."wai-graceful"; - "wai-handler-devel" = dontDistribute super."wai-handler-devel"; - "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; - "wai-handler-launch" = dontDistribute super."wai-handler-launch"; - "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; - "wai-handler-snap" = dontDistribute super."wai-handler-snap"; - "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; - "wai-hastache" = dontDistribute super."wai-hastache"; - "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; - "wai-http2-extra" = dontDistribute super."wai-http2-extra"; - "wai-lens" = dontDistribute super."wai-lens"; - "wai-lite" = dontDistribute super."wai-lite"; - "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; - "wai-make-assets" = dontDistribute super."wai-make-assets"; - "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; - "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; - "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; - "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; - "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; - "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; - "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; - "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; - "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; - "wai-middleware-route" = dontDistribute super."wai-middleware-route"; - "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; - "wai-responsible" = dontDistribute super."wai-responsible"; - "wai-route" = dontDistribute super."wai-route"; - "wai-router" = dontDistribute super."wai-router"; - "wai-routes" = dontDistribute super."wai-routes"; - "wai-routing" = dontDistribute super."wai-routing"; - "wai-session-alt" = dontDistribute super."wai-session-alt"; - "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; - "wai-session-mysql" = dontDistribute super."wai-session-mysql"; - "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; - "wai-static-cache" = dontDistribute super."wai-static-cache"; - "wai-static-pages" = dontDistribute super."wai-static-pages"; - "wai-test" = dontDistribute super."wai-test"; - "wai-thrift" = dontDistribute super."wai-thrift"; - "wai-throttler" = dontDistribute super."wai-throttler"; - "wai-util" = dontDistribute super."wai-util"; - "wait-handle" = dontDistribute super."wait-handle"; - "waitfree" = dontDistribute super."waitfree"; - "warc" = dontDistribute super."warc"; - "warp-dynamic" = dontDistribute super."warp-dynamic"; - "warp-static" = dontDistribute super."warp-static"; - "warp-tls-uid" = dontDistribute super."warp-tls-uid"; - "watchdog" = dontDistribute super."watchdog"; - "watcher" = dontDistribute super."watcher"; - "watchit" = dontDistribute super."watchit"; - "wavconvert" = dontDistribute super."wavconvert"; - "wavefront" = dontDistribute super."wavefront"; - "wavesurfer" = dontDistribute super."wavesurfer"; - "wavy" = dontDistribute super."wavy"; - "wcwidth" = dontDistribute super."wcwidth"; - "weather-api" = dontDistribute super."weather-api"; - "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; - "web-css" = dontDistribute super."web-css"; - "web-encodings" = dontDistribute super."web-encodings"; - "web-fpco" = dontDistribute super."web-fpco"; - "web-inv-route" = dontDistribute super."web-inv-route"; - "web-mongrel2" = dontDistribute super."web-mongrel2"; - "web-page" = dontDistribute super."web-page"; - "web-routes-mtl" = dontDistribute super."web-routes-mtl"; - "web-routes-quasi" = dontDistribute super."web-routes-quasi"; - "web-routes-regular" = dontDistribute super."web-routes-regular"; - "web-routes-transformers" = dontDistribute super."web-routes-transformers"; - "web-routing" = dontDistribute super."web-routing"; - "webapi" = dontDistribute super."webapi"; - "webapp" = dontDistribute super."webapp"; - "webcloud" = dontDistribute super."webcloud"; - "webcrank" = dontDistribute super."webcrank"; - "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; - "webcrank-wai" = dontDistribute super."webcrank-wai"; - "webdriver-snoy" = dontDistribute super."webdriver-snoy"; - "webfinger-client" = dontDistribute super."webfinger-client"; - "webidl" = dontDistribute super."webidl"; - "webify" = dontDistribute super."webify"; - "webkit" = dontDistribute super."webkit"; - "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; - "webserver" = dontDistribute super."webserver"; - "websnap" = dontDistribute super."websnap"; - "websockets-snap" = dontDistribute super."websockets-snap"; - "webwire" = dontDistribute super."webwire"; - "wedding-announcement" = dontDistribute super."wedding-announcement"; - "wedged" = dontDistribute super."wedged"; - "weighted-regexp" = dontDistribute super."weighted-regexp"; - "weighted-search" = dontDistribute super."weighted-search"; - "welshy" = dontDistribute super."welshy"; - "wheb-mongo" = dontDistribute super."wheb-mongo"; - "wheb-redis" = dontDistribute super."wheb-redis"; - "wheb-strapped" = dontDistribute super."wheb-strapped"; - "while-lang-parser" = dontDistribute super."while-lang-parser"; - "whim" = dontDistribute super."whim"; - "whiskers" = dontDistribute super."whiskers"; - "whitespace" = dontDistribute super."whitespace"; - "whois" = dontDistribute super."whois"; - "why3" = dontDistribute super."why3"; - "wigner-symbols" = dontDistribute super."wigner-symbols"; - "wikipedia4epub" = dontDistribute super."wikipedia4epub"; - "win-hp-path" = dontDistribute super."win-hp-path"; - "windowslive" = dontDistribute super."windowslive"; - "winerror" = dontDistribute super."winerror"; - "winio" = dontDistribute super."winio"; - "wire-streams" = dontDistribute super."wire-streams"; - "wires" = dontDistribute super."wires"; - "wiring" = dontDistribute super."wiring"; - "witness" = dontDistribute super."witness"; - "witty" = dontDistribute super."witty"; - "wkt" = dontDistribute super."wkt"; - "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; - "wlc-hs" = dontDistribute super."wlc-hs"; - "wobsurv" = dontDistribute super."wobsurv"; - "woffex" = dontDistribute super."woffex"; - "wol" = dontDistribute super."wol"; - "wolf" = dontDistribute super."wolf"; - "woot" = dontDistribute super."woot"; - "word-vector" = dontDistribute super."word-vector"; - "word24" = dontDistribute super."word24"; - "wordcloud" = dontDistribute super."wordcloud"; - "wordexp" = dontDistribute super."wordexp"; - "words" = dontDistribute super."words"; - "wordsearch" = dontDistribute super."wordsearch"; - "wordsetdiff" = dontDistribute super."wordsetdiff"; - "workdays" = dontDistribute super."workdays"; - "workflow-osx" = dontDistribute super."workflow-osx"; - "workflow-types" = dontDistribute super."workflow-types"; - "workflow-windows" = dontDistribute super."workflow-windows"; - "wp-archivebot" = dontDistribute super."wp-archivebot"; - "wraparound" = dontDistribute super."wraparound"; - "wraxml" = dontDistribute super."wraxml"; - "wreq-sb" = dontDistribute super."wreq-sb"; - "wright" = dontDistribute super."wright"; - "writer-cps-monads-tf" = dontDistribute super."writer-cps-monads-tf"; - "wsdl" = dontDistribute super."wsdl"; - "wsedit" = dontDistribute super."wsedit"; - "wtk" = dontDistribute super."wtk"; - "wtk-gtk" = dontDistribute super."wtk-gtk"; - "wumpus-basic" = dontDistribute super."wumpus-basic"; - "wumpus-core" = dontDistribute super."wumpus-core"; - "wumpus-drawing" = dontDistribute super."wumpus-drawing"; - "wumpus-microprint" = dontDistribute super."wumpus-microprint"; - "wumpus-tree" = dontDistribute super."wumpus-tree"; - "wx" = dontDistribute super."wx"; - "wxAsteroids" = dontDistribute super."wxAsteroids"; - "wxFruit" = dontDistribute super."wxFruit"; - "wxc" = dontDistribute super."wxc"; - "wxcore" = dontDistribute super."wxcore"; - "wxdirect" = dontDistribute super."wxdirect"; - "wxhnotepad" = dontDistribute super."wxhnotepad"; - "wxturtle" = dontDistribute super."wxturtle"; - "wybor" = dontDistribute super."wybor"; - "wyvern" = dontDistribute super."wyvern"; - "x-dsp" = dontDistribute super."x-dsp"; - "x11-xim" = dontDistribute super."x11-xim"; - "x11-xinput" = dontDistribute super."x11-xinput"; - "x509-util" = dontDistribute super."x509-util"; - "x86-64bit" = dontDistribute super."x86-64bit"; - "xattr" = dontDistribute super."xattr"; - "xbattbar" = dontDistribute super."xbattbar"; - "xcb-types" = dontDistribute super."xcb-types"; - "xcffib" = dontDistribute super."xcffib"; - "xchat-plugin" = dontDistribute super."xchat-plugin"; - "xcp" = dontDistribute super."xcp"; - "xdg-userdirs" = dontDistribute super."xdg-userdirs"; - "xdot" = dontDistribute super."xdot"; - "xfconf" = dontDistribute super."xfconf"; - "xformat" = dontDistribute super."xformat"; - "xhaskell-library" = dontDistribute super."xhaskell-library"; - "xhb" = dontDistribute super."xhb"; - "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; - "xhb-ewmh" = dontDistribute super."xhb-ewmh"; - "xhtml" = doDistribute super."xhtml_3000_2_1"; - "xhtml-combinators" = dontDistribute super."xhtml-combinators"; - "xilinx-lava" = dontDistribute super."xilinx-lava"; - "xine" = dontDistribute super."xine"; - "xing-api" = dontDistribute super."xing-api"; - "xinput-conduit" = dontDistribute super."xinput-conduit"; - "xkbcommon" = dontDistribute super."xkbcommon"; - "xkcd" = dontDistribute super."xkcd"; - "xlsx-templater" = dontDistribute super."xlsx-templater"; - "xml-basic" = dontDistribute super."xml-basic"; - "xml-catalog" = dontDistribute super."xml-catalog"; - "xml-conduit-decode" = dontDistribute super."xml-conduit-decode"; - "xml-enumerator" = dontDistribute super."xml-enumerator"; - "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; - "xml-extractors" = dontDistribute super."xml-extractors"; - "xml-helpers" = dontDistribute super."xml-helpers"; - "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; - "xml-monad" = dontDistribute super."xml-monad"; - "xml-parsec" = dontDistribute super."xml-parsec"; - "xml-picklers" = dontDistribute super."xml-picklers"; - "xml-pipe" = dontDistribute super."xml-pipe"; - "xml-prettify" = dontDistribute super."xml-prettify"; - "xml-push" = dontDistribute super."xml-push"; - "xml-query" = dontDistribute super."xml-query"; - "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; - "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; - "xml-to-json" = dontDistribute super."xml-to-json"; - "xml2html" = dontDistribute super."xml2html"; - "xml2json" = dontDistribute super."xml2json"; - "xml2x" = dontDistribute super."xml2x"; - "xmltv" = dontDistribute super."xmltv"; - "xmms2-client" = dontDistribute super."xmms2-client"; - "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; - "xmobar" = dontDistribute super."xmobar"; - "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; - "xmonad-contrib" = dontDistribute super."xmonad-contrib"; - "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; - "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; - "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; - "xmonad-eval" = dontDistribute super."xmonad-eval"; - "xmonad-extras" = dontDistribute super."xmonad-extras"; - "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; - "xmonad-utils" = dontDistribute super."xmonad-utils"; - "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; - "xmonad-windownames" = dontDistribute super."xmonad-windownames"; - "xmpipe" = dontDistribute super."xmpipe"; - "xorshift" = dontDistribute super."xorshift"; - "xosd" = dontDistribute super."xosd"; - "xournal-builder" = dontDistribute super."xournal-builder"; - "xournal-convert" = dontDistribute super."xournal-convert"; - "xournal-parser" = dontDistribute super."xournal-parser"; - "xournal-render" = dontDistribute super."xournal-render"; - "xournal-types" = dontDistribute super."xournal-types"; - "xpathdsv" = dontDistribute super."xpathdsv"; - "xsact" = dontDistribute super."xsact"; - "xsd" = dontDistribute super."xsd"; - "xsha1" = dontDistribute super."xsha1"; - "xslt" = dontDistribute super."xslt"; - "xtc" = dontDistribute super."xtc"; - "xtest" = dontDistribute super."xtest"; - "xturtle" = dontDistribute super."xturtle"; - "xxhash" = dontDistribute super."xxhash"; - "y0l0bot" = dontDistribute super."y0l0bot"; - "yabi" = dontDistribute super."yabi"; - "yabi-muno" = dontDistribute super."yabi-muno"; - "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; - "yahoo-web-search" = dontDistribute super."yahoo-web-search"; - "yajl" = dontDistribute super."yajl"; - "yajl-enumerator" = dontDistribute super."yajl-enumerator"; - "yall" = dontDistribute super."yall"; - "yamemo" = dontDistribute super."yamemo"; - "yaml-config" = dontDistribute super."yaml-config"; - "yaml-light" = dontDistribute super."yaml-light"; - "yaml-light-lens" = dontDistribute super."yaml-light-lens"; - "yaml-rpc" = dontDistribute super."yaml-rpc"; - "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; - "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; - "yaml-union" = dontDistribute super."yaml-union"; - "yaml2owl" = dontDistribute super."yaml2owl"; - "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; - "yampa-canvas" = dontDistribute super."yampa-canvas"; - "yampa-glfw" = dontDistribute super."yampa-glfw"; - "yampa-glut" = dontDistribute super."yampa-glut"; - "yampa2048" = dontDistribute super."yampa2048"; - "yandex-translate" = dontDistribute super."yandex-translate"; - "yaop" = dontDistribute super."yaop"; - "yap" = dontDistribute super."yap"; - "yarr-image-io" = dontDistribute super."yarr-image-io"; - "yate" = dontDistribute super."yate"; - "yavie" = dontDistribute super."yavie"; - "ycextra" = dontDistribute super."ycextra"; - "yeganesh" = dontDistribute super."yeganesh"; - "yeller" = dontDistribute super."yeller"; - "yeshql" = dontDistribute super."yeshql"; - "yesod-angular" = dontDistribute super."yesod-angular"; - "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; - "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; - "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; - "yesod-auth-deskcom" = dontDistribute super."yesod-auth-deskcom"; - "yesod-auth-fb" = dontDistribute super."yesod-auth-fb"; - "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; - "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; - "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; - "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; - "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; - "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; - "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; - "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; - "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; - "yesod-comments" = dontDistribute super."yesod-comments"; - "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; - "yesod-continuations" = dontDistribute super."yesod-continuations"; - "yesod-crud" = dontDistribute super."yesod-crud"; - "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; - "yesod-csp" = dontDistribute super."yesod-csp"; - "yesod-datatables" = dontDistribute super."yesod-datatables"; - "yesod-default" = dontDistribute super."yesod-default"; - "yesod-dsl" = dontDistribute super."yesod-dsl"; - "yesod-examples" = dontDistribute super."yesod-examples"; - "yesod-form-json" = dontDistribute super."yesod-form-json"; - "yesod-goodies" = dontDistribute super."yesod-goodies"; - "yesod-ip" = dontDistribute super."yesod-ip"; - "yesod-json" = dontDistribute super."yesod-json"; - "yesod-links" = dontDistribute super."yesod-links"; - "yesod-lucid" = dontDistribute super."yesod-lucid"; - "yesod-mangopay" = dontDistribute super."yesod-mangopay"; - "yesod-markdown" = dontDistribute super."yesod-markdown"; - "yesod-media-simple" = dontDistribute super."yesod-media-simple"; - "yesod-paginate" = dontDistribute super."yesod-paginate"; - "yesod-pagination" = dontDistribute super."yesod-pagination"; - "yesod-paginator" = dontDistribute super."yesod-paginator"; - "yesod-platform" = dontDistribute super."yesod-platform"; - "yesod-pnotify" = dontDistribute super."yesod-pnotify"; - "yesod-pure" = dontDistribute super."yesod-pure"; - "yesod-purescript" = dontDistribute super."yesod-purescript"; - "yesod-raml" = dontDistribute super."yesod-raml"; - "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; - "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; - "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; - "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; - "yesod-routes" = dontDistribute super."yesod-routes"; - "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; - "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; - "yesod-rst" = dontDistribute super."yesod-rst"; - "yesod-s3" = dontDistribute super."yesod-s3"; - "yesod-sass" = dontDistribute super."yesod-sass"; - "yesod-session-redis" = dontDistribute super."yesod-session-redis"; - "yesod-tableview" = dontDistribute super."yesod-tableview"; - "yesod-test-json" = dontDistribute super."yesod-test-json"; - "yesod-text-markdown" = dontDistribute super."yesod-text-markdown"; - "yesod-tls" = dontDistribute super."yesod-tls"; - "yesod-transloadit" = dontDistribute super."yesod-transloadit"; - "yesod-vend" = dontDistribute super."yesod-vend"; - "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; - "yesod-worker" = dontDistribute super."yesod-worker"; - "yet-another-logger" = dontDistribute super."yet-another-logger"; - "yhccore" = dontDistribute super."yhccore"; - "yi-contrib" = dontDistribute super."yi-contrib"; - "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; - "yi-gtk" = dontDistribute super."yi-gtk"; - "yi-monokai" = dontDistribute super."yi-monokai"; - "yi-snippet" = dontDistribute super."yi-snippet"; - "yi-solarized" = dontDistribute super."yi-solarized"; - "yi-spolsky" = dontDistribute super."yi-spolsky"; - "yi-vty" = dontDistribute super."yi-vty"; - "yices" = dontDistribute super."yices"; - "yices-easy" = dontDistribute super."yices-easy"; - "yices-painless" = dontDistribute super."yices-painless"; - "yjftp" = dontDistribute super."yjftp"; - "yjftp-libs" = dontDistribute super."yjftp-libs"; - "yjsvg" = dontDistribute super."yjsvg"; - "yocto" = dontDistribute super."yocto"; - "yoctoparsec" = dontDistribute super."yoctoparsec"; - "yoko" = dontDistribute super."yoko"; - "york-lava" = dontDistribute super."york-lava"; - "youtube" = dontDistribute super."youtube"; - "yql" = dontDistribute super."yql"; - "yst" = dontDistribute super."yst"; - "yuiGrid" = dontDistribute super."yuiGrid"; - "yuuko" = dontDistribute super."yuuko"; - "yxdb-utils" = dontDistribute super."yxdb-utils"; - "z3" = dontDistribute super."z3"; - "z3-encoding" = dontDistribute super."z3-encoding"; - "zabt" = dontDistribute super."zabt"; - "zalgo" = dontDistribute super."zalgo"; - "zampolit" = dontDistribute super."zampolit"; - "zasni-gerna" = dontDistribute super."zasni-gerna"; - "zcache" = dontDistribute super."zcache"; - "zenc" = dontDistribute super."zenc"; - "zendesk-api" = dontDistribute super."zendesk-api"; - "zeno" = dontDistribute super."zeno"; - "zerobin" = dontDistribute super."zerobin"; - "zeromq-haskell" = dontDistribute super."zeromq-haskell"; - "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; - "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; - "zeroth" = dontDistribute super."zeroth"; - "zigbee-znet25" = dontDistribute super."zigbee-znet25"; - "zim-parser" = dontDistribute super."zim-parser"; - "zip-conduit" = dontDistribute super."zip-conduit"; - "zipedit" = dontDistribute super."zipedit"; - "zipkin" = dontDistribute super."zipkin"; - "zipper" = dontDistribute super."zipper"; - "zippo" = dontDistribute super."zippo"; - "zlib-conduit" = dontDistribute super."zlib-conduit"; - "zlib-enum" = dontDistribute super."zlib-enum"; - "zmcat" = dontDistribute super."zmcat"; - "zmidi-core" = dontDistribute super."zmidi-core"; - "zmidi-score" = dontDistribute super."zmidi-score"; - "zmqat" = dontDistribute super."zmqat"; - "zoneinfo" = dontDistribute super."zoneinfo"; - "zoom" = dontDistribute super."zoom"; - "zoom-cache" = dontDistribute super."zoom-cache"; - "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; - "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; - "zsh-battery" = dontDistribute super."zsh-battery"; - "ztail" = dontDistribute super."ztail"; - "zxcvbn-c" = dontDistribute super."zxcvbn-c"; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc949e50ee3..2edce791899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4737,7 +4737,7 @@ in haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.lts-7.override { + haskellPackages = haskell.packages.ghc801.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f9d7f09aff..e1079f354d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -251,9 +251,7 @@ rec { lts-6_17 = packages.ghc7103; lts-6 = packages.lts-6_17; - lts-7_0 = packages.ghc801.override { - packageSetConfig = callPackage ../development/haskell-modules/configuration-lts.nix { }; - }; + lts-7_0 = packages.ghc801; lts-7 = packages.lts-7_0; lts = packages.lts-7; From fabd60a3978ed4ea8e00d54e37fad49785f2d5d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2016 19:27:01 +0200 Subject: [PATCH 188/234] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v2.0.1-10-gca03454 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/0aa5f8d5054e2b3e85cb5a6990848da3b72d71a5 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/b5ee848475140436a9795da2d3a0088ca95d36b5 --- .../haskell-modules/hackage-packages.nix | 212 +++++++++++++++--- 1 file changed, 181 insertions(+), 31 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8eafbc90a1a..4d046ca45d1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24871,6 +24871,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arithmoi_0_4_3_0" = callPackage + ({ mkDerivation, array, base, containers, ghc-prim, integer-gmp + , mtl, QuickCheck, random, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, transformers + , transformers-compat + }: + mkDerivation { + pname = "arithmoi"; + version = "0.4.3.0"; + sha256 = "daa3343d4be19d0a8574c542c9188f6f3075098c86c69d3bc66acd5091d5d196"; + configureFlags = [ "-f-llvm" ]; + libraryHaskellDepends = [ + array base containers ghc-prim integer-gmp mtl random + ]; + testHaskellDepends = [ + base containers QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck transformers transformers-compat + ]; + homepage = "https://github.com/cartazio/arithmoi"; + description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "armada" = callPackage ({ mkDerivation, base, GLUT, mtl, OpenGL, stm }: mkDerivation { @@ -28183,8 +28207,8 @@ self: { ({ mkDerivation, base, directory, filepath, Glob }: mkDerivation { pname = "batch-rename"; - version = "0.1.0.9"; - sha256 = "7b22e7cf6c55eb1f80822a35ff4b0a699767ea38cc0b106f0c3766b1c57653f7"; + version = "0.1.1.0"; + sha256 = "c22af153685c355df65c048986da2b9e5133f3892bc398dcf88aa1a6e864645e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath Glob ]; @@ -39753,8 +39777,8 @@ self: { }: mkDerivation { pname = "codex"; - version = "0.5.0.0"; - sha256 = "f516ed2f3751d3938e526aa61fb94a3553fbe6b6ffe76ed49fd442587e849984"; + version = "0.5.0.1"; + sha256 = "84822ced72c93bd22249f9fe05c79685050b3e7d2d3f7adedd9ded52a8c4407c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60564,6 +60588,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-vector_0_9_0_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: + mkDerivation { + pname = "fixed-vector"; + version = "0.9.0.0"; + sha256 = "2cb64bfaa4c916c681c9a8240bb6edfad4878742003c3d099e770c592e8d4c87"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ base doctest filemanip primitive ]; + description = "Generic vectors with statically known size"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixed-vector-binary" = callPackage ({ mkDerivation, base, binary, fixed-vector, tasty , tasty-quickcheck @@ -64154,15 +64191,14 @@ self: { }: mkDerivation { pname = "gdo"; - version = "0.1.0"; - sha256 = "762ef322a3702b0ae67cdfa80b56088ab988b3067fcf11255ec434d74152b0fc"; + version = "0.1.2"; + sha256 = "0a4612e13b97de8950ff87779a98ca837ed5de78baf9754d465b648edcc44018"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers cryptohash directory filepath process transformers ]; - jailbreak = true; description = "recursive atomic build system"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -101203,24 +101239,29 @@ self: { }) {}; "keysafe" = callPackage - ({ mkDerivation, aeson, argon2, base, binary, bytestring - , containers, deepseq, directory, filepath, http-client, network - , optparse-applicative, process, raaz, random, readline - , secret-sharing, servant, servant-client, servant-server, socks - , split, stm, text, time, transformers, unix, utf8-string, wai - , warp, zxcvbn-c + ({ mkDerivation, aeson, argon2, async, base, binary, bloomfilter + , bytestring, containers, crypto-random, deepseq, directory + , disk-free-space, fast-logger, filepath, http-client, lifted-base + , network, optparse-applicative, process, raaz, random, readline + , SafeSemaphore, secret-sharing, servant, servant-client + , servant-server, socks, split, stm, text, time, token-bucket + , transformers, unbounded-delays, unix, utf8-string, wai, warp + , zxcvbn-c }: mkDerivation { pname = "keysafe"; - version = "0.20160831"; - sha256 = "bee8f0cd5ff26505b5856185a02baa9b1ca8245b09d59ef7dcb9d0c5b42f8bd9"; + version = "0.20160914"; + sha256 = "b8e77394b553997e9e6ca90cc44bd4e79a6e8a4b021d596419c9345cb451eb87"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base binary bytestring containers deepseq directory filepath - http-client network optparse-applicative process raaz random - readline secret-sharing servant servant-client servant-server socks - split stm text time transformers unix utf8-string wai warp zxcvbn-c + aeson async base binary bloomfilter bytestring containers + crypto-random deepseq directory disk-free-space fast-logger + filepath http-client lifted-base network optparse-applicative + process raaz random readline SafeSemaphore secret-sharing servant + servant-client servant-server socks split stm text time + token-bucket transformers unbounded-delays unix utf8-string wai + warp zxcvbn-c ]; executableSystemDepends = [ argon2 ]; jailbreak = true; @@ -104129,16 +104170,16 @@ self: { "learn-physics" = callPackage ({ mkDerivation, base, gloss, gnuplot, hmatrix, linear, not-gloss - , polynomial, spatial-math, vector-space + , spatial-math, vector-space }: mkDerivation { pname = "learn-physics"; - version = "0.6.0.1"; - sha256 = "c45787f96c1645a75063694d2fa71baf9a30c5568026ea7c54d5690fd25bc107"; + version = "0.6.0.2"; + sha256 = "0aa998b401ff2f4acbf611861e95e30340da594f4a4e8bbd6070bd30c9c5ccae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base gloss gnuplot hmatrix linear not-gloss polynomial spatial-math + base gloss gnuplot hmatrix linear not-gloss spatial-math vector-space ]; executableHaskellDepends = [ @@ -110644,6 +110685,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "math-functions_0_2_0_2" = callPackage + ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.2.0.2"; + sha256 = "2358ee156011a9d97cae2596c788bd00cd6ee698e5fb1c67e0eefb15aff24737"; + libraryHaskellDepends = [ + base deepseq primitive vector vector-th-unbox + ]; + testHaskellDepends = [ + base deepseq erf HUnit primitive QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector + vector-th-unbox + ]; + homepage = "https://github.com/bos/math-functions"; + description = "Special functions and Chebyshev polynomials"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -126016,6 +126080,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent_2_2_4_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , exceptions, fast-logger, hspec, http-api-data, lifted-base + , monad-control, monad-logger, mtl, old-locale, path-pieces + , resource-pool, resourcet, scientific, silently, tagged + , template-haskell, text, time, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.2.4.1"; + sha256 = "1473bdd952854d7f5fdb5896d2df07ef1ecf301c7fdb136054f49625329d50db"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers exceptions fast-logger http-api-data + lifted-base monad-control monad-logger mtl old-locale path-pieces + resource-pool resourcet scientific silently tagged template-haskell + text time transformers transformers-base unordered-containers + vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data lifted-base + monad-control monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -126358,6 +126457,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-sqlite_2_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, monad-control, monad-logger, old-locale, persistent + , persistent-template, resourcet, text, time, transformers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.2.1"; + sha256 = "bac71080bb25ad20b9116e42df463bbe230bacb2d963a5b101a501cff7fffc5e"; + libraryHaskellDepends = [ + aeson base bytestring conduit containers monad-control monad-logger + old-locale persistent resourcet text time transformers + ]; + testHaskellDepends = [ + base hspec persistent persistent-template time transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, monad-control, monad-logger, old-locale, persistent @@ -126383,6 +126505,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_1_8_1" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers + , ghc-prim, hspec, http-api-data, monad-control, monad-logger + , path-pieces, persistent, QuickCheck, tagged, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.1.8.1"; + sha256 = "34911f40028357567717f6724abae4e6fc905567ffc8ba8ee5042e9680b2f168"; + libraryHaskellDepends = [ + aeson aeson-compat base bytestring containers ghc-prim + http-api-data monad-control monad-logger path-pieces persistent + tagged template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -136457,13 +136604,16 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, comonad, free, transformers }: + ({ mkDerivation, base, bifunctors, comonad, free, transformers + , transformers-compat + }: mkDerivation { pname = "recursion-schemes"; - version = "4.1.2"; - sha256 = "36fd1357a577e23640c2948a1b00afd38e4527e4972551042bf6b88781c8c4fc"; - libraryHaskellDepends = [ base comonad free transformers ]; - jailbreak = true; + version = "5"; + sha256 = "c6d298c2e59e2143e833d21dd82613510df55f18000b19264c68d253dfa709fc"; + libraryHaskellDepends = [ + base bifunctors comonad free transformers transformers-compat + ]; homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; license = stdenv.lib.licenses.bsd3; @@ -157015,13 +157165,12 @@ self: { ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "1.0.2"; - sha256 = "5235db71cd2ed14a77003c2c659582dee64f504f4de1af9ceab72f00af4cc2aa"; + version = "1.0.5"; + sha256 = "6eda0e556aa555f031d82a075baed227c389a9f40df13c5a5632b94c6c5b4906"; libraryHaskellDepends = [ base bytestring network transformers unix ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/erebe/systemd"; description = "Systemd facilities (Socket activation, Notify)"; license = stdenv.lib.licenses.bsd3; @@ -157073,6 +157222,7 @@ self: { base containers haskell-src-exts haskell-src-meta lens mtl QuickCheck recursion-schemes template-haskell transformers ]; + jailbreak = true; description = "Matchers and grammars using tree regular expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; From a32281639e196fb03680c2b3ad4ef835a7f6b76d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 15 Sep 2016 13:55:47 +0200 Subject: [PATCH 189/234] php70: 7.0.10 -> 7.0.11 (security) See https://secure.php.net/ChangeLog-7.php#7.0.11. --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 9ae5865b0d7..811b1a3817c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -305,7 +305,7 @@ in { }; php70 = generic { - version = "7.0.10"; - sha256 = "1ppn17n5klhs1b2mcbbxxiqq4xvdbmv8p866q0qnk61nlzjvnmc0"; + version = "7.0.11"; + sha256 = "1wgpkfzpiap29nxjzqjjvpgirpg61n61xbqq9f25i60lq6fp56zr"; }; } From fe54db902779f350b08c4ab601e178d8d9a18c6c Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 15 Sep 2016 21:28:12 +0900 Subject: [PATCH 190/234] cadvisor: 0.10.1 -> 0.23.8 --- pkgs/servers/monitoring/cadvisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index c0126fda572..881a14b1117 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.10.1"; + version = "0.23.8"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; - rev = "${version}"; - sha256 = "0k0qfhw755k3ripsfkhml0ixaglhy64hdzxrjvlmbgc50s3j37vh"; + rev = "v${version}"; + sha256 = "0wan6a4rpyh5fflq88saznyf2kiic9nmj8sil1s49nh3c3y4yxcj"; }; buildInputs = [ go ]; From db387a6f0d2dee8e74dd150e175f06983646dad5 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 15 Sep 2016 21:28:41 +0900 Subject: [PATCH 191/234] cadvisor: fix test --- nixos/tests/cadvisor.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index c55b08c0e92..3a887514773 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -13,10 +13,6 @@ import ./make-test.nix ({ pkgs, ... } : { services.cadvisor.enable = true; services.cadvisor.storageDriver = "influxdb"; services.influxdb.enable = true; - systemd.services.influxdb.postStart = mkAfter '' - ${pkgs.curl.bin}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \ - -d '{"name": "root"}' - ''; }; }; @@ -27,6 +23,15 @@ import ./make-test.nix ({ pkgs, ... } : { $machine->succeed("curl http://localhost:8080/containers/"); $influxdb->waitForUnit("influxdb.service"); + + # Wait until influxdb admin interface is available + $influxdb->waitUntilSucceeds("curl -f 127.0.0.1:8083"); + + # create influxdb database + $influxdb->succeed(q~ + curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root" + ~); + $influxdb->waitForUnit("cadvisor.service"); $influxdb->succeed("curl http://localhost:8080/containers/"); ''; From 9dd366c385f9238f5ba8c019c8ac8744492f0e26 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 15 Sep 2016 16:24:10 +0300 Subject: [PATCH 192/234] add Azure bootstrap blob list --- nixos/modules/virtualisation/azure-bootstrap-blobs.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 nixos/modules/virtualisation/azure-bootstrap-blobs.nix diff --git a/nixos/modules/virtualisation/azure-bootstrap-blobs.nix b/nixos/modules/virtualisation/azure-bootstrap-blobs.nix new file mode 100644 index 00000000000..281be9a1231 --- /dev/null +++ b/nixos/modules/virtualisation/azure-bootstrap-blobs.nix @@ -0,0 +1,3 @@ +{ + "16.03" = "https://nixos.blob.core.windows.net/images/nixos-image-16.03.847.8688c17-x86_64-linux.vhd"; +} From 527b3dc1df24ae6097fc5aa2fc6986a25799cecc Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 15 Sep 2016 15:23:52 +0200 Subject: [PATCH 193/234] hidepid module: detailed description to external doc --- nixos/modules/security/hidepid.nix | 24 +++++++++++----------- nixos/modules/security/hidepid.xml | 33 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 nixos/modules/security/hidepid.xml diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index 8f2df380cfe..ee351eb8447 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -2,19 +2,19 @@ with lib; { - options = { - security.hideProcessInformation = mkEnableOption "" // { description = '' - Restrict access to process information to the owning user. Enabling - this option implies, among other things, that command-line arguments - remain private. This option is recommended for most systems, unless - there's a legitimate reason for allowing unprivileged users to inspect - the process information of other users. + meta = { + maintainers = [ maintainers.joachifm ]; + doc = ./hidepid.xml; + }; - Members of the group "proc" are exempt from process information hiding. - To allow a service to run without process information hiding, add "proc" - to its supplementary groups via - . - ''; }; + options = { + security.hideProcessInformation = mkOption { + type = types.bool; + default = false; + description = '' + Restrict process information to the owning user. + ''; + }; }; config = mkIf config.security.hideProcessInformation { diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml new file mode 100644 index 00000000000..5715ee7ac16 --- /dev/null +++ b/nixos/modules/security/hidepid.xml @@ -0,0 +1,33 @@ + + + Hiding process information + + + Setting + + security.hideProcessInformation = true; + + ensures that access to process information is restricted to the + owning user. This implies, among other things, that command-line + arguments remain private. Unless your deployment relies on unprivileged + users being able to inspect the process information of other users, this + option should be safe to enable. + + + + Members of the proc group are exempt from process + information hiding. + + + + To allow a service foo to run without process information hiding, set + + systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; + + + + From a9fa582c5bd6f64b2e55168057f17a1cccf33f38 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 12 Sep 2016 23:11:37 +0200 Subject: [PATCH 194/234] squashfsTools: use fetchFromGitHub --- pkgs/tools/filesystems/squashfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 5e1700af017..c43eb059976 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchgit, zlib, xz }: +{ stdenv, fetchFromGitHub, zlib, xz }: stdenv.mkDerivation rec { name = "squashfs-4.4dev"; - src = fetchgit { - url = https://github.com/plougher/squashfs-tools.git; + src = fetchFromGitHub { + owner = "plougher"; + repo = "squashfs-tools"; sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks"; rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"; }; From 4653160057ceb2a44977c4378b175352409a62a4 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 13 Sep 2016 01:08:09 +0200 Subject: [PATCH 195/234] squashfsTools: optional lz4 support --- pkgs/tools/filesystems/squashfs/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index c43eb059976..a2fc5bc3d40 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, zlib, xz }: +{ stdenv, fetchFromGitHub, zlib, xz +, lz4 ? null +, lz4Support ? false +}: + +assert lz4Support -> (lz4 != null); stdenv.mkDerivation rec { name = "squashfs-4.4dev"; @@ -10,13 +15,15 @@ stdenv.mkDerivation rec { rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"; }; - buildInputs = [ zlib xz ]; + buildInputs = [ zlib xz ] + ++ stdenv.lib.optional lz4Support lz4; preBuild = "cd squashfs-tools"; installFlags = "INSTALL_DIR=\${out}/bin"; - makeFlags = "XZ_SUPPORT=1"; + makeFlags = [ "XZ_SUPPORT=1" ] + ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; meta = { homepage = http://squashfs.sourceforge.net/; From ffbdc07a0d4aeadb3ee3c699ae8d15261f77a554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 15 Sep 2016 10:54:59 -0300 Subject: [PATCH 196/234] llvm and clang: define llvm_39 and clang_39 in all-packages.nix (#18599) --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2edce791899..bb26652913b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4407,6 +4407,7 @@ in clang = llvmPackages.clang; + clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_36 = llvmPackages_36.clang; @@ -4933,6 +4934,7 @@ in llvm = llvmPackages.llvm; + llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; llvm_36 = llvmPackages_36.llvm; From 2db487e6bf56cbcc2887e0611a083db8afd9a132 Mon Sep 17 00:00:00 2001 From: Joachim F Date: Thu, 15 Sep 2016 17:19:51 +0200 Subject: [PATCH 197/234] opensmtpd: 5.9.2p1 -> 6.0.0p1 (#18629) Also change to https src.url. Changelog at https://www.opensmtpd.org/announces/release-6.0.0.txt In particular, note that - logging format has been reworked so scripts that consume opensmtpd logs may need updating - dhparams option has been removed --- pkgs/servers/mail/opensmtpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 46fc9bc00f2..b5ea7acb9d2 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.9.2p1"; + version = "6.0.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { - url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "07d7f1m5sxyz6mkk228rcm7fsf7350994ayvmhgph333q5rz48im"; + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9"; }; patches = [ ./proc_path.diff ]; From c2a74105836d2089e8bcaa983dfd1d3a8942b7d7 Mon Sep 17 00:00:00 2001 From: Mike Cooper Date: Thu, 15 Sep 2016 08:39:08 -0700 Subject: [PATCH 198/234] firefox-bin: add curl dependency for crash reporter (#18596) --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 23d4da0b5cc..7a87b1df386 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -2,6 +2,7 @@ , alsaLib , atk , cairo +, curl , cups , dbus_glib , dbus_libs @@ -75,6 +76,7 @@ stdenv.mkDerivation { alsaLib atk cairo + curl cups dbus_glib dbus_libs From 51314631d6ee153dab70d99f7a08f04a89d23c5e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 15 Sep 2016 17:48:51 +0200 Subject: [PATCH 199/234] searx: 0.9.0 -> 0.10.0 (#18608) With a patch to loosen up searx pip dependency requirements. Also includes a minor version bump of pysocks. --- pkgs/development/python-modules/searx.patch | 25 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 ++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/searx.patch diff --git a/pkgs/development/python-modules/searx.patch b/pkgs/development/python-modules/searx.patch new file mode 100644 index 00000000000..6cd25babb33 --- /dev/null +++ b/pkgs/development/python-modules/searx.patch @@ -0,0 +1,25 @@ +diff --git a/requirements.txt b/requirements.txt +index 0d2f61b..46481b3 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,12 +1,12 @@ + certifi==2016.2.28 +-flask==0.11.1 +-flask-babel==0.11.1 +-lxml==3.6.0 +-ndg-httpsclient==0.4.1 ++flask==0.* ++flask-babel==0.* ++lxml==3.* ++ndg-httpsclient==0.4.* + pyasn1==0.1.9 + pyasn1-modules==0.0.8 +-pygments==2.1.3 ++pygments==2.* + pyopenssl==0.15.1 +-python-dateutil==2.5.3 ++python-dateutil==2.* +-pyyaml==3.11 ++pyyaml==3.* +-requests[socks]==2.10.0 ++requests[socks]==2.* diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26e2867de81..40f17c88b0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19679,11 +19679,11 @@ in modules // { pysocks = buildPythonPackage rec { name = "pysocks-${version}"; - version = "1.5.0"; + version = "1.5.7"; src = pkgs.fetchurl { url = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz"; - sha256 = "10wq5311qrnk8rvzsh6gwzxi7h51pgvzw3d7s1mb39fsvf0vyjdk"; + sha256 = "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775"; }; doCheck = false; @@ -27037,15 +27037,16 @@ in modules // { searx = buildPythonPackage rec { name = "searx-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = pkgs.fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "030qkrsj4as9anr8xfpk5n41qzg7w4yyjasb4cqislvyl1l1dvvs"; + sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2"; }; + patches = [ ../development/python-modules/searx.patch ]; postPatch = '' substituteInPlace requirements.txt \ --replace 'certifi==2015.11.20.1' 'certifi==2016.2.28' \ @@ -27055,14 +27056,14 @@ in modules // { propagatedBuildInputs = with self; [ pyyaml lxml_3_5 grequests flaskbabel flask requests2 gevent speaklater Babel pytz dateutil pygments_2_0 - pyasn1 pyasn1-modules ndg-httpsclient certifi + pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; meta = { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz ]; + maintainers = with maintainers; [ matejc fpletz profpatsch ]; }; }; From e43a15720d62f6640d21ed49c12a3b76a563e99e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Jul 2016 09:50:17 +0000 Subject: [PATCH 200/234] prometheus module: add nodeExporter submodule --- nixos/modules/module-list.nix | 1 + .../monitoring/prometheus/node-exporter.nix | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/node-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 485138e1ff3..8fef157c458 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -289,6 +289,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/prometheus/default.nix + ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix new file mode 100644 index 00000000000..6750d4c7507 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -0,0 +1,59 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.nodeExporter; +in { + options = { + services.prometheus.nodeExporter = { + enable = mkEnableOption "prometheus node exporter"; + + port = mkOption { + type = types.int; + default = 9100; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + Address to listen on. + ''; + }; + + enabledCollectors = mkOption { + type = types.listOf types.string; + default = []; + example = ''[ "systemd" ]''; + description = '' + Collectors to enable, additionally to the defaults. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = [ cfg.port ]; + + systemd.services.prometheus-node-exporter = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + ${pkgs.prometheus-node-exporter.bin}/bin/node_exporter \ + ${optionalString (cfg.enabledCollectors != []) + ''-collectors.enabled ${concatStringsSep "," cfg.enabledCollectors}''} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} + ''; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + }; + }; + }; +} From 914e0e594ca2d0fa5d456be208bf703d79f04fa3 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sat, 10 Sep 2016 12:04:13 +0200 Subject: [PATCH 201/234] buildGoPackage: deps.json -> deps.nix in NIXON https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541 * update docs to describe `deps.nix` * include goDeps in nix-shell GOPATH * NixOS 16.09 rel notes about replacing goPackages --- doc/languages-frameworks/go.xml | 41 ++- nixos/doc/manual/release-notes/rl-1609.xml | 7 + pkgs/applications/misc/hugo/default.nix | 2 +- pkgs/applications/misc/hugo/deps.json | 317 ----------------- pkgs/applications/misc/hugo/deps.nix | 317 +++++++++++++++++ pkgs/applications/misc/mop/default.nix | 2 +- pkgs/applications/misc/mop/deps.json | 11 - pkgs/applications/misc/mop/deps.nix | 11 + pkgs/applications/misc/wego/default.nix | 2 +- pkgs/applications/misc/wego/deps.json | 29 -- pkgs/applications/misc/wego/deps.nix | 29 ++ .../applications/networking/drive/default.nix | 2 +- pkgs/applications/networking/drive/deps.json | 164 --------- pkgs/applications/networking/drive/deps.nix | 164 +++++++++ .../instant-messengers/pond/default.nix | 2 +- .../instant-messengers/pond/deps.json | 47 --- .../instant-messengers/pond/deps.nix | 47 +++ .../xmpp-client/default.nix | 2 +- .../instant-messengers/xmpp-client/deps.json | 20 -- .../instant-messengers/xmpp-client/deps.nix | 20 ++ .../networking/syncthing/inotify-deps.json | 38 -- .../networking/syncthing/inotify-deps.nix | 38 ++ .../networking/syncthing/inotify.nix | 2 +- .../networking/syncthing012/default.nix | 2 +- .../networking/syncthing012/deps.json | 128 ------- .../networking/syncthing012/deps.nix | 128 +++++++ .../git-annex-remote-b2/default.nix | 2 +- .../git-annex-remote-b2/deps.json | 20 -- .../git-annex-remote-b2/deps.nix | 20 ++ .../go-modules/generic/default.nix | 12 +- pkgs/development/tools/deis/default.nix | 2 +- pkgs/development/tools/deis/deps.json | 29 -- pkgs/development/tools/deis/deps.nix | 29 ++ .../tools/go-repo-root/default.nix | 2 +- pkgs/development/tools/go-repo-root/deps.nix | 20 ++ pkgs/development/tools/go2nix/default.nix | 6 +- pkgs/development/tools/go2nix/deps.json | 20 -- pkgs/development/tools/go2nix/deps.nix | 20 ++ pkgs/development/tools/golint/default.nix | 2 +- pkgs/development/tools/golint/deps.json | 11 - pkgs/development/tools/golint/deps.nix | 11 + pkgs/development/tools/gotools/default.nix | 2 +- pkgs/development/tools/gotools/deps.json | 11 - pkgs/development/tools/gotools/deps.nix | 11 + pkgs/development/tools/gox/default.nix | 2 +- pkgs/development/tools/gox/deps.json | 11 - pkgs/development/tools/gox/deps.nix | 11 + pkgs/development/tools/leaps/default.nix | 2 +- pkgs/development/tools/leaps/deps.json | 11 - pkgs/development/tools/leaps/deps.nix | 11 + pkgs/development/tools/remarshal/default.nix | 2 +- pkgs/development/tools/remarshal/deps.json | 20 -- pkgs/development/tools/remarshal/deps.nix | 20 ++ pkgs/development/tools/textql/default.nix | 2 +- pkgs/development/tools/textql/deps.json | 11 - pkgs/development/tools/textql/deps.nix | 11 + pkgs/development/web/minify/default.nix | 2 +- pkgs/development/web/minify/deps.json | 74 ---- pkgs/development/web/minify/deps.nix | 74 ++++ pkgs/misc/vim-plugins/default.nix | 2 +- pkgs/servers/caddy/default.nix | 2 +- pkgs/servers/caddy/deps.json | 182 ---------- pkgs/servers/caddy/deps.nix | 182 ++++++++++ pkgs/servers/etcd/default.nix | 2 +- pkgs/servers/etcd/deps.json | 335 ------------------ pkgs/servers/etcd/deps.nix | 335 ++++++++++++++++++ pkgs/servers/gotty/default.nix | 2 +- pkgs/servers/gotty/deps.json | 74 ---- pkgs/servers/gotty/deps.nix | 74 ++++ pkgs/servers/interlock/default.nix | 2 +- pkgs/servers/interlock/deps.json | 65 ---- pkgs/servers/interlock/deps.nix | 65 ++++ pkgs/servers/mesos-dns/default.nix | 2 +- pkgs/servers/mesos-dns/deps.json | 101 ------ pkgs/servers/mesos-dns/deps.nix | 101 ++++++ pkgs/servers/monitoring/prometheus/cli.nix | 2 +- .../monitoring/prometheus/cli_deps.json | 11 - .../monitoring/prometheus/cli_deps.nix | 11 + .../prometheus/collectd-exporter.nix | 2 +- .../prometheus/collectd-exporter_deps.json | 65 ---- .../prometheus/collectd-exporter_deps.nix | 65 ++++ .../prometheus/haproxy-exporter.nix | 2 +- .../prometheus/haproxy-exporter_deps.json | 65 ---- .../prometheus/haproxy-exporter_deps.nix | 65 ++++ .../monitoring/prometheus/mesos-exporter.nix | 2 +- .../prometheus/mesos-exporter_deps.json | 83 ----- .../prometheus/mesos-exporter_deps.nix | 83 +++++ .../monitoring/prometheus/mysqld-exporter.nix | 2 +- .../prometheus/mysqld-exporter_deps.json | 74 ---- .../prometheus/mysqld-exporter_deps.nix | 74 ++++ .../monitoring/prometheus/nginx-exporter.nix | 2 +- .../prometheus/nginx-exporter_deps.json | 83 ----- .../prometheus/nginx-exporter_deps.nix | 83 +++++ .../monitoring/prometheus/prom2json.nix | 2 +- .../monitoring/prometheus/prom2json_deps.json | 38 -- .../monitoring/prometheus/prom2json_deps.nix | 38 ++ .../monitoring/prometheus/pushgateway.nix | 2 +- .../prometheus/pushgateway_deps.json | 74 ---- .../prometheus/pushgateway_deps.nix | 74 ++++ .../monitoring/prometheus/statsd-bridge.nix | 2 +- .../prometheus/statsd-bridge_deps.json | 74 ---- .../prometheus/statsd-bridge_deps.nix | 74 ++++ pkgs/servers/nosql/influxdb/default.nix | 2 +- pkgs/servers/nosql/influxdb/deps-0.13.0.json | 200 ----------- .../nosql/influxdb/deps-0.13.0.json.nix | 0 pkgs/servers/nosql/influxdb/deps-0.13.0.nix | 200 +++++++++++ .../nosql/influxdb/deps-1.0.0-beta3.json | 155 -------- .../nosql/influxdb/deps-1.0.0-beta3.nix | 155 ++++++++ pkgs/servers/nosql/influxdb/gdm2nix.rb | 1 + pkgs/servers/nsq/default.nix | 2 +- pkgs/servers/nsq/deps.json | 83 ----- pkgs/servers/nsq/deps.nix | 83 +++++ pkgs/servers/oauth2_proxy/default.nix | 2 +- pkgs/servers/oauth2_proxy/deps.json | 83 ----- pkgs/servers/oauth2_proxy/deps.nix | 83 +++++ pkgs/servers/serf/default.nix | 2 +- pkgs/servers/serf/deps.json | 137 ------- pkgs/servers/serf/deps.nix | 137 +++++++ pkgs/servers/skydns/default.nix | 2 +- pkgs/servers/skydns/deps.json | 128 ------- pkgs/servers/skydns/deps.nix | 128 +++++++ pkgs/shells/elvish/default.nix | 2 +- pkgs/shells/elvish/deps.json | 20 -- pkgs/shells/elvish/deps.nix | 20 ++ pkgs/shells/oh/default.nix | 2 +- pkgs/shells/oh/deps.json | 29 -- pkgs/shells/oh/deps.nix | 29 ++ pkgs/tools/X11/go-sct/default.nix | 2 +- pkgs/tools/X11/go-sct/deps.json | 11 - pkgs/tools/X11/go-sct/deps.nix | 11 + pkgs/tools/admin/lxd/default.nix | 2 +- pkgs/tools/admin/lxd/deps.json | 173 --------- pkgs/tools/admin/lxd/deps.nix | 173 +++++++++ pkgs/tools/filesystems/go-mtpfs/default.nix | 2 +- pkgs/tools/filesystems/go-mtpfs/deps.json | 20 -- pkgs/tools/filesystems/go-mtpfs/deps.nix | 20 ++ pkgs/tools/misc/fzf/default.nix | 2 +- pkgs/tools/misc/fzf/deps.json | 20 -- pkgs/tools/misc/fzf/deps.nix | 20 ++ pkgs/tools/misc/gawp/default.nix | 2 +- pkgs/tools/misc/gawp/deps.json | 29 -- pkgs/tools/misc/gawp/deps.nix | 29 ++ pkgs/tools/misc/i3cat/default.nix | 2 +- pkgs/tools/misc/i3cat/deps.json | 11 - pkgs/tools/misc/i3cat/deps.nix | 11 + pkgs/tools/misc/mongodb-tools/default.nix | 2 +- pkgs/tools/misc/mongodb-tools/deps.json | 47 --- pkgs/tools/misc/mongodb-tools/deps.nix | 47 +++ pkgs/tools/misc/upower-notify/default.nix | 2 +- pkgs/tools/misc/upower-notify/deps.json | 11 - pkgs/tools/misc/upower-notify/deps.nix | 11 + pkgs/tools/networking/ngrok/default.nix | 2 +- pkgs/tools/networking/ngrok/deps.json | 101 ------ pkgs/tools/networking/ngrok/deps.nix | 101 ++++++ pkgs/tools/networking/s3gof3r/default.nix | 2 +- pkgs/tools/networking/s3gof3r/deps.json | 11 - pkgs/tools/networking/s3gof3r/deps.nix | 11 + pkgs/tools/package-management/gx/default.nix | 2 +- pkgs/tools/package-management/gx/deps.json | 200 ----------- pkgs/tools/package-management/gx/deps.nix | 200 +++++++++++ .../package-management/gx/go/default.nix | 2 +- pkgs/tools/security/hologram/default.nix | 2 +- pkgs/tools/security/hologram/deps.json | 101 ------ pkgs/tools/security/hologram/deps.nix | 101 ++++++ pkgs/tools/system/confd/default.nix | 2 +- pkgs/tools/system/confd/deps.json | 74 ---- pkgs/tools/system/confd/deps.nix | 74 ++++ pkgs/tools/text/platinum-searcher/default.nix | 2 +- pkgs/tools/text/platinum-searcher/deps.json | 83 ----- pkgs/tools/text/platinum-searcher/deps.nix | 83 +++++ pkgs/tools/text/sift/default.nix | 2 +- pkgs/tools/text/sift/deps.json | 29 -- pkgs/tools/text/sift/deps.nix | 29 ++ 173 files changed, 4176 insertions(+), 4127 deletions(-) delete mode 100644 pkgs/applications/misc/hugo/deps.json create mode 100644 pkgs/applications/misc/hugo/deps.nix delete mode 100644 pkgs/applications/misc/mop/deps.json create mode 100644 pkgs/applications/misc/mop/deps.nix delete mode 100644 pkgs/applications/misc/wego/deps.json create mode 100644 pkgs/applications/misc/wego/deps.nix delete mode 100644 pkgs/applications/networking/drive/deps.json create mode 100644 pkgs/applications/networking/drive/deps.nix delete mode 100644 pkgs/applications/networking/instant-messengers/pond/deps.json create mode 100644 pkgs/applications/networking/instant-messengers/pond/deps.nix delete mode 100644 pkgs/applications/networking/instant-messengers/xmpp-client/deps.json create mode 100644 pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix delete mode 100644 pkgs/applications/networking/syncthing/inotify-deps.json create mode 100644 pkgs/applications/networking/syncthing/inotify-deps.nix delete mode 100644 pkgs/applications/networking/syncthing012/deps.json create mode 100644 pkgs/applications/networking/syncthing012/deps.nix delete mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json create mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix delete mode 100644 pkgs/development/tools/deis/deps.json create mode 100644 pkgs/development/tools/deis/deps.nix create mode 100644 pkgs/development/tools/go-repo-root/deps.nix delete mode 100644 pkgs/development/tools/go2nix/deps.json create mode 100644 pkgs/development/tools/go2nix/deps.nix delete mode 100644 pkgs/development/tools/golint/deps.json create mode 100644 pkgs/development/tools/golint/deps.nix delete mode 100644 pkgs/development/tools/gotools/deps.json create mode 100644 pkgs/development/tools/gotools/deps.nix delete mode 100644 pkgs/development/tools/gox/deps.json create mode 100644 pkgs/development/tools/gox/deps.nix delete mode 100644 pkgs/development/tools/leaps/deps.json create mode 100644 pkgs/development/tools/leaps/deps.nix delete mode 100644 pkgs/development/tools/remarshal/deps.json create mode 100644 pkgs/development/tools/remarshal/deps.nix delete mode 100644 pkgs/development/tools/textql/deps.json create mode 100644 pkgs/development/tools/textql/deps.nix delete mode 100644 pkgs/development/web/minify/deps.json create mode 100644 pkgs/development/web/minify/deps.nix delete mode 100644 pkgs/servers/caddy/deps.json create mode 100644 pkgs/servers/caddy/deps.nix delete mode 100644 pkgs/servers/etcd/deps.json create mode 100644 pkgs/servers/etcd/deps.nix delete mode 100644 pkgs/servers/gotty/deps.json create mode 100644 pkgs/servers/gotty/deps.nix delete mode 100644 pkgs/servers/interlock/deps.json create mode 100644 pkgs/servers/interlock/deps.nix delete mode 100644 pkgs/servers/mesos-dns/deps.json create mode 100644 pkgs/servers/mesos-dns/deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/cli_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/cli_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/prom2json_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/prom2json_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/pushgateway_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/pushgateway_deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json create mode 100644 pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix delete mode 100644 pkgs/servers/nosql/influxdb/deps-0.13.0.json create mode 100644 pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix create mode 100644 pkgs/servers/nosql/influxdb/deps-0.13.0.nix delete mode 100644 pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json create mode 100644 pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.nix delete mode 100644 pkgs/servers/nsq/deps.json create mode 100644 pkgs/servers/nsq/deps.nix delete mode 100644 pkgs/servers/oauth2_proxy/deps.json create mode 100644 pkgs/servers/oauth2_proxy/deps.nix delete mode 100644 pkgs/servers/serf/deps.json create mode 100644 pkgs/servers/serf/deps.nix delete mode 100644 pkgs/servers/skydns/deps.json create mode 100644 pkgs/servers/skydns/deps.nix delete mode 100644 pkgs/shells/elvish/deps.json create mode 100644 pkgs/shells/elvish/deps.nix delete mode 100644 pkgs/shells/oh/deps.json create mode 100644 pkgs/shells/oh/deps.nix delete mode 100644 pkgs/tools/X11/go-sct/deps.json create mode 100644 pkgs/tools/X11/go-sct/deps.nix delete mode 100644 pkgs/tools/admin/lxd/deps.json create mode 100644 pkgs/tools/admin/lxd/deps.nix delete mode 100644 pkgs/tools/filesystems/go-mtpfs/deps.json create mode 100644 pkgs/tools/filesystems/go-mtpfs/deps.nix delete mode 100644 pkgs/tools/misc/fzf/deps.json create mode 100644 pkgs/tools/misc/fzf/deps.nix delete mode 100644 pkgs/tools/misc/gawp/deps.json create mode 100644 pkgs/tools/misc/gawp/deps.nix delete mode 100644 pkgs/tools/misc/i3cat/deps.json create mode 100644 pkgs/tools/misc/i3cat/deps.nix delete mode 100644 pkgs/tools/misc/mongodb-tools/deps.json create mode 100644 pkgs/tools/misc/mongodb-tools/deps.nix delete mode 100644 pkgs/tools/misc/upower-notify/deps.json create mode 100644 pkgs/tools/misc/upower-notify/deps.nix delete mode 100644 pkgs/tools/networking/ngrok/deps.json create mode 100644 pkgs/tools/networking/ngrok/deps.nix delete mode 100644 pkgs/tools/networking/s3gof3r/deps.json create mode 100644 pkgs/tools/networking/s3gof3r/deps.nix delete mode 100644 pkgs/tools/package-management/gx/deps.json create mode 100644 pkgs/tools/package-management/gx/deps.nix delete mode 100644 pkgs/tools/security/hologram/deps.json create mode 100644 pkgs/tools/security/hologram/deps.nix delete mode 100644 pkgs/tools/system/confd/deps.json create mode 100644 pkgs/tools/system/confd/deps.nix delete mode 100644 pkgs/tools/text/platinum-searcher/deps.json create mode 100644 pkgs/tools/text/platinum-searcher/deps.nix delete mode 100644 pkgs/tools/text/sift/deps.json create mode 100644 pkgs/tools/text/sift/deps.nix diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index e56d7dd389d..026acb4e8fb 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -24,7 +24,7 @@ deis = buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildFlags = "--tags release"; } @@ -56,7 +56,9 @@ the following arguments are of special significance to the function: goDeps is where the Go dependencies of a Go program are listed - in a JSON format described below. + as a list of package source identified by Go import path. + It could be imported as a separate deps.nix file for + readability. The dependency data structure is described below. @@ -70,23 +72,32 @@ the following arguments are of special significance to the function: -The goDeps attribute should point to a JSON file that defines which Go libraries - are needed and should be included in GOPATH for buildPhase. - +The goDeps attribute can be imported from a separate + nix file that defines which Go libraries are needed and should + be included in GOPATH for buildPhase. -deps.json +deps.nix [ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } ] diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 792b4458caa..c267e5a4299 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -99,6 +99,13 @@ following incompatible changes: + + goPackages was replaced with separated Go applications + in appropriate nixpkgs categories. Each Go package uses its own + dependency set defined in nix. There's also a new go2nix + tool introduced to generate Go package definition from its Go source automatically. + + diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c183f70a289..90cf8de615d 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "135mrdi8i56z9m2sihjrdfab6lrczbfgavwvfrngvi1zxnx7scmv"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/misc/hugo/deps.json b/pkgs/applications/misc/hugo/deps.json deleted file mode 100644 index 53967d1bff0..00000000000 --- a/pkgs/applications/misc/hugo/deps.json +++ /dev/null @@ -1,317 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "d18b67ae0afd61dae240896eae1785f00709aa31", - "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf" - } - }, - { - "goPackagePath": "github.com/yosssi/ace", - "fetch": { - "type": "git", - "url": "https://github.com/yosssi/ace", - "rev": "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d", - "sha256": "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k" - } - }, - { - "goPackagePath": "github.com/spf13/viper", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/viper", - "rev": "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd", - "sha256": "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "367864438f1b1a3c7db4da06a2f55b144e6784e0", - "sha256": "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp" - } - }, - { - "goPackagePath": "github.com/spf13/jwalterweatherman", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/jwalterweatherman", - "rev": "33c24e77fb80341fe7130ee7c594256ff08ccc46", - "sha256": "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z" - } - }, - { - "goPackagePath": "github.com/fsnotify/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", - "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" - } - }, - { - "goPackagePath": "github.com/magiconair/properties", - "fetch": { - "type": "git", - "url": "https://github.com/magiconair/properties", - "rev": "c265cfa48dda6474e208715ca93e987829f572f8", - "sha256": "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3" - } - }, - { - "goPackagePath": "github.com/bep/inflect", - "fetch": { - "type": "git", - "url": "https://github.com/bep/inflect", - "rev": "b896c45f5af983b1f416bdf3bb89c4f1f0926f69", - "sha256": "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3" - } - }, - { - "goPackagePath": "github.com/eknkc/amber", - "fetch": { - "type": "git", - "url": "https://github.com/eknkc/amber", - "rev": "91774f050c1453128146169b626489e60108ec03", - "sha256": "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis" - } - }, - { - "goPackagePath": "github.com/spf13/afero", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/afero", - "rev": "1a8ecf8b9da1fb5306e149e83128fc447957d2a8", - "sha256": "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw" - } - }, - { - "goPackagePath": "github.com/spf13/cast", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cast", - "rev": "27b586b42e29bec072fe7379259cc719e1289da6", - "sha256": "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "bc81c21bd0d8be5ba2d6630a505d79d4467566e7", - "sha256": "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r" - } - }, - { - "goPackagePath": "github.com/dchest/cssmin", - "fetch": { - "type": "git", - "url": "https://github.com/dchest/cssmin", - "rev": "fb8d9b44afdc258bfff6052d3667521babcb2239", - "sha256": "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s" - } - }, - { - "goPackagePath": "github.com/spf13/fsync", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/fsync", - "rev": "eefee59ad7de621617d4ff085cf768aab4b919b1", - "sha256": "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p" - } - }, - { - "goPackagePath": "github.com/cpuguy83/go-md2man", - "fetch": { - "type": "git", - "url": "https://github.com/cpuguy83/go-md2man", - "rev": "2724a9c9051aa62e9cca11304e7dd518e9e41599", - "sha256": "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj" - } - }, - { - "goPackagePath": "github.com/miekg/mmark", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/mmark", - "rev": "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a", - "sha256": "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa" - } - }, - { - "goPackagePath": "github.com/spf13/nitro", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/nitro", - "rev": "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8", - "sha256": "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/purell", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/purell", - "rev": "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3", - "sha256": "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb" - } - }, - { - "goPackagePath": "github.com/pkg/sftp", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/sftp", - "rev": "d4c18e7ffdc496a38de67dde6e29b2f364afc472", - "sha256": "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/kyokomi/emoji", - "fetch": { - "type": "git", - "url": "https://github.com/kyokomi/emoji", - "rev": "17c5e7085c9d59630aa578df67f4469481fbe7a9", - "sha256": "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp" - } - }, - { - "goPackagePath": "github.com/pkg/errors", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/errors", - "rev": "494e70f7620561491c2ca11e185bbef4b70060da", - "sha256": "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/urlesc", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/urlesc", - "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587", - "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni" - } - } -] diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix new file mode 100644 index 00000000000..20d0d8f1c9d --- /dev/null +++ b/pkgs/applications/misc/hugo/deps.nix @@ -0,0 +1,317 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; + sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; + }; + } + { + goPackagePath = "github.com/yosssi/ace"; + fetch = { + type = "git"; + url = "https://github.com/yosssi/ace"; + rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d"; + sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd"; + sha256 = "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "367864438f1b1a3c7db4da06a2f55b144e6784e0"; + sha256 = "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; + sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c265cfa48dda6474e208715ca93e987829f572f8"; + sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"; + }; + } + { + goPackagePath = "github.com/bep/inflect"; + fetch = { + type = "git"; + url = "https://github.com/bep/inflect"; + rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; + sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; + }; + } + { + goPackagePath = "github.com/eknkc/amber"; + fetch = { + type = "git"; + url = "https://github.com/eknkc/amber"; + rev = "91774f050c1453128146169b626489e60108ec03"; + sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8"; + sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "27b586b42e29bec072fe7379259cc719e1289da6"; + sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7"; + sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"; + }; + } + { + goPackagePath = "github.com/dchest/cssmin"; + fetch = { + type = "git"; + url = "https://github.com/dchest/cssmin"; + rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; + sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; + }; + } + { + goPackagePath = "github.com/spf13/fsync"; + fetch = { + type = "git"; + url = "https://github.com/spf13/fsync"; + rev = "eefee59ad7de621617d4ff085cf768aab4b919b1"; + sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; + sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + }; + } + { + goPackagePath = "github.com/miekg/mmark"; + fetch = { + type = "git"; + url = "https://github.com/miekg/mmark"; + rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a"; + sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"; + }; + } + { + goPackagePath = "github.com/spf13/nitro"; + fetch = { + type = "git"; + url = "https://github.com/spf13/nitro"; + rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3"; + sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472"; + sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kyokomi/emoji"; + fetch = { + type = "git"; + url = "https://github.com/kyokomi/emoji"; + rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9"; + sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "494e70f7620561491c2ca11e185bbef4b70060da"; + sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587"; + sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"; + }; + } +] diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index ccdb47c4b60..336b136c56d 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; goPackagePath = "github.com/michaeldv/mop"; - goDeps = ./deps.json; + goDeps = ./deps.nix; preConfigure = '' for i in $(find . -type f);do diff --git a/pkgs/applications/misc/mop/deps.json b/pkgs/applications/misc/mop/deps.json deleted file mode 100644 index d2c59589dc2..00000000000 --- a/pkgs/applications/misc/mop/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - } -] diff --git a/pkgs/applications/misc/mop/deps.nix b/pkgs/applications/misc/mop/deps.nix new file mode 100644 index 00000000000..4081cd1ddaa --- /dev/null +++ b/pkgs/applications/misc/mop/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } +] diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 5918f3ef378..e59a3e98943 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/misc/wego/deps.json b/pkgs/applications/misc/wego/deps.json deleted file mode 100644 index 5bfb64ffbc5..00000000000 --- a/pkgs/applications/misc/wego/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/schachmat/ingo", - "fetch": { - "type": "git", - "url": "https://github.com/schachmat/ingo", - "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38", - "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb" - } - } -] diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix new file mode 100644 index 00000000000..408b3908d8f --- /dev/null +++ b/pkgs/applications/misc/wego/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/schachmat/ingo"; + fetch = { + type = "git"; + url = "https://github.com/schachmat/ingo"; + rev = "fab41e4e62cbef5d92998746ec25f7e195100f38"; + sha256 = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"; + }; + } +] diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 3b64d7af43b..3f1b5dad727 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/networking/drive/deps.json b/pkgs/applications/networking/drive/deps.json deleted file mode 100644 index a1d1fde7727..00000000000 --- a/pkgs/applications/networking/drive/deps.json +++ /dev/null @@ -1,164 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "957d850b5158a4eebf915476058e720f43459584", - "sha256": "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf" - } - }, - { - "goPackagePath": "github.com/cheggaaa/pb", - "fetch": { - "type": "git", - "url": "https://github.com/cheggaaa/pb", - "rev": "e648e12b78cedf14ebb2fc1855033f07b034cfbb", - "sha256": "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam" - } - }, - { - "goPackagePath": "github.com/odeke-em/cli-spinner", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cli-spinner", - "rev": "610063bb4aeef25f7645b3e6080456655ec0fb33", - "sha256": "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c" - } - }, - { - "goPackagePath": "github.com/odeke-em/statos", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/statos", - "rev": "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6", - "sha256": "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs" - } - }, - { - "goPackagePath": "github.com/odeke-em/exponential-backoff", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/exponential-backoff", - "rev": "96e25d36ae36ad09ac02cbfe653b44c4043a8e09", - "sha256": "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6" - } - }, - { - "goPackagePath": "github.com/odeke-em/extractor", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/extractor", - "rev": "801861aedb854c7ac5e1329e9713023e9dc2b4d4", - "sha256": "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1" - } - }, - { - "goPackagePath": "github.com/odeke-em/meddler", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/meddler", - "rev": "d2b51d2b40e786ab5f810d85e65b96404cf33570", - "sha256": "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x" - } - }, - { - "goPackagePath": "github.com/odeke-em/xon", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/xon", - "rev": "d580be739d723da4f6378083128f93017b8ab295", - "sha256": "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc" - } - }, - { - "goPackagePath": "github.com/odeke-em/cache", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cache", - "rev": "b51b08cb6cf889deda6c941a5205baecfd16f3eb", - "sha256": "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4" - } - }, - { - "goPackagePath": "github.com/odeke-em/command", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/command", - "rev": "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561", - "sha256": "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62" - } - }, - { - "goPackagePath": "github.com/odeke-em/log", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/log", - "rev": "cad53c4565a0b0304577bd13f3862350bdc5f907", - "sha256": "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w" - } - }, - { - "goPackagePath": "github.com/odeke-em/pretty-words", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/pretty-words", - "rev": "9d37a7fcb4ae6f94b288d371938482994458cecb", - "sha256": "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl" - } - }, - { - "goPackagePath": "github.com/skratchdot/open-golang", - "fetch": { - "type": "git", - "url": "https://github.com/skratchdot/open-golang", - "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e", - "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac" - } - } -] diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix new file mode 100644 index 00000000000..ad5a8f7c4e6 --- /dev/null +++ b/pkgs/applications/networking/drive/deps.nix @@ -0,0 +1,164 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "957d850b5158a4eebf915476058e720f43459584"; + sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; + }; + } + { + goPackagePath = "github.com/cheggaaa/pb"; + fetch = { + type = "git"; + url = "https://github.com/cheggaaa/pb"; + rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb"; + sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; + }; + } + { + goPackagePath = "github.com/odeke-em/cli-spinner"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/cli-spinner"; + rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; + sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; + }; + } + { + goPackagePath = "github.com/odeke-em/statos"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/statos"; + rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6"; + sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs"; + }; + } + { + goPackagePath = "github.com/odeke-em/exponential-backoff"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/exponential-backoff"; + rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09"; + sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"; + }; + } + { + goPackagePath = "github.com/odeke-em/extractor"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/extractor"; + rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4"; + sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"; + }; + } + { + goPackagePath = "github.com/odeke-em/meddler"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/meddler"; + rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570"; + sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"; + }; + } + { + goPackagePath = "github.com/odeke-em/xon"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/xon"; + rev = "d580be739d723da4f6378083128f93017b8ab295"; + sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc"; + }; + } + { + goPackagePath = "github.com/odeke-em/cache"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/cache"; + rev = "b51b08cb6cf889deda6c941a5205baecfd16f3eb"; + sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4"; + }; + } + { + goPackagePath = "github.com/odeke-em/command"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/command"; + rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"; + sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"; + }; + } + { + goPackagePath = "github.com/odeke-em/log"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/log"; + rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; + sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; + }; + } + { + goPackagePath = "github.com/odeke-em/pretty-words"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/pretty-words"; + rev = "9d37a7fcb4ae6f94b288d371938482994458cecb"; + sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + fetch = { + type = "git"; + url = "https://github.com/skratchdot/open-golang"; + rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e"; + sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac"; + }; + } +] diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 3b7b96b778f..8190be65e75 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ] ++ stdenv.lib.optional isx86_64 dclxvi diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.json b/pkgs/applications/networking/instant-messengers/pond/deps.json deleted file mode 100644 index c4d600a2ab3..00000000000 --- a/pkgs/applications/networking/instant-messengers/pond/deps.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/agl/go-gtk", - "fetch": { - "type": "git", - "url": "https://github.com/agl/go-gtk", - "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15", - "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d" - } - } -] diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.nix b/pkgs/applications/networking/instant-messengers/pond/deps.nix new file mode 100644 index 00000000000..55850f0a89c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pond/deps.nix @@ -0,0 +1,47 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/agl/go-gtk"; + fetch = { + type = "git"; + url = "https://github.com/agl/go-gtk"; + rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15"; + sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"; + }; + } +] diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index de8d0c19b4f..24c1b9768df 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "An XMPP client with OTR support"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json deleted file mode 100644 index 7ac2b86cc21..00000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - } -] diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix new file mode 100644 index 00000000000..caa41024fc6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } +] diff --git a/pkgs/applications/networking/syncthing/inotify-deps.json b/pkgs/applications/networking/syncthing/inotify-deps.json deleted file mode 100644 index e0cc9680e22..00000000000 --- a/pkgs/applications/networking/syncthing/inotify-deps.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "goPackagePath": "github.com/cenkalti/backoff", - "fetch": { - "type": "git", - "url": "https://github.com/cenkalti/backoff", - "rev": "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6", - "sha256": "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh" - } - }, - { - "goPackagePath": "github.com/gobwas/glob", - "fetch": { - "type": "git", - "url": "https://github.com/gobwas/glob", - "rev": "ce6abff51712df5da11095fb41dd4b0353559797", - "sha256": "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m" - } - }, - { - "goPackagePath": "github.com/syncthing/syncthing", - "fetch": { - "type": "git", - "url": "https://github.com/syncthing/syncthing", - "rev": "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8", - "sha256": "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9" - } - }, - { - "goPackagePath": "github.com/zillode/notify", - "fetch": { - "type": "git", - "url": "https://github.com/zillode/notify", - "rev": "2da5cc9881e8f16bab76b63129c7781898f97d16", - "sha256": "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40" - } - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix new file mode 100644 index 00000000000..302e5ee10e1 --- /dev/null +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; + sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "ce6abff51712df5da11095fb41dd4b0353559797"; + sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m"; + }; + } + { + goPackagePath = "github.com/syncthing/syncthing"; + fetch = { + type = "git"; + url = "https://github.com/syncthing/syncthing"; + rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8"; + sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9"; + }; + } + { + goPackagePath = "github.com/zillode/notify"; + fetch = { + type = "git"; + url = "https://github.com/zillode/notify"; + rev = "2da5cc9881e8f16bab76b63129c7781898f97d16"; + sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40"; + }; + } +] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index 4f001794e86..ea8d73cb863 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw"; }; - goDeps = ./inotify-deps.json; + goDeps = ./inotify-deps.nix; meta = { homepage = https://github.com/syncthing/syncthing-inotify; diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 9f436d21bc3..5735dd68bcd 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; postPatch = '' # Mostly a cosmetic change diff --git a/pkgs/applications/networking/syncthing012/deps.json b/pkgs/applications/networking/syncthing012/deps.json deleted file mode 100644 index b21f2ef6a16..00000000000 --- a/pkgs/applications/networking/syncthing012/deps.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/bkaradzic/go-lz4", - "fetch": { - "type": "git", - "url": "https://github.com/bkaradzic/go-lz4", - "rev": "74ddf82598bc4745b965729e9c6a463bedd33049", - "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1" - } - }, - { - "goPackagePath": "github.com/calmh/luhn", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/luhn", - "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632", - "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/vitrun/qart", - "fetch": { - "type": "git", - "url": "https://github.com/vitrun/qart", - "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0", - "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8" - } - }, - { - "goPackagePath": "github.com/calmh/du", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/du", - "rev": "3c0690cca16228b97741327b1b6781397afbdb24", - "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa" - } - }, - { - "goPackagePath": "github.com/calmh/xdr", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/xdr", - "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e", - "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra" - } - }, - { - "goPackagePath": "github.com/juju/ratelimit", - "fetch": { - "type": "git", - "url": "https://github.com/juju/ratelimit", - "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0", - "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p" - } - }, - { - "goPackagePath": "github.com/thejerf/suture", - "fetch": { - "type": "git", - "url": "https://github.com/thejerf/suture", - "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7", - "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy", - "rev": "723cc1e459b8eea2dea4583200fd60757d40097a", - "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h" - } - }, - { - "goPackagePath": "github.com/syndtr/goleveldb", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/goleveldb", - "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0", - "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb" - } - } -] diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix new file mode 100644 index 00000000000..44e18c2f606 --- /dev/null +++ b/pkgs/applications/networking/syncthing012/deps.nix @@ -0,0 +1,128 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + fetch = { + type = "git"; + url = "https://github.com/bkaradzic/go-lz4"; + rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; + sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; + }; + } + { + goPackagePath = "github.com/calmh/luhn"; + fetch = { + type = "git"; + url = "https://github.com/calmh/luhn"; + rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; + sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/vitrun/qart"; + fetch = { + type = "git"; + url = "https://github.com/vitrun/qart"; + rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; + sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; + }; + } + { + goPackagePath = "github.com/calmh/du"; + fetch = { + type = "git"; + url = "https://github.com/calmh/du"; + rev = "3c0690cca16228b97741327b1b6781397afbdb24"; + sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; + }; + } + { + goPackagePath = "github.com/calmh/xdr"; + fetch = { + type = "git"; + url = "https://github.com/calmh/xdr"; + rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; + sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; + sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; + }; + } + { + goPackagePath = "github.com/thejerf/suture"; + fetch = { + type = "git"; + url = "https://github.com/thejerf/suture"; + rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7"; + sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; + sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 4ede1b352ea..9f1d8e9d717 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json deleted file mode 100644 index 914655e2813..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/pquerna/ffjson", - "fetch": { - "type": "git", - "url": "https://github.com/pquerna/ffjson", - "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5", - "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a" - } - }, - { - "goPackagePath": "gopkg.in/kothar/go-backblaze.v0", - "fetch": { - "type": "git", - "url": "https://gopkg.in/kothar/go-backblaze.v0", - "rev": "373819725fc560fa962c6cd883b533d2ebec4844", - "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx" - } - } -] diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix new file mode 100644 index 00000000000..479b3e7d637 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/pquerna/ffjson"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/ffjson"; + rev = "674bc015b5b3f50f9bb2561179778586b9af68c5"; + sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"; + }; + } + { + goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/kothar/go-backblaze.v0"; + rev = "373819725fc560fa962c6cd883b533d2ebec4844"; + sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"; + }; + } +] diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 18bbdef8758..d4d2790b2a3 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -56,7 +56,7 @@ let }; importGodeps = { depsFile }: - map dep2src (lib.importJSON depsFile); + map dep2src (import depsFile); goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; @@ -180,6 +180,16 @@ go.stdenv.mkDerivation ( done < <(find $bin/bin -type f 2>/dev/null) ''; + shellHook = '' + d=$(mktemp -d "--suffix=-$name") + '' + toString (map (dep: '' + mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" + ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" + '' + ) goPath) + '' + export GOPATH="$d:$GOPATH" + ''; + disallowedReferences = lib.optional (!allowGoReference) go ++ lib.optional (!dontRenameImports) govers; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 471cc80663d..5c76fc69ac3 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -21,5 +21,5 @@ buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/deis/deps.json b/pkgs/development/tools/deis/deps.json deleted file mode 100644 index b28ce075e81..00000000000 --- a/pkgs/development/tools/deis/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/docopt/docopt-go", - "fetch": { - "type": "git", - "url": "https://github.com/docopt/docopt-go", - "rev": "784ddc588536785e7299f7272f39101f7faccc3f", - "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - } -] diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix new file mode 100644 index 00000000000..5a1b30a7e66 --- /dev/null +++ b/pkgs/development/tools/deis/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } +] diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index d6ae032f078..e47b84354d6 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; }; - buildInputs = [ gotools ]; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/go-repo-root/deps.nix b/pkgs/development/tools/go-repo-root/deps.nix new file mode 100644 index 00000000000..2554b3cad1a --- /dev/null +++ b/pkgs/development/tools/go-repo-root/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "golang.org/x/tools/go/vcs"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } + { + goPackagePath = "code.google.com/p/go.tools/go/vcs"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } +] diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index e0e9fe8c3fc..f12497eb78c 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "go2nix-${version}"; - version = "0.1.0"; + version = "1.1.0"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,10 +12,10 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "10nz7gva3n6wk01wphrjjb31sy33kf9ji03zr849x21a669fnmjf"; + sha256 = "0asbbcyf1hh8khakych0y09rjarjiywr8pyy1v8ghpr1vvg43a09"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ go-bindata goimports makeWrapper ]; preBuild = ''go generate ./...''; diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json deleted file mode 100644 index ab9d0d39fce..00000000000 --- a/pkgs/development/tools/go2nix/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/Masterminds/vcs", - "fetch": { - "type": "git", - "url": "https://github.com/Masterminds/vcs", - "rev": "7af28b64c5ec41b1558f5514fd938379822c237c", - "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6" - } - }, - { - "goPackagePath": "github.com/jawher/mow.cli", - "fetch": { - "type": "git", - "url": "https://github.com/jawher/mow.cli", - "rev": "772320464101e904cd51198160eb4d489be9cc49", - "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j" - } - } -] diff --git a/pkgs/development/tools/go2nix/deps.nix b/pkgs/development/tools/go2nix/deps.nix new file mode 100644 index 00000000000..8fc784f4b7f --- /dev/null +++ b/pkgs/development/tools/go2nix/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "7af28b64c5ec41b1558f5514fd938379822c237c"; + sha256 = "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"; + }; + } + { + goPackagePath = "github.com/jawher/mow.cli"; + fetch = { + type = "git"; + url = "https://github.com/jawher/mow.cli"; + rev = "772320464101e904cd51198160eb4d489be9cc49"; + sha256 = "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"; + }; + } +] diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 29e5b28ad57..c54a924a1a6 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json deleted file mode 100644 index 387adc6cf06..00000000000 --- a/pkgs/development/tools/golint/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/tools", - "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc", - "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1" - } - } -] diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix new file mode 100644 index 00000000000..f03bf9b5b23 --- /dev/null +++ b/pkgs/development/tools/golint/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } +] diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index f00794a7eb0..3408c90cda6 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; preConfigure = '' # Make the builtin tools available here diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json deleted file mode 100644 index 64ae72eb3ed..00000000000 --- a/pkgs/development/tools/gotools/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - } -] diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix new file mode 100644 index 00000000000..d4be771e8d6 --- /dev/null +++ b/pkgs/development/tools/gotools/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 030a59ed20c..92bb619be70 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/gox/deps.json b/pkgs/development/tools/gox/deps.json deleted file mode 100644 index 3406194137c..00000000000 --- a/pkgs/development/tools/gox/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/mitchellh/iochan", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/iochan", - "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77", - "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b" - } - } -] diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix new file mode 100644 index 00000000000..d15b8e7c091 --- /dev/null +++ b/pkgs/development/tools/gox/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/mitchellh/iochan"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } +] diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index d3e82076788..6db999eea54 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { fetchSubmodules = false; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; diff --git a/pkgs/development/tools/leaps/deps.json b/pkgs/development/tools/leaps/deps.json deleted file mode 100644 index 60141d5eeee..00000000000 --- a/pkgs/development/tools/leaps/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf", - "sha256": "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w" - } - } -] diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix new file mode 100644 index 00000000000..0a6214a76d0 --- /dev/null +++ b/pkgs/development/tools/leaps/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; + sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; + }; + } +] diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 49de886654c..ecf919a9829 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with lib; { description = "Convert between TOML, YAML and JSON"; diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json deleted file mode 100644 index 1cc264181c4..00000000000 --- a/pkgs/development/tools/remarshal/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - } -] diff --git a/pkgs/development/tools/remarshal/deps.nix b/pkgs/development/tools/remarshal/deps.nix new file mode 100644 index 00000000000..32f9f6eb0bb --- /dev/null +++ b/pkgs/development/tools/remarshal/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } +] diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 4caa659c17a..65c0bb8e41e 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; diff --git a/pkgs/development/tools/textql/deps.json b/pkgs/development/tools/textql/deps.json deleted file mode 100644 index 01c5de1cdc6..00000000000 --- a/pkgs/development/tools/textql/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - } -] diff --git a/pkgs/development/tools/textql/deps.nix b/pkgs/development/tools/textql/deps.nix new file mode 100644 index 00000000000..e166e73a61f --- /dev/null +++ b/pkgs/development/tools/textql/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 3248258d552..0220fbd8df8 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "15d9ivg1a9v9c2n0a9pfw74952xhd4vqgx8d60dhvif9lx1d8wlq"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/web/minify/deps.json b/pkgs/development/web/minify/deps.json deleted file mode 100644 index 0575578b43c..00000000000 --- a/pkgs/development/web/minify/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0", - "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0" - } - }, - { - "goPackagePath": "github.com/tdewolff/buffer", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/buffer", - "rev": "0edfcb7b750146ff879e95831de2ef53605a5cb5", - "sha256": "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl" - } - }, - { - "goPackagePath": "github.com/tdewolff/parse", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/parse", - "rev": "34d5c1160d4503da4b456e5094609f2331d6dde3", - "sha256": "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v" - } - }, - { - "goPackagePath": "github.com/tdewolff/strconv", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/strconv", - "rev": "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3", - "sha256": "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp" - } - }, - { - "goPackagePath": "github.com/matryer/try", - "fetch": { - "type": "git", - "url": "https://github.com/matryer/try", - "rev": "93d30e50512f879b73829eb79867df38084bcd31", - "sha256": "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f" - } - }, - { - "goPackagePath": "github.com/fsnotify/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", - "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" - } - }, - { - "goPackagePath": "github.com/ogier/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/ogier/pflag", - "rev": "45c278ab3607870051a2ea9040bb85fcb8557481", - "sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l" - } - } -] diff --git a/pkgs/development/web/minify/deps.nix b/pkgs/development/web/minify/deps.nix new file mode 100644 index 00000000000..4efaec46d57 --- /dev/null +++ b/pkgs/development/web/minify/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0"; + sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"; + }; + } + { + goPackagePath = "github.com/tdewolff/buffer"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/buffer"; + rev = "0edfcb7b750146ff879e95831de2ef53605a5cb5"; + sha256 = "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl"; + }; + } + { + goPackagePath = "github.com/tdewolff/parse"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/parse"; + rev = "34d5c1160d4503da4b456e5094609f2331d6dde3"; + sha256 = "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v"; + }; + } + { + goPackagePath = "github.com/tdewolff/strconv"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/strconv"; + rev = "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3"; + sha256 = "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp"; + }; + } + { + goPackagePath = "github.com/matryer/try"; + fetch = { + type = "git"; + url = "https://github.com/matryer/try"; + rev = "93d30e50512f879b73829eb79867df38084bcd31"; + sha256 = "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag"; + rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; + sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; + }; + } +] diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f71a2e21a4d..7121ef689ae 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -101,7 +101,7 @@ rec { fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; - src = "${fzf}/share/go/src/github.com/junegunn/fzf"; + src = fzf.src; dependencies = []; }; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 51b4694b630..2c2ad28e292 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -20,5 +20,5 @@ buildGoPackage rec { -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version} ''; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/caddy/deps.json b/pkgs/servers/caddy/deps.json deleted file mode 100644 index 6a6638b44b4..00000000000 --- a/pkgs/servers/caddy/deps.json +++ /dev/null @@ -1,182 +0,0 @@ -[ - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "99064174e013895bbd9b025c31100bd1d9b590ca", - "sha256": "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", - "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" - } - }, - { - "goPackagePath": "github.com/flynn/go-shlex", - "fetch": { - "type": "git", - "url": "https://github.com/flynn/go-shlex", - "rev": "3f9db97f856818214da2e1057f8ad84803971cff", - "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a69d25be2fe2923a97c2af6849b2f52426f68fc0", - "sha256": "1z09mff5yfdrw8vbylrgrick5m5hczjy8m2x6swdq8v062s45g3v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "315de0c1920b18b942603ffdc2229e2af4803c17", - "sha256": "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6" - } - }, - { - "goPackagePath": "github.com/jimstudt/http-authentication", - "fetch": { - "type": "git", - "url": "https://github.com/jimstudt/http-authentication", - "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012", - "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/aes12", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/aes12", - "rev": "5a3c52721c1e81aa8162601ac2342486525156d5", - "sha256": "16z4h752na2d4sskjvbgi9bpwx874lpnzn6i13n33xjz599nps4y" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/fnv128a", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/fnv128a", - "rev": "393af48d391698c6ae4219566bfbdfef67269997", - "sha256": "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/quic-go", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/quic-go", - "rev": "c2af049b8af811a546bfa6b11f362c9c1e706343", - "sha256": "178w1qzpkyrkcnix093lj6dhgg5nylxg0aqmiff6f9ww2xknlw47" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/quic-go-certificates", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/quic-go-certificates", - "rev": "4904164a1a6479e3b509f616ccd31a7b0e705d52", - "sha256": "1kpl8j4lqwq1xqkyikbczq8dwrybbgz4m9ny21a88v0da6r2bcfk" - } - }, - { - "goPackagePath": "github.com/mholt/caddy", - "fetch": { - "type": "git", - "url": "https://github.com/mholt/caddy", - "rev": "c5aa5843d92a27eaf521e28684111030135d9cdc", - "sha256": "0slh4nf5pd42mgj1j9hzywqpc3p6d211dm6pdlhb6lyn8f6nprgp" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "db96a2b759cdef4f11a34506a42eb8d1290c598e", - "sha256": "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8", - "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "github.com/xenolf/lego", - "fetch": { - "type": "git", - "url": "https://github.com/xenolf/lego", - "rev": "823436d61175269716a88cd6627bfa603812f10c", - "sha256": "1j6nkw00d09ys0p4i7k4xad1fxczg3klvnw4x48wr1zaygnpaw7q" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "b3cc7317554b3e708b116d997899e612bab100d6", - "sha256": "1mcrgsvqmghhvf9z99prm15flx9l3irpm20z2zmdmhsprhc0nr5v" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "7394c112eae4dba7e96bfcfe738e6373d61772b4", - "sha256": "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7" - } - }, - { - "goPackagePath": "gopkg.in/natefinch/lumberjack.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/natefinch/lumberjack.v2", - "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738", - "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82" - } - }, - { - "goPackagePath": "gopkg.in/square/go-jose.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/square/go-jose.v1", - "rev": "a3927f83df1b1516f9e9dec71839c93e6bcf1db0", - "sha256": "0zbsy6hbv3p0ahcf4hviyv1vnpdywyf1hdspz8l6vj897myd019f" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e", - "sha256": "1himz6569rcgn27q6sdrwvdldx45q2spgjb5cfihgb80zww8di8x" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix new file mode 100644 index 00000000000..7d3d4ad7ba4 --- /dev/null +++ b/pkgs/servers/caddy/deps.nix @@ -0,0 +1,182 @@ +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "99064174e013895bbd9b025c31100bd1d9b590ca"; + sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a69d25be2fe2923a97c2af6849b2f52426f68fc0"; + sha256 = "1z09mff5yfdrw8vbylrgrick5m5hczjy8m2x6swdq8v062s45g3v"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; + sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + }; + } + { + goPackagePath = "github.com/jimstudt/http-authentication"; + fetch = { + type = "git"; + url = "https://github.com/jimstudt/http-authentication"; + rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012"; + sha256 = "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/aes12"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/aes12"; + rev = "5a3c52721c1e81aa8162601ac2342486525156d5"; + sha256 = "16z4h752na2d4sskjvbgi9bpwx874lpnzn6i13n33xjz599nps4y"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/fnv128a"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/fnv128a"; + rev = "393af48d391698c6ae4219566bfbdfef67269997"; + sha256 = "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/quic-go"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/quic-go"; + rev = "c2af049b8af811a546bfa6b11f362c9c1e706343"; + sha256 = "178w1qzpkyrkcnix093lj6dhgg5nylxg0aqmiff6f9ww2xknlw47"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/quic-go-certificates"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/quic-go-certificates"; + rev = "4904164a1a6479e3b509f616ccd31a7b0e705d52"; + sha256 = "1kpl8j4lqwq1xqkyikbczq8dwrybbgz4m9ny21a88v0da6r2bcfk"; + }; + } + { + goPackagePath = "github.com/mholt/caddy"; + fetch = { + type = "git"; + url = "https://github.com/mholt/caddy"; + rev = "c5aa5843d92a27eaf521e28684111030135d9cdc"; + sha256 = "0slh4nf5pd42mgj1j9hzywqpc3p6d211dm6pdlhb6lyn8f6nprgp"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; + sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "93622da34e54fb6529bfb7c57e710f37a8d9cbd8"; + sha256 = "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/xenolf/lego"; + fetch = { + type = "git"; + url = "https://github.com/xenolf/lego"; + rev = "823436d61175269716a88cd6627bfa603812f10c"; + sha256 = "1j6nkw00d09ys0p4i7k4xad1fxczg3klvnw4x48wr1zaygnpaw7q"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "b3cc7317554b3e708b116d997899e612bab100d6"; + sha256 = "1mcrgsvqmghhvf9z99prm15flx9l3irpm20z2zmdmhsprhc0nr5v"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "7394c112eae4dba7e96bfcfe738e6373d61772b4"; + sha256 = "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/natefinch/lumberjack.v2"; + rev = "514cbda263a734ae8caac038dadf05f8f3f9f738"; + sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v1"; + rev = "a3927f83df1b1516f9e9dec71839c93e6bcf1db0"; + sha256 = "0zbsy6hbv3p0ahcf4hviyv1vnpdywyf1hdspz8l6vj897myd019f"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e"; + sha256 = "1himz6569rcgn27q6sdrwvdldx45q2spgjb5cfihgb80zww8di8x"; + }; + } +] diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 3d301a6a35b..16189fb4723 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ libpcap ]; diff --git a/pkgs/servers/etcd/deps.json b/pkgs/servers/etcd/deps.json deleted file mode 100644 index 6ba22a78b7c..00000000000 --- a/pkgs/servers/etcd/deps.json +++ /dev/null @@ -1,335 +0,0 @@ -[ - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9", - "sha256": "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "583e8937c61f1af6513608ccc75c97b6abdf4ff9", - "sha256": "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay" - } - }, - { - "goPackagePath": "github.com/cloudfoundry-incubator/candiedyaml", - "fetch": { - "type": "git", - "url": "https://github.com/cloudfoundry-incubator/candiedyaml", - "rev": "99c3df83b51532e3615f851d8c2dbb638f5313bf", - "sha256": "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs" - } - }, - { - "goPackagePath": "github.com/cockroachdb/cmux", - "fetch": { - "type": "git", - "url": "https://github.com/cockroachdb/cmux", - "rev": "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d", - "sha256": "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh" - } - }, - { - "goPackagePath": "github.com/coreos/etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/etcd.git", - "rev": "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0", - "sha256": "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75" - } - }, - { - "goPackagePath": "github.com/coreos/go-semver", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-semver", - "rev": "8ab6407b697782a06568d4b7f1db25550ec2e4c6", - "sha256": "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2", - "sha256": "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk" - } - }, - { - "goPackagePath": "github.com/coreos/pkg", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/pkg", - "rev": "3ac0863d7acf3bc44daf49afef8919af12f704ef", - "sha256": "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l" - } - }, - { - "goPackagePath": "github.com/ghodss/yaml", - "fetch": { - "type": "git", - "url": "https://github.com/ghodss/yaml", - "rev": "aa0c862057666179de291b67d9f093d12b5a8473", - "sha256": "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "f20a1444730c7d9949b880a0309e737d007def25", - "sha256": "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "f592bd283e9ef86337a432eb50e592278c3d534d", - "sha256": "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb" - } - }, - { - "goPackagePath": "github.com/google/btree", - "fetch": { - "type": "git", - "url": "https://github.com/google/btree", - "rev": "7d79101e329e5a3adf994758c578dab82b90c017", - "sha256": "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0" - } - }, - { - "goPackagePath": "github.com/grpc-ecosystem/grpc-gateway", - "fetch": { - "type": "git", - "url": "https://github.com/grpc-ecosystem/grpc-gateway", - "rev": "5e0e028ba0a015710eaebf6e47af18812c9f2767", - "sha256": "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk" - } - }, - { - "goPackagePath": "github.com/jonboulle/clockwork", - "fetch": { - "type": "git", - "url": "https://github.com/jonboulle/clockwork", - "rev": "e3653ace2d63753697e0e5b07b9393971c0bba9d", - "sha256": "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "c12348ce28de40eed0136aa2b644d0ee0650e56c", - "sha256": "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "c5b7fccd204277076155f10851dad72b76a49317", - "sha256": "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8", - "sha256": "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5", - "sha256": "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "7c674d9e72017ed25f6d2b5e497a1368086b6a6f", - "sha256": "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "6454a84b6da0ea8b628d5d8a26759f62c6c161b4", - "sha256": "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2", - "sha256": "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx" - } - }, - { - "goPackagePath": "github.com/xiang90/probing", - "fetch": { - "type": "git", - "url": "https://github.com/xiang90/probing", - "rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2", - "sha256": "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "88d0005bf4c3ec17306ecaca4281a8d8efd73e91", - "sha256": "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "7394c112eae4dba7e96bfcfe738e6373d61772b4", - "sha256": "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7" - } - }, - { - "goPackagePath": "google.golang.org/grpc", - "fetch": { - "type": "git", - "url": "https://github.com/grpc/grpc-go", - "rev": "0032a855ba5c8a3c8e0d71c2deef354b70af1584", - "sha256": "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67" - } - }, - { - "goPackagePath": "github.com/urfave/cli", - "fetch": { - "type": "git", - "url": "https://github.com/urfave/cli", - "rev": "168c95418e66e019fe17b8f4f5c45aa62ff80e23", - "sha256": "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "daf2955e742cf123959884fdff4685aa79b63135", - "sha256": "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", - "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" - } - }, - { - "goPackagePath": "github.com/bgentry/speakeasy", - "fetch": { - "type": "git", - "url": "https://github.com/bgentry/speakeasy", - "rev": "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da", - "sha256": "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "ce7fa45920dc37a92de8377972e52bc55ffa8d57", - "sha256": "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk" - } - }, - { - "goPackagePath": "github.com/golang/groupcache", - "fetch": { - "type": "git", - "url": "https://github.com/golang/groupcache", - "rev": "a6b377e3400b08991b80d6805d627f347f983866", - "sha256": "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2" - } - }, - { - "goPackagePath": "gopkg.in/cheggaaa/pb.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/cheggaaa/pb.v1", - "rev": "9453b2db37f4d8bc63751daca63bbe7049eb5e74", - "sha256": "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "23def4e6c14b4da8ac2ed8007337bc5eb5007998", - "sha256": "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30" - } - }, - { - "goPackagePath": "github.com/spacejam/loghisto", - "fetch": { - "type": "git", - "url": "https://github.com/spacejam/loghisto", - "rev": "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7", - "sha256": "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1" - } - }, - { - "goPackagePath": "github.com/akrennmair/gopcap", - "fetch": { - "type": "git", - "url": "https://github.com/akrennmair/gopcap", - "rev": "00e11033259acb75598ba416495bb708d864a010", - "sha256": "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix new file mode 100644 index 00000000000..2c07817a980 --- /dev/null +++ b/pkgs/servers/etcd/deps.nix @@ -0,0 +1,335 @@ +[ +{ + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; +} +{ + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"; + sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay"; + }; +} +{ + goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry-incubator/candiedyaml"; + rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; + sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; + }; +} +{ + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; + sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; + }; +} +{ + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd.git"; + rev = "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0"; + sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; + }; +} +{ + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; +} +{ + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2"; + sha256 = "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk"; + }; +} +{ + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; + sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; + }; +} +{ + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "aa0c862057666179de291b67d9f093d12b5a8473"; + sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; + }; +} +{ + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "f20a1444730c7d9949b880a0309e737d007def25"; + sha256 = "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c"; + }; +} +{ + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "f592bd283e9ef86337a432eb50e592278c3d534d"; + sha256 = "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb"; + }; +} +{ + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; + }; +} +{ + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "5e0e028ba0a015710eaebf6e47af18812c9f2767"; + sha256 = "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk"; + }; +} +{ + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "e3653ace2d63753697e0e5b07b9393971c0bba9d"; + sha256 = "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc"; + }; +} +{ + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; +} +{ + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; +} +{ + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; +} +{ + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; + sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; + }; +} +{ + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; + sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; + }; +} +{ + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; + sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; + }; +} +{ + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "6454a84b6da0ea8b628d5d8a26759f62c6c161b4"; + sha256 = "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna"; + }; +} +{ + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2"; + sha256 = "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx"; + }; +} +{ + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; + sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; + }; +} +{ + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; + sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; + }; +} +{ + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "7394c112eae4dba7e96bfcfe738e6373d61772b4"; + sha256 = "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7"; + }; +} +{ + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "0032a855ba5c8a3c8e0d71c2deef354b70af1584"; + sha256 = "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67"; + }; +} +{ + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "168c95418e66e019fe17b8f4f5c45aa62ff80e23"; + sha256 = "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n"; + }; +} +{ + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; +} +{ + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "daf2955e742cf123959884fdff4685aa79b63135"; + sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; + }; +} +{ + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; +} +{ + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da"; + sha256 = "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01"; + }; +} +{ + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "ce7fa45920dc37a92de8377972e52bc55ffa8d57"; + sha256 = "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk"; + }; +} +{ + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "a6b377e3400b08991b80d6805d627f347f983866"; + sha256 = "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2"; + }; +} +{ + goPackagePath = "gopkg.in/cheggaaa/pb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/cheggaaa/pb.v1"; + rev = "9453b2db37f4d8bc63751daca63bbe7049eb5e74"; + sha256 = "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb"; + }; +} +{ + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; +} +{ + goPackagePath = "github.com/spacejam/loghisto"; + fetch = { + type = "git"; + url = "https://github.com/spacejam/loghisto"; + rev = "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7"; + sha256 = "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1"; + }; +} +{ + goPackagePath = "github.com/akrennmair/gopcap"; + fetch = { + type = "git"; + url = "https://github.com/akrennmair/gopcap"; + rev = "00e11033259acb75598ba416495bb708d864a010"; + sha256 = "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a"; + }; +} +] diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index b8718898f4b..28ca858440b 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Share your terminal as a web application"; diff --git a/pkgs/servers/gotty/deps.json b/pkgs/servers/gotty/deps.json deleted file mode 100644 index 81983165dcd..00000000000 --- a/pkgs/servers/gotty/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "67e2db24c831afa6c64fc17b4a143390674365ef", - "sha256": "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d" - } - }, - { - "goPackagePath": "github.com/braintree/manners", - "fetch": { - "type": "git", - "url": "https://github.com/braintree/manners", - "rev": "cab36f97339b1925cd89e158632728025557e550", - "sha256": "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "71f57d300dd6a780ac1856c005c4b518cfd498ec", - "sha256": "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3" - } - }, - { - "goPackagePath": "github.com/elazarl/go-bindata-assetfs", - "fetch": { - "type": "git", - "url": "https://github.com/elazarl/go-bindata-assetfs", - "rev": "d5cac425555ca5cf00694df246e04f05e6a55150", - "sha256": "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17" - } - }, - { - "goPackagePath": "github.com/fatih/structs", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/structs", - "rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f", - "sha256": "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - } -] diff --git a/pkgs/servers/gotty/deps.nix b/pkgs/servers/gotty/deps.nix new file mode 100644 index 00000000000..4f59dc414c4 --- /dev/null +++ b/pkgs/servers/gotty/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + goPackagePath = "github.com/braintree/manners"; + fetch = { + type = "git"; + url = "https://github.com/braintree/manners"; + rev = "cab36f97339b1925cd89e158632728025557e550"; + sha256 = "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "71f57d300dd6a780ac1856c005c4b518cfd498ec"; + sha256 = "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "d5cac425555ca5cf00694df246e04f05e6a55150"; + sha256 = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "a9f7daa9c2729e97450c2da2feda19130a367d8f"; + sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } +] diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 5842495e323..82ed92084df 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; nativeBuildInputs = [ sudo ]; buildFlags = [ "-tags textsecure" ]; diff --git a/pkgs/servers/interlock/deps.json b/pkgs/servers/interlock/deps.json deleted file mode 100644 index 10bb3106c5c..00000000000 --- a/pkgs/servers/interlock/deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/janimo/textsecure", - "fetch": { - "type": "git", - "url": "https://github.com/janimo/textsecure", - "rev": "c38f429e48d6b2776d17b4171f216f132185b0f6", - "sha256": "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - } -] diff --git a/pkgs/servers/interlock/deps.nix b/pkgs/servers/interlock/deps.nix new file mode 100644 index 00000000000..be5c0529573 --- /dev/null +++ b/pkgs/servers/interlock/deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/janimo/textsecure"; + fetch = { + type = "git"; + url = "https://github.com/janimo/textsecure"; + rev = "c38f429e48d6b2776d17b4171f216f132185b0f6"; + sha256 = "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 86944c036e4..53c87745e67 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -17,5 +17,5 @@ buildGoPackage rec { sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/mesos-dns/deps.json b/pkgs/servers/mesos-dns/deps.json deleted file mode 100644 index 4df002888c4..00000000000 --- a/pkgs/servers/mesos-dns/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4", - "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "github.com/mesos/mesos-go", - "fetch": { - "type": "git", - "url": "https://github.com/mesos/mesos-go", - "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969", - "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk" - } - }, - { - "goPackagePath": "github.com/pmezard/go-difflib", - "fetch": { - "type": "git", - "url": "https://github.com/pmezard/go-difflib", - "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d", - "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/stretchr/objx", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/objx", - "rev": "cbeaeb16a013161a98496fad62933b1d21786672", - "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew", - "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d", - "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk" - } - }, - { - "goPackagePath": "github.com/emicklei/go-restful", - "fetch": { - "type": "git", - "url": "https://github.com/emicklei/go-restful", - "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d", - "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x" - } - }, - { - "goPackagePath": "github.com/stretchr/testify", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/testify", - "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff", - "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p" - } - } -] diff --git a/pkgs/servers/mesos-dns/deps.nix b/pkgs/servers/mesos-dns/deps.nix new file mode 100644 index 00000000000..00f0f245f6b --- /dev/null +++ b/pkgs/servers/mesos-dns/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4"; + sha256 = "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "github.com/mesos/mesos-go"; + fetch = { + type = "git"; + url = "https://github.com/mesos/mesos-go"; + rev = "aaa5b2fecf0e2db463f4f996c89617d6766b2969"; + sha256 = "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "892402ba11a2e2fd5e1295dd633481f27365f14d"; + sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "089c7181b8c728499929ff09b62d3fdd8df8adff"; + sha256 = "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix index 21bc242ec46..39bd3f12e95 100644 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ b/pkgs/servers/monitoring/prometheus/cli.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; - goDeps = ./cli_deps.json; + goDeps = ./cli_deps.nix; meta = with stdenv.lib; { description = "Command line tool for querying the Prometheus HTTP API"; diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.json b/pkgs/servers/monitoring/prometheus/cli_deps.json deleted file mode 100644 index 57384dba31c..00000000000 --- a/pkgs/servers/monitoring/prometheus/cli_deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.nix b/pkgs/servers/monitoring/prometheus/cli_deps.nix new file mode 100644 index 00000000000..192b6917bf0 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/cli_deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index dc9b6fd843e..6c703e5fa7b 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; }; - goDeps = ./collectd-exporter_deps.json; + goDeps = ./collectd-exporter_deps.nix; meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json deleted file mode 100644 index 1ff93e411f8..00000000000 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix new file mode 100644 index 00000000000..92523d69937 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index f2afd2aa273..ec63d5e6352 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w"; }; - goDeps = ./haproxy-exporter_deps.json; + goDeps = ./haproxy-exporter_deps.nix; meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json deleted file mode 100644 index 1ff93e411f8..00000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix new file mode 100644 index 00000000000..92523d69937 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ddd7a17364b..42ff2496df1 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; - goDeps = ./mesos-exporter_deps.json; + goDeps = ./mesos-exporter_deps.nix; meta = with stdenv.lib; { description = "Export Mesos metrics to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json deleted file mode 100644 index a0b80e0ff14..00000000000 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/antonlindstrom/mesos_stats", - "fetch": { - "type": "git", - "url": "https://github.com/antonlindstrom/mesos_stats", - "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920", - "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix new file mode 100644 index 00000000000..e8fdcc95da2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/antonlindstrom/mesos_stats"; + fetch = { + type = "git"; + url = "https://github.com/antonlindstrom/mesos_stats"; + rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; + sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 64a9e6cc28e..5a274435e3d 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr"; }; - goDeps = ./mysqld-exporter_deps.json; + goDeps = ./mysqld-exporter_deps.nix; meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json deleted file mode 100644 index 77d4c301bf8..00000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/go-sql-driver/mysql", - "fetch": { - "type": "git", - "url": "https://github.com/go-sql-driver/mysql", - "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84", - "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix new file mode 100644 index 00000000000..4910832a62c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84"; + sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 9adfdda1d07..280f7e0abd0 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; }; - goDeps = ./nginx-exporter_deps.json; + goDeps = ./nginx-exporter_deps.nix; meta = with stdenv.lib; { description = "Metrics relay from nginx stats to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json deleted file mode 100644 index 2a86511ef99..00000000000 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/prometheus/log", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/log", - "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55", - "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix new file mode 100644 index 00000000000..26b2bcaa8d2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/prometheus/log"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/log"; + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 19148ec1cb4..788fe863396 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; }; - goDeps = ./prom2json_deps.json; + goDeps = ./prom2json_deps.nix; meta = with stdenv.lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.json b/pkgs/servers/monitoring/prometheus/prom2json_deps.json deleted file mode 100644 index b716d41b2c1..00000000000 --- a/pkgs/servers/monitoring/prometheus/prom2json_deps.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix new file mode 100644 index 00000000000..20cabe3d385 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 65dda2403fc..6a742796f30 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd"; }; - goDeps = ./pushgateway_deps.json; + goDeps = ./pushgateway_deps.nix; buildInputs = [ go-bindata ]; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json b/pkgs/servers/monitoring/prometheus/pushgateway_deps.json deleted file mode 100644 index c5ece41a52e..00000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/julienschmidt/httprouter", - "fetch": { - "type": "git", - "url": "https://github.com/julienschmidt/httprouter", - "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7", - "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix new file mode 100644 index 00000000000..33795927ed9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; + sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index 935692bfa2e..0ff1386074b 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1gg9v224n05khcwy27637w3rwh0cymm7hx6bginfxd7730rmpp2r"; }; - goDeps = ./statsd-bridge_deps.json; + goDeps = ./statsd-bridge_deps.nix; meta = with stdenv.lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json deleted file mode 100644 index 4c0bc142c88..00000000000 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/howeyc/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6", - "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix new file mode 100644 index 00000000000..fd11ab5a7ea --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/howeyc/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6"; + sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; + }; + } +] diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 20c4d699dd4..1614049bf22 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { # Generated with the `gdm2nix.rb` script and the `Godeps` file from the # influxdb repo root. - goDeps = ./. + builtins.toPath "/deps-${version}.json"; + goDeps = ./. + builtins.toPath "/deps-${version}.nix"; meta = with lib; { description = "An open-source distributed time series database"; diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.json b/pkgs/servers/nosql/influxdb/deps-0.13.0.json deleted file mode 100644 index 33388cc0fb7..00000000000 --- a/pkgs/servers/nosql/influxdb/deps-0.13.0.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "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/deps-0.13.0.json.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix new file mode 100644 index 00000000000..1b8885a1a0f --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix @@ -0,0 +1,200 @@ +[ +{ + 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"; + }; +} +] diff --git a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json b/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json deleted file mode 100644 index fe72249ea26..00000000000 --- a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json +++ /dev/null @@ -1,155 +0,0 @@ -[ - { - "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/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/dgrijalva/jwt-go", - "fetch": { - "type": "git", - "url": "https://github.com/dgrijalva/jwt-go.git", - "rev": "a2c85815a77d0f951e33ba4db5ae93629a1530af", - "sha256": "1m7011hdr4qa400awbdagj2m5zwfbvhinq8p5hq7ysn14xpaq5vw" - } - }, - { - "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/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" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.nix b/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.nix new file mode 100644 index 00000000000..016e7a1624d --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.nix @@ -0,0 +1,155 @@ +[ +{ + 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/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/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go.git"; + rev = "a2c85815a77d0f951e33ba4db5ae93629a1530af"; + sha256 = "1m7011hdr4qa400awbdagj2m5zwfbvhinq8p5hq7ysn14xpaq5vw"; + }; +} +{ + 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/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"; + }; +} +] diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb index d6ad6aa5eed..4feb78f54bb 100755 --- a/pkgs/servers/nosql/influxdb/gdm2nix.rb +++ b/pkgs/servers/nosql/influxdb/gdm2nix.rb @@ -35,4 +35,5 @@ deps = File.read(godeps).lines.map do |line| } end +#TODO: move to deps.nix in NIXON format File.write("deps.json", JSON.pretty_generate(deps)) diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index 334b78c9128..fa78c876c1e 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/nsq/deps.json b/pkgs/servers/nsq/deps.json deleted file mode 100644 index c6a8392d919..00000000000 --- a/pkgs/servers/nsq/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/mreiferson/go-snappystream", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-snappystream", - "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504", - "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6" - } - }, - { - "goPackagePath": "github.com/bitly/go-nsq", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-nsq", - "rev": "22a8bd48c443ec23bb559675b6df8284bbbdab29", - "sha256": "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "9bf7bff48b0388cb75991e58c6df7d13e982f1f2", - "sha256": "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7" - } - }, - { - "goPackagePath": "github.com/bmizerany/perks", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/perks", - "rev": "6cb9d9d729303ee2628580d9aec5db968da3a607", - "sha256": "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/bitly/go-hostpool", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-hostpool", - "rev": "d0e59c22a56e8dadfed24f74f452cea5a52722d2", - "sha256": "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g" - } - }, - { - "goPackagePath": "github.com/bitly/timer_metrics", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/timer_metrics", - "rev": "afad1794bb13e2a094720aeb27c088aa64564895", - "sha256": "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - } -] diff --git a/pkgs/servers/nsq/deps.nix b/pkgs/servers/nsq/deps.nix new file mode 100644 index 00000000000..751a18ca92d --- /dev/null +++ b/pkgs/servers/nsq/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/mreiferson/go-snappystream"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-snappystream"; + rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + }; + } + { + goPackagePath = "github.com/bitly/go-nsq"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-nsq"; + rev = "22a8bd48c443ec23bb559675b6df8284bbbdab29"; + sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2"; + sha256 = "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7"; + }; + } + { + goPackagePath = "github.com/bmizerany/perks"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/perks"; + rev = "6cb9d9d729303ee2628580d9aec5db968da3a607"; + sha256 = "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/bitly/timer_metrics"; + fetch = { + type = "git"; + url = "https://github.com/bitly/timer_metrics"; + rev = "afad1794bb13e2a094720aeb27c088aa64564895"; + sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } +] diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 3e3bcea46a2..b58fc342ded 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/oauth2_proxy/deps.json b/pkgs/servers/oauth2_proxy/deps.json deleted file mode 100644 index 56f27b6b4e5..00000000000 --- a/pkgs/servers/oauth2_proxy/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/18F/hmacauth", - "fetch": { - "type": "git", - "url": "https://github.com/18F/hmacauth", - "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd", - "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1" - } - } -] diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix new file mode 100644 index 00000000000..37ddbbde64e --- /dev/null +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/18F/hmacauth"; + fetch = { + type = "git"; + url = "https://github.com/18F/hmacauth"; + rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd"; + sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"; + }; + } +] diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 4a37213846a..44c766d35d0 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/serf/deps.json b/pkgs/servers/serf/deps.json deleted file mode 100644 index ffd872c6287..00000000000 --- a/pkgs/servers/serf/deps.json +++ /dev/null @@ -1,137 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics", - "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25", - "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/hashicorp/logutils", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/logutils", - "rev": "0dc08b1671f34c4250ce212759ebd880f743d883", - "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r" - } - }, - { - "goPackagePath": "github.com/armon/go-radix", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-radix", - "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93", - "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", - "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" - } - }, - { - "goPackagePath": "github.com/hashicorp/memberlist", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/memberlist", - "rev": "6025015f2dc659ca2c735112d37e753bda6e329d", - "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "github.com/armon/circbuf", - "fetch": { - "type": "git", - "url": "https://github.com/armon/circbuf", - "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf", - "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s" - } - }, - { - "goPackagePath": "github.com/hashicorp/mdns", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/mdns", - "rev": "2b439d37011456df8ff83a70ffd1cd6046410113", - "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96" - } - }, - { - "goPackagePath": "github.com/mitchellh/cli", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/cli", - "rev": "8102d0ed5ea2709ade1243798785888175f6e415", - "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2" - } - }, - { - "goPackagePath": "github.com/ryanuber/columnize", - "fetch": { - "type": "git", - "url": "https://github.com/ryanuber/columnize", - "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a", - "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go.net", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go.net", - "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29", - "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf" - } - } -] diff --git a/pkgs/servers/serf/deps.nix b/pkgs/servers/serf/deps.nix new file mode 100644 index 00000000000..bc5b960d147 --- /dev/null +++ b/pkgs/servers/serf/deps.nix @@ -0,0 +1,137 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics"; + rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25"; + sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/hashicorp/logutils"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/logutils"; + rev = "0dc08b1671f34c4250ce212759ebd880f743d883"; + sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93"; + sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; + }; + } + { + goPackagePath = "github.com/hashicorp/memberlist"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/memberlist"; + rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; + sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/armon/circbuf"; + fetch = { + type = "git"; + url = "https://github.com/armon/circbuf"; + rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; + sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; + }; + } + { + goPackagePath = "github.com/hashicorp/mdns"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/mdns"; + rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; + sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; + }; + } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "8102d0ed5ea2709ade1243798785888175f6e415"; + sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; + }; + } + { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; + sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-msgpack"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/hashicorp/go.net"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go.net"; + rev = "104dcad90073cd8d1e6828b2af19185b60cf3e29"; + sha256 = "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"; + }; + } +] diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 657352634ef..ccb174371e0 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json deleted file mode 100644 index 5706ab2fc95..00000000000 --- a/pkgs/servers/skydns/deps.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "40456948a47496dc22168e6af39297a2f8fbf38c", - "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/stathat/go", - "fetch": { - "type": "git", - "url": "https://github.com/stathat/go", - "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93", - "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/skydns/deps.nix b/pkgs/servers/skydns/deps.nix new file mode 100644 index 00000000000..a4f4eb12045 --- /dev/null +++ b/pkgs/servers/skydns/deps.nix @@ -0,0 +1,128 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "40456948a47496dc22168e6af39297a2f8fbf38c"; + sha256 = "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/stathat/go"; + fetch = { + type = "git"; + url = "https://github.com/stathat/go"; + rev = "91dfa3a59c5b233fef9a346a1460f6e2bc889d93"; + sha256 = "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 021d4f074ed..884f34dcf02 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A Novel unix shell in go language"; diff --git a/pkgs/shells/elvish/deps.json b/pkgs/shells/elvish/deps.json deleted file mode 100644 index d1a4ceebe99..00000000000 --- a/pkgs/shells/elvish/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/elves/getopt", - "fetch": { - "type": "git", - "url": "https://github.com/elves/getopt", - "rev": "f91a7bf920995832d55a1182f26657bc975b9c24", - "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - } -] diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix new file mode 100644 index 00000000000..cff60bad0a9 --- /dev/null +++ b/pkgs/shells/elvish/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/elves/getopt"; + fetch = { + type = "git"; + url = "https://github.com/elves/getopt"; + rev = "f91a7bf920995832d55a1182f26657bc975b9c24"; + sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index c6d3ad06df4..c118cea1172 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/shells/oh/deps.json b/pkgs/shells/oh/deps.json deleted file mode 100644 index 5aabd0e6dba..00000000000 --- a/pkgs/shells/oh/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "github.com/michaelmacinnis/adapted", - "fetch": { - "type": "git", - "url": "https://github.com/michaelmacinnis/adapted", - "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978", - "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner", - "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060", - "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317" - } - } -] diff --git a/pkgs/shells/oh/deps.nix b/pkgs/shells/oh/deps.nix new file mode 100644 index 00000000000..b4b98f10c3a --- /dev/null +++ b/pkgs/shells/oh/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "github.com/michaelmacinnis/adapted"; + fetch = { + type = "git"; + url = "https://github.com/michaelmacinnis/adapted"; + rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978"; + sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "ad1edfd30321d8f006ccf05f1e0524adeb943060"; + sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"; + }; + } +] diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 197a7b80af3..de51e1ad25f 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ xorg.libX11 xorg.libXrandr ]; diff --git a/pkgs/tools/X11/go-sct/deps.json b/pkgs/tools/X11/go-sct/deps.json deleted file mode 100644 index 227db99338e..00000000000 --- a/pkgs/tools/X11/go-sct/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/cpucycle/astrotime", - "fetch": { - "type": "git", - "url": "https://github.com/cpucycle/astrotime", - "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca", - "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1" - } - } -] diff --git a/pkgs/tools/X11/go-sct/deps.nix b/pkgs/tools/X11/go-sct/deps.nix new file mode 100644 index 00000000000..f808858e091 --- /dev/null +++ b/pkgs/tools/X11/go-sct/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/cpucycle/astrotime"; + fetch = { + type = "git"; + url = "https://github.com/cpucycle/astrotime"; + rev = "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca"; + sha256 = "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"; + }; + } +] diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index be7d534b3d6..40647f73379 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lxc ]; diff --git a/pkgs/tools/admin/lxd/deps.json b/pkgs/tools/admin/lxd/deps.json deleted file mode 100644 index 1a0e2d3245f..00000000000 --- a/pkgs/tools/admin/lxd/deps.json +++ /dev/null @@ -1,173 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/syndtr/gocapability", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/gocapability", - "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852", - "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/log15.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/inconshreveable/log15.v2", - "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f", - "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8" - } - }, - { - "goPackagePath": "github.com/gorilla/mux", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/mux", - "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5", - "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9" - } - }, - { - "goPackagePath": "github.com/pborman/uuid", - "fetch": { - "type": "git", - "url": "https://github.com/pborman/uuid", - "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4", - "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn" - } - }, - { - "goPackagePath": "gopkg.in/flosch/pongo2.v3", - "fetch": { - "type": "git", - "url": "https://gopkg.in/flosch/pongo2.v3", - "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9", - "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "cca8bbc0798408af109aaaa239cbd2634846b340", - "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - }, - { - "goPackagePath": "gopkg.in/lxc/go-lxc.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/lxc/go-lxc.v2", - "rev": "8f9e220b36393c03854c2d224c5a55644b13e205", - "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/dustinkirkland/golang-petname", - "fetch": { - "type": "git", - "url": "https://github.com/dustinkirkland/golang-petname", - "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c", - "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl" - } - }, - { - "goPackagePath": "github.com/gorilla/context", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/context", - "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd", - "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/gosexy/gettext", - "fetch": { - "type": "git", - "url": "https://github.com/gosexy/gettext", - "rev": "305f360aee30243660f32600b87c3c1eaa947187", - "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09" - } - } -] diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix new file mode 100644 index 00000000000..7325100bb3a --- /dev/null +++ b/pkgs/tools/admin/lxd/deps.nix @@ -0,0 +1,173 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gocapability"; + rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"; + sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/log15.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/inconshreveable/log15.v2"; + rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; + sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5"; + sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "gopkg.in/flosch/pongo2.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/flosch/pongo2.v3"; + rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; + sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; + sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } + { + goPackagePath = "gopkg.in/lxc/go-lxc.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/lxc/go-lxc.v2"; + rev = "8f9e220b36393c03854c2d224c5a55644b13e205"; + sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/dustinkirkland/golang-petname"; + fetch = { + type = "git"; + url = "https://github.com/dustinkirkland/golang-petname"; + rev = "2182cecef7f257230fc998bc351a08a5505f5e6c"; + sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd"; + sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "305f360aee30243660f32600b87c3c1eaa947187"; + sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"; + }; + } +] diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 0bb92f14e15..028aef6024b 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -16,5 +16,5 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.json b/pkgs/tools/filesystems/go-mtpfs/deps.json deleted file mode 100644 index 9960293f090..00000000000 --- a/pkgs/tools/filesystems/go-mtpfs/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/hanwen/go-fuse", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/go-fuse", - "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e", - "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56" - } - }, - { - "goPackagePath": "github.com/hanwen/usb", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/usb", - "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1", - "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky" - } - } -] diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix new file mode 100644 index 00000000000..4bba3f23739 --- /dev/null +++ b/pkgs/tools/filesystems/go-mtpfs/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "bd746dd8bcc8c059a9d953a786a6156eb83f398e"; + sha256 = "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"; + }; + } + { + goPackagePath = "github.com/hanwen/usb"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/usb"; + rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; + sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; + }; + } +] diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 3eaf5ae5d1b..60a7007db19 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { buildInputs = [ ncurses ]; - goDeps = ./deps.json; + goDeps = ./deps.nix; patchPhase = '' sed -i -e "s|expand(':h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json deleted file mode 100644 index a856d2d5fa8..00000000000 --- a/pkgs/tools/misc/fzf/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/junegunn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-runewidth", - "rev": "63c378b851290989b19ca955468386485f118c65", - "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d" - } - }, - { - "goPackagePath": "github.com/junegunn/go-shellwords", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-shellwords", - "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4", - "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7" - } - } -] diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix new file mode 100644 index 00000000000..98530853832 --- /dev/null +++ b/pkgs/tools/misc/fzf/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/junegunn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/junegunn/go-runewidth"; + rev = "63c378b851290989b19ca955468386485f118c65"; + sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; + }; + } + { + goPackagePath = "github.com/junegunn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/junegunn/go-shellwords"; + rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; + sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"; + }; + } +] diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 6e3fe1223fc..7c944ceaab3 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json deleted file mode 100644 index a51c1725353..00000000000 --- a/pkgs/tools/misc/gawp/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - } -] diff --git a/pkgs/tools/misc/gawp/deps.nix b/pkgs/tools/misc/gawp/deps.nix new file mode 100644 index 00000000000..cf577a30354 --- /dev/null +++ b/pkgs/tools/misc/gawp/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } +] diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 1cda3149bb4..52e7793d974 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json deleted file mode 100644 index 0db944a8361..00000000000 --- a/pkgs/tools/misc/i3cat/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/vincent-petithory/structfield", - "fetch": { - "type": "git", - "url": "https://github.com/vincent-petithory/structfield", - "rev": "01a738558a47fbf16712994d1737fb31c77e7d11", - "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw" - } - } -] diff --git a/pkgs/tools/misc/i3cat/deps.nix b/pkgs/tools/misc/i3cat/deps.nix new file mode 100644 index 00000000000..01e85cbd824 --- /dev/null +++ b/pkgs/tools/misc/i3cat/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/vincent-petithory/structfield"; + fetch = { + type = "git"; + url = "https://github.com/vincent-petithory/structfield"; + rev = "01a738558a47fbf16712994d1737fb31c77e7d11"; + sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"; + }; + } +] diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 113b8b2b4ce..f67fd383f18 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json deleted file mode 100644 index c1cc7f96f75..00000000000 --- a/pkgs/tools/misc/mongodb-tools/deps.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "gopkg.in/mgo.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/mgo.v2", - "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a", - "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - } -] diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix new file mode 100644 index 00000000000..437dcd64937 --- /dev/null +++ b/pkgs/tools/misc/mongodb-tools/deps.nix @@ -0,0 +1,47 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index d02e2865c8f..ff8e7873839 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -19,5 +19,5 @@ buildGoPackage rec { sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json deleted file mode 100644 index 96db25d0c7d..00000000000 --- a/pkgs/tools/misc/upower-notify/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/godbus/dbus", - "fetch": { - "type": "git", - "url": "https://github.com/godbus/dbus", - "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15", - "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3" - } - } -] diff --git a/pkgs/tools/misc/upower-notify/deps.nix b/pkgs/tools/misc/upower-notify/deps.nix new file mode 100644 index 00000000000..8a729857b81 --- /dev/null +++ b/pkgs/tools/misc/upower-notify/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15"; + sha256 = "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"; + }; + } +] diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix index 9644fa06972..e354ad223b8 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ go-bindata ]; diff --git a/pkgs/tools/networking/ngrok/deps.json b/pkgs/tools/networking/ngrok/deps.json deleted file mode 100644 index 943967b7342..00000000000 --- a/pkgs/tools/networking/ngrok/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/inconshreveable/go-vhost", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-vhost", - "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c", - "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32" - } - }, - { - "goPackagePath": "code.google.com/p/log4go", - "fetch": { - "type": "git", - "url": "https://github.com/ccpaging/log4go", - "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8", - "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2" - } - }, - { - "goPackagePath": "github.com/daviddengcn/go-colortext", - "fetch": { - "type": "git", - "url": "https://github.com/daviddengcn/go-colortext", - "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57", - "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-yaml/yaml", - "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a", - "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/go-update.v0", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-update", - "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066", - "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/kr/binarydist", - "fetch": { - "type": "git", - "url": "https://github.com/kr/binarydist", - "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd", - "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3" - } - } -] diff --git a/pkgs/tools/networking/ngrok/deps.nix b/pkgs/tools/networking/ngrok/deps.nix new file mode 100644 index 00000000000..1db3c3e6519 --- /dev/null +++ b/pkgs/tools/networking/ngrok/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-vhost"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-vhost"; + rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c"; + sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"; + }; + } + { + goPackagePath = "code.google.com/p/log4go"; + fetch = { + type = "git"; + url = "https://github.com/ccpaging/log4go"; + rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8"; + sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"; + }; + } + { + goPackagePath = "github.com/daviddengcn/go-colortext"; + fetch = { + type = "git"; + url = "https://github.com/daviddengcn/go-colortext"; + rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57"; + sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; + sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/go-update.v0"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-update"; + rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066"; + sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/kr/binarydist"; + fetch = { + type = "git"; + url = "https://github.com/kr/binarydist"; + rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; + sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"; + }; + } +] diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 6231d5005dc..a13d6599ffb 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/networking/s3gof3r/deps.json b/pkgs/tools/networking/s3gof3r/deps.json deleted file mode 100644 index e73edde322f..00000000000 --- a/pkgs/tools/networking/s3gof3r/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - } -] diff --git a/pkgs/tools/networking/s3gof3r/deps.nix b/pkgs/tools/networking/s3gof3r/deps.nix new file mode 100644 index 00000000000..49c5d600be2 --- /dev/null +++ b/pkgs/tools/networking/s3gof3r/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 89d795c8e50..b879ef002b1 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random" ''; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A packaging tool built around IPFS"; diff --git a/pkgs/tools/package-management/gx/deps.json b/pkgs/tools/package-management/gx/deps.json deleted file mode 100644 index 3dd8e8f6ab3..00000000000 --- a/pkgs/tools/package-management/gx/deps.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "goPackagePath": "github.com/anacrolix/missinggo", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/missinggo", - "rev": "e40875155efce3d98562ca9e265e152c364ada3e", - "sha256": "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg" - } - }, - { - "goPackagePath": "github.com/anacrolix/sync", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/sync", - "rev": "812602587b72df6a2a4f6e30536adc75394a374b", - "sha256": "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l" - } - }, - { - "goPackagePath": "github.com/anacrolix/utp", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/utp", - "rev": "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0", - "sha256": "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "aea32c919a18e5ef4537bbd283ff29594b1b0165", - "sha256": "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd" - } - }, - { - "goPackagePath": "github.com/bradfitz/iter", - "fetch": { - "type": "git", - "url": "https://github.com/bradfitz/iter", - "rev": "454541ec3da2a73fc34fd049b19ee5777bf19345", - "sha256": "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "e5bef42c62aa7d25aba4880dc02b7624f01e9e19", - "sha256": "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq" - } - }, - { - "goPackagePath": "github.com/ipfs/go-ipfs-api", - "fetch": { - "type": "git", - "url": "https://github.com/ipfs/go-ipfs-api", - "rev": "7c354892da3abdaafb6ac576c100b259b1a73dac", - "sha256": "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc" - } - }, - { - "goPackagePath": "github.com/jbenet/go-base58", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-base58", - "rev": "6237cf65f3a6f7111cd8a42be3590df99a66bc7d", - "sha256": "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr", - "rev": "f3dff105e44513821be8fbe91c89ef15eff1b4d4", - "sha256": "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr-net", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr-net", - "rev": "d4cfd691db9f50e430528f682ca603237b0eaae0", - "sha256": "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multihash", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multihash", - "rev": "e8d2374934f16a971d1e94a864514a21ac74bf7f", - "sha256": "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp" - } - }, - { - "goPackagePath": "github.com/jbenet/go-os-rename", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-os-rename", - "rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2", - "sha256": "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random", - "rev": "384f606e91f542a98e779e652eed88051618f0f7", - "sha256": "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random-files", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random-files", - "rev": "737479700b40b4b50e914e963ce8d9d44603e3c8", - "sha256": "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1111e456ffea841564ac0fa5f69c26ef44dafec9", - "sha256": "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23" - } - }, - { - "goPackagePath": "github.com/sabhiram/go-git-ignore", - "fetch": { - "type": "git", - "url": "https://github.com/sabhiram/go-git-ignore", - "rev": "228fcfa2a06e870a3ef238d54c45ea847f492a37", - "sha256": "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/go-multipart-files", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/go-multipart-files", - "rev": "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2", - "sha256": "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/json-filter", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/json-filter", - "rev": "e9937f5649231265a56d0a419f062530425401a1", - "sha256": "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/stump", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/stump", - "rev": "206f8f13aae1697a6fc1f4a55799faf955971fc5", - "sha256": "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/tar-utils", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/tar-utils", - "rev": "beab27159606f5a7c978268dd1c3b12a0f1de8a7", - "sha256": "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "f3241ce8505855877cc8a9717bd61a0f7c4ea83c", - "sha256": "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq" - } - } -] diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix new file mode 100644 index 00000000000..19372f807c2 --- /dev/null +++ b/pkgs/tools/package-management/gx/deps.nix @@ -0,0 +1,200 @@ +[ + { + goPackagePath = "github.com/anacrolix/missinggo"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/missinggo"; + rev = "e40875155efce3d98562ca9e265e152c364ada3e"; + sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg"; + }; + } + { + goPackagePath = "github.com/anacrolix/sync"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/sync"; + rev = "812602587b72df6a2a4f6e30536adc75394a374b"; + sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l"; + }; + } + { + goPackagePath = "github.com/anacrolix/utp"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/utp"; + rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0"; + sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165"; + sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"; + }; + } + { + goPackagePath = "github.com/bradfitz/iter"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/iter"; + rev = "454541ec3da2a73fc34fd049b19ee5777bf19345"; + sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19"; + sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"; + }; + } + { + goPackagePath = "github.com/ipfs/go-ipfs-api"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-ipfs-api"; + rev = "7c354892da3abdaafb6ac576c100b259b1a73dac"; + sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"; + }; + } + { + goPackagePath = "github.com/jbenet/go-base58"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-base58"; + rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d"; + sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multiaddr"; + rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4"; + sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr-net"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multiaddr-net"; + rev = "d4cfd691db9f50e430528f682ca603237b0eaae0"; + sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multihash"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multihash"; + rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f"; + sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp"; + }; + } + { + goPackagePath = "github.com/jbenet/go-os-rename"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-os-rename"; + rev = "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2"; + sha256 = "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-random"; + rev = "384f606e91f542a98e779e652eed88051618f0f7"; + sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random-files"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-random-files"; + rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; + sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9"; + sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"; + }; + } + { + goPackagePath = "github.com/sabhiram/go-git-ignore"; + fetch = { + type = "git"; + url = "https://github.com/sabhiram/go-git-ignore"; + rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37"; + sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-multipart-files"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-multipart-files"; + rev = "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2"; + sha256 = "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/json-filter"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/json-filter"; + rev = "e9937f5649231265a56d0a419f062530425401a1"; + sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/stump"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/stump"; + rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5"; + sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/tar-utils"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/tar-utils"; + rev = "beab27159606f5a7c978268dd1c3b12a0f1de8a7"; + sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c"; + sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"; + }; + } +] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 912c870c27b..877d5c6540a 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l"; }; - goDeps = ../deps.json; + goDeps = ../deps.nix; extraSrcs = [ { diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 5e8d260d693..e7673cf5842 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/security/hologram/deps.json b/pkgs/tools/security/hologram/deps.json deleted file mode 100644 index 3d40bfd2cee..00000000000 --- a/pkgs/tools/security/hologram/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "github.com/aybabtme/rgbterm", - "fetch": { - "type": "git", - "url": "https://github.com/aybabtme/rgbterm", - "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283", - "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam" - } - }, - { - "goPackagePath": "github.com/vaughan0/go-ini", - "fetch": { - "type": "git", - "url": "https://github.com/vaughan0/go-ini", - "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1", - "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4", - "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9" - } - }, - { - "goPackagePath": "github.com/goamz/goamz", - "fetch": { - "type": "git", - "url": "https://github.com/goamz/goamz", - "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7", - "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b" - } - }, - { - "goPackagePath": "github.com/nmcclain/asn1-ber", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "gopkg.in/asn1-ber.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "github.com/peterbourgon/g2s", - "fetch": { - "type": "git", - "url": "https://github.com/peterbourgon/g2s", - "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc", - "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj" - } - }, - { - "goPackagePath": "github.com/nmcclain/ldap", - "fetch": { - "type": "git", - "url": "https://github.com/go-ldap/ldap", - "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29", - "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz" - } - } -] diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix new file mode 100644 index 00000000000..2c4cdbe84f0 --- /dev/null +++ b/pkgs/tools/security/hologram/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "github.com/aybabtme/rgbterm"; + fetch = { + type = "git"; + url = "https://github.com/aybabtme/rgbterm"; + rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; + sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4"; + sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"; + }; + } + { + goPackagePath = "github.com/goamz/goamz"; + fetch = { + type = "git"; + url = "https://github.com/goamz/goamz"; + rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; + sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"; + }; + } + { + goPackagePath = "github.com/nmcclain/asn1-ber"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "github.com/peterbourgon/g2s"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/g2s"; + rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; + sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; + }; + } + { + goPackagePath = "github.com/nmcclain/ldap"; + fetch = { + type = "git"; + url = "https://github.com/go-ldap/ldap"; + rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; + sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; + }; + } +] diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index 5da87f4ce46..ebe654d946e 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/system/confd/deps.json b/pkgs/tools/system/confd/deps.json deleted file mode 100644 index 407870efdaa..00000000000 --- a/pkgs/tools/system/confd/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/kelseyhightower/memkv", - "fetch": { - "type": "git", - "url": "https://github.com/kelseyhightower/memkv", - "rev": "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580", - "sha256": "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540" - } - }, - { - "goPackagePath": "github.com/armon/consul-api", - "fetch": { - "type": "git", - "url": "https://github.com/armon/consul-api", - "rev": "f79efe463cdbb62f6d5a55f879a63ec554eb13e5", - "sha256": "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp" - } - }, - { - "goPackagePath": "github.com/garyburd/redigo", - "fetch": { - "type": "git", - "url": "https://github.com/garyburd/redigo", - "rev": "535138d7bcd717d6531c701ef5933d98b1866257", - "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v" - } - } -] diff --git a/pkgs/tools/system/confd/deps.nix b/pkgs/tools/system/confd/deps.nix new file mode 100644 index 00000000000..74467ddf9cc --- /dev/null +++ b/pkgs/tools/system/confd/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/memkv"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/memkv"; + rev = "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580"; + sha256 = "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "f79efe463cdbb62f6d5a55f879a63ec554eb13e5"; + sha256 = "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "535138d7bcd717d6531c701ef5933d98b1866257"; + sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; + }; + } +] diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 21a49d493aa..502af44262b 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "09pkdfh7fqn3x4l9zaw5wzk20k7nfdwry7br9vfy3vv3fwv61ynp"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { homepage = https://github.com/monochromegane/the_platinum_searcher; diff --git a/pkgs/tools/text/platinum-searcher/deps.json b/pkgs/tools/text/platinum-searcher/deps.json deleted file mode 100644 index 5578478eb4c..00000000000 --- a/pkgs/tools/text/platinum-searcher/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/monochromegane/conflag", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/conflag", - "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9", - "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-home", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-home", - "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401", - "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww" - } - }, - { - "goPackagePath": "github.com/monochromegane/terminal", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/terminal", - "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48", - "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-gitignore", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-gitignore", - "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729", - "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7" - } - }, - { - "goPackagePath": "github.com/shiena/ansicolor", - "fetch": { - "type": "git", - "url": "https://github.com/shiena/ansicolor", - "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b", - "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p" - } - } -] diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/tools/text/platinum-searcher/deps.nix new file mode 100644 index 00000000000..da3f3ff1b8a --- /dev/null +++ b/pkgs/tools/text/platinum-searcher/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/monochromegane/conflag"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/conflag"; + rev = "6d68c9aa4183844ddc1655481798fe4d90d483e9"; + sha256 = "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"; + }; + } + { + goPackagePath = "github.com/monochromegane/go-home"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/go-home"; + rev = "25d9dda593924a11ea52e4ffbc8abdb0dbe96401"; + sha256 = "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"; + }; + } + { + goPackagePath = "github.com/monochromegane/terminal"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/terminal"; + rev = "2da212063ce19aed90ee5bbb00ad1ad7393d7f48"; + sha256 = "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"; + }; + } + { + goPackagePath = "github.com/monochromegane/go-gitignore"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/go-gitignore"; + rev = "38717d0a108ca0e5af632cd6845ca77d45b50729"; + sha256 = "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"; + }; + } + { + goPackagePath = "github.com/shiena/ansicolor"; + fetch = { + type = "git"; + url = "https://github.com/shiena/ansicolor"; + rev = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b"; + sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"; + }; + } +] diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 9a93b64e369..42a2ab852e1 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1nb042k420xr6000ipwhqn41vg8jfp6ghq4z7y1sjnndkrhclzm1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with lib; { description = "sift is a fast and powerful alternative to grep"; diff --git a/pkgs/tools/text/sift/deps.json b/pkgs/tools/text/sift/deps.json deleted file mode 100644 index 3869e6e5ca9..00000000000 --- a/pkgs/tools/text/sift/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/svent/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-flags", - "rev": "4bcbad344f0318adaf7aabc16929701459009aa3", - "sha256": "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34" - } - }, - { - "goPackagePath": "github.com/svent/go-nbreader", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-nbreader", - "rev": "7cef48da76dca6a496faa7fe63e39ed665cbd219", - "sha256": "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r" - } - } -] diff --git a/pkgs/tools/text/sift/deps.nix b/pkgs/tools/text/sift/deps.nix new file mode 100644 index 00000000000..038555fa3ca --- /dev/null +++ b/pkgs/tools/text/sift/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/svent/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/svent/go-flags"; + rev = "4bcbad344f0318adaf7aabc16929701459009aa3"; + sha256 = "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34"; + }; + } + { + goPackagePath = "github.com/svent/go-nbreader"; + fetch = { + type = "git"; + url = "https://github.com/svent/go-nbreader"; + rev = "7cef48da76dca6a496faa7fe63e39ed665cbd219"; + sha256 = "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r"; + }; + } +] From dd7e73f586fe30fc1b5480e40d94322186aff098 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 16 Sep 2016 00:24:11 +0100 Subject: [PATCH 202/234] telegraf: convert deps from json to nix Fixed for 914e0e594ca2d0fa5d456be208bf703d79f04fa3 --- pkgs/servers/monitoring/telegraf/default.nix | 2 +- .../monitoring/telegraf/deps-1.0.0.json | 587 ------------------ .../monitoring/telegraf/deps-1.0.0.nix | 587 ++++++++++++++++++ 3 files changed, 588 insertions(+), 588 deletions(-) delete mode 100644 pkgs/servers/monitoring/telegraf/deps-1.0.0.json create mode 100644 pkgs/servers/monitoring/telegraf/deps-1.0.0.nix diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 5da60418080..75f92d3eabe 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { }; # Generated with the `gdm2nix.rb` script and the `Godeps` file from the influxdb repo root. - goDeps = ./. + builtins.toPath "/deps-${version}.json"; + goDeps = ./. + builtins.toPath "/deps-${version}.nix"; meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics."; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.0.json b/pkgs/servers/monitoring/telegraf/deps-1.0.0.json deleted file mode 100644 index b4ff616ad6b..00000000000 --- a/pkgs/servers/monitoring/telegraf/deps-1.0.0.json +++ /dev/null @@ -1,587 +0,0 @@ -[ - { - "goPackagePath": "github.com/Shopify/sarama", - "fetch": { - "type": "git", - "url": "https://github.com/Shopify/sarama.git", - "rev": "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9", - "sha256": "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv" - } - }, - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus.git", - "rev": "219c8cb75c258c552e999735be6df753ffc7afdc", - "sha256": "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6" - } - }, - { - "goPackagePath": "github.com/aerospike/aerospike-client-go", - "fetch": { - "type": "git", - "url": "https://github.com/aerospike/aerospike-client-go.git", - "rev": "45863b7fd8640dc12f7fdd397104d97e1986f25a", - "sha256": "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw" - } - }, - { - "goPackagePath": "github.com/amir/raidman", - "fetch": { - "type": "git", - "url": "https://github.com/amir/raidman.git", - "rev": "53c1b967405155bfc8758557863bf2e14f814687", - "sha256": "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4" - } - }, - { - "goPackagePath": "github.com/aws/aws-sdk-go", - "fetch": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-go.git", - "rev": "13a12060f716145019378a10e2806c174356b857", - "sha256": "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks.git", - "rev": "3ac7bf7a47d159a033b107610db8a1b6575507a4", - "sha256": "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r" - } - }, - { - "goPackagePath": "github.com/cenkalti/backoff", - "fetch": { - "type": "git", - "url": "https://github.com/cenkalti/backoff.git", - "rev": "4dc77674aceaabba2c7e3da25d4c823edfb73f99", - "sha256": "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w" - } - }, - { - "goPackagePath": "github.com/couchbase/go-couchbase", - "fetch": { - "type": "git", - "url": "https://github.com/couchbase/go-couchbase.git", - "rev": "cb664315a324d87d19c879d9cc67fda6be8c2ac1", - "sha256": "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr" - } - }, - { - "goPackagePath": "github.com/couchbase/gomemcached", - "fetch": { - "type": "git", - "url": "https://github.com/couchbase/gomemcached.git", - "rev": "a5ea6356f648fec6ab89add00edd09151455b4b2", - "sha256": "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi" - } - }, - { - "goPackagePath": "github.com/couchbase/goutils", - "fetch": { - "type": "git", - "url": "https://github.com/couchbase/goutils.git", - "rev": "5823a0cbaaa9008406021dc5daf80125ea30bba6", - "sha256": "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c" - } - }, - { - "goPackagePath": "github.com/dancannon/gorethink", - "fetch": { - "type": "git", - "url": "https://github.com/dancannon/gorethink.git", - "rev": "e7cac92ea2bc52638791a021f212145acfedb1fc", - "sha256": "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew.git", - "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d", - "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk" - } - }, - { - "goPackagePath": "github.com/docker/engine-api", - "fetch": { - "type": "git", - "url": "https://github.com/docker/engine-api.git", - "rev": "8924d6900370b4c7e7984be5adc61f50a80d7537", - "sha256": "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n" - } - }, - { - "goPackagePath": "github.com/docker/go-connections", - "fetch": { - "type": "git", - "url": "https://github.com/docker/go-connections.git", - "rev": "f549a9393d05688dff0992ef3efd8bbe6c628aeb", - "sha256": "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg" - } - }, - { - "goPackagePath": "github.com/docker/go-units", - "fetch": { - "type": "git", - "url": "https://github.com/docker/go-units.git", - "rev": "5d2041e26a699eaca682e2ea41c8f891e1060444", - "sha256": "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i" - } - }, - { - "goPackagePath": "github.com/eapache/go-resiliency", - "fetch": { - "type": "git", - "url": "https://github.com/eapache/go-resiliency.git", - "rev": "b86b1ec0dd4209a588dc1285cdd471e73525c0b3", - "sha256": "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21" - } - }, - { - "goPackagePath": "github.com/eapache/queue", - "fetch": { - "type": "git", - "url": "https://github.com/eapache/queue.git", - "rev": "ded5959c0d4e360646dc9e9908cff48666781367", - "sha256": "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n" - } - }, - { - "goPackagePath": "github.com/eclipse/paho.mqtt.golang", - "fetch": { - "type": "git", - "url": "https://github.com/eclipse/paho.mqtt.golang.git", - "rev": "0f7a459f04f13a41b7ed752d47944528d4bf9a86", - "sha256": "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh" - } - }, - { - "goPackagePath": "github.com/go-sql-driver/mysql", - "fetch": { - "type": "git", - "url": "https://github.com/go-sql-driver/mysql.git", - "rev": "1fca743146605a172a266e1654e01e5cd5669bee", - "sha256": "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38" - } - }, - { - "goPackagePath": "github.com/gobwas/glob", - "fetch": { - "type": "git", - "url": "https://github.com/gobwas/glob.git", - "rev": "49571a1557cd20e6a2410adc6421f85b66c730b5", - "sha256": "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf.git", - "rev": "552c7b9542c194800fd493123b3798ef0a832032", - "sha256": "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy.git", - "rev": "427fb6fc07997f43afa32f35e850833760e489a7", - "sha256": "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b" - } - }, - { - "goPackagePath": "github.com/gonuts/go-shellquote", - "fetch": { - "type": "git", - "url": "https://github.com/gonuts/go-shellquote.git", - "rev": "e842a11b24c6abfb3dd27af69a17f482e4b483c2", - "sha256": "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg" - } - }, - { - "goPackagePath": "github.com/gorilla/context", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/context.git", - "rev": "1ea25387ff6f684839d82767c1733ff4d4d15d0a", - "sha256": "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4" - } - }, - { - "goPackagePath": "github.com/gorilla/mux", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/mux.git", - "rev": "c9e326e2bdec29039a3761c07bece13133863e1e", - "sha256": "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6" - } - }, - { - "goPackagePath": "github.com/hailocab/go-hostpool", - "fetch": { - "type": "git", - "url": "https://github.com/hailocab/go-hostpool.git", - "rev": "e80d13ce29ede4452c43dea11e79b9bc8a15b478", - "sha256": "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny" - } - }, - { - "goPackagePath": "github.com/hashicorp/consul", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/consul.git", - "rev": "5aa90455ce78d4d41578bafc86305e6e6b28d7d2", - "sha256": "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw" - } - }, - { - "goPackagePath": "github.com/hpcloud/tail", - "fetch": { - "type": "git", - "url": "https://github.com/hpcloud/tail.git", - "rev": "b2940955ab8b26e19d43a43c4da0475dd81bdb56", - "sha256": "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s" - } - }, - { - "goPackagePath": "github.com/influxdata/config", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/config.git", - "rev": "b79f6829346b8d6e78ba73544b1e1038f1f1c9da", - "sha256": "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z" - } - }, - { - "goPackagePath": "github.com/influxdata/influxdb", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/influxdb.git", - "rev": "e094138084855d444195b252314dfee9eae34cab", - "sha256": "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla" - } - }, - { - "goPackagePath": "github.com/influxdata/toml", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/toml.git", - "rev": "af4df43894b16e3fd2b788d01bd27ad0776ef2d0", - "sha256": "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext.git", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/kardianos/service", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/service.git", - "rev": "5e335590050d6d00f3aa270217d288dda1c94d0a", - "sha256": "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h" - } - }, - { - "goPackagePath": "github.com/klauspost/crc32", - "fetch": { - "type": "git", - "url": "https://github.com/klauspost/crc32.git", - "rev": "19b0b332c9e4516a6370a0456e6182c3b5036720", - "sha256": "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r" - } - }, - { - "goPackagePath": "github.com/lib/pq", - "fetch": { - "type": "git", - "url": "https://github.com/lib/pq.git", - "rev": "e182dc4027e2ded4b19396d638610f2653295f36", - "sha256": "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions.git", - "rev": "d0c3fe89de86839aecf2e0579c40ba3bb336a453", - "sha256": "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns.git", - "rev": "cce6c130cdb92c752850880fd285bea1d64439dd", - "sha256": "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-snappystream", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-snappystream.git", - "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504", - "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6" - } - }, - { - "goPackagePath": "github.com/naoina/go-stringutil", - "fetch": { - "type": "git", - "url": "https://github.com/naoina/go-stringutil.git", - "rev": "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b", - "sha256": "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6" - } - }, - { - "goPackagePath": "github.com/nats-io/nats", - "fetch": { - "type": "git", - "url": "https://github.com/nats-io/nats.git", - "rev": "b13fc9d12b0b123ebc374e6b808c6228ae4234a3", - "sha256": "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i" - } - }, - { - "goPackagePath": "github.com/nats-io/nuid", - "fetch": { - "type": "git", - "url": "https://github.com/nats-io/nuid.git", - "rev": "4f84f5f3b2786224e336af2e13dba0a0a80b76fa", - "sha256": "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y" - } - }, - { - "goPackagePath": "github.com/nsqio/go-nsq", - "fetch": { - "type": "git", - "url": "https://github.com/nsqio/go-nsq.git", - "rev": "0b80d6f05e15ca1930e0c5e1d540ed627e299980", - "sha256": "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr" - } - }, - { - "goPackagePath": "github.com/opencontainers/runc", - "fetch": { - "type": "git", - "url": "https://github.com/opencontainers/runc.git", - "rev": "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8", - "sha256": "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang.git", - "rev": "18acf9993a863f4c4b40612e19cdd243e7c86831", - "sha256": "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model.git", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common.git", - "rev": "e8eabff8812b05acf522b45fdcd725a785188e37", - "sha256": "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs.git", - "rev": "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8", - "sha256": "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper.git", - "rev": "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f", - "sha256": "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2" - } - }, - { - "goPackagePath": "github.com/shirou/gopsutil", - "fetch": { - "type": "git", - "url": "https://github.com/shirou/gopsutil.git", - "rev": "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08", - "sha256": "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni" - } - }, - { - "goPackagePath": "github.com/soniah/gosnmp", - "fetch": { - "type": "git", - "url": "https://github.com/soniah/gosnmp.git", - "rev": "eb32571c2410868d85849ad67d1e51d01273eb84", - "sha256": "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6" - } - }, - { - "goPackagePath": "github.com/sparrc/aerospike-client-go", - "fetch": { - "type": "git", - "url": "https://github.com/sparrc/aerospike-client-go.git", - "rev": "d4bb42d2c2d39dae68e054116f4538af189e05d5", - "sha256": "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz" - } - }, - { - "goPackagePath": "github.com/streadway/amqp", - "fetch": { - "type": "git", - "url": "https://github.com/streadway/amqp.git", - "rev": "b4f3ceab0337f013208d31348b578d83c0064744", - "sha256": "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp" - } - }, - { - "goPackagePath": "github.com/stretchr/testify", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/testify.git", - "rev": "1f4a1643a57e798696635ea4c126e9127adb7d3c", - "sha256": "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl" - } - }, - { - "goPackagePath": "github.com/vjeantet/grok", - "fetch": { - "type": "git", - "url": "https://github.com/vjeantet/grok.git", - "rev": "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2", - "sha256": "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80" - } - }, - { - "goPackagePath": "github.com/wvanbergen/kafka", - "fetch": { - "type": "git", - "url": "https://github.com/wvanbergen/kafka.git", - "rev": "46f9a1cf3f670edec492029fadded9c2d9e18866", - "sha256": "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694" - } - }, - { - "goPackagePath": "github.com/wvanbergen/kazoo-go", - "fetch": { - "type": "git", - "url": "https://github.com/wvanbergen/kazoo-go.git", - "rev": "0f768712ae6f76454f987c3356177e138df258f8", - "sha256": "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16" - } - }, - { - "goPackagePath": "github.com/yuin/gopher-lua", - "fetch": { - "type": "git", - "url": "https://github.com/yuin/gopher-lua.git", - "rev": "bf3808abd44b1e55143a2d7f08571aaa80db1808", - "sha256": "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm" - } - }, - { - "goPackagePath": "github.com/zensqlmonitor/go-mssqldb", - "fetch": { - "type": "git", - "url": "https://github.com/zensqlmonitor/go-mssqldb.git", - "rev": "ffe5510c6fa5e15e6d983210ab501c815b56b363", - "sha256": "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://github.com/golang/crypto.git", - "rev": "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3", - "sha256": "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://github.com/golang/net.git", - "rev": "6acef71eb69611914f7a30939ea9f6e194c78172", - "sha256": "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://github.com/golang/text.git", - "rev": "a71fd10341b064c10f4a81ceac72bcf70f26ea34", - "sha256": "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1" - } - }, - { - "goPackagePath": "gopkg.in/dancannon/gorethink.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/dancannon/gorethink.v1.git", - "rev": "7d1af5be49cb5ecc7b177bf387d232050299d6ef", - "sha256": "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi" - } - }, - { - "goPackagePath": "gopkg.in/fatih/pool.v2", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/pool.git", - "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", - "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" - } - }, - { - "goPackagePath": "gopkg.in/mgo.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/mgo.v2.git", - "rev": "d90005c5262a3463800497ea5a89aed5fe22c886", - "sha256": "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2.git", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.0.0.nix new file mode 100644 index 00000000000..177f346d012 --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/deps-1.0.0.nix @@ -0,0 +1,587 @@ +[ + { + fetch = { + rev = "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9"; + sha256 = "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv"; + type = "git"; + url = "https://github.com/Shopify/sarama.git"; + }; + goPackagePath = "github.com/Shopify/sarama"; + } + { + fetch = { + rev = "219c8cb75c258c552e999735be6df753ffc7afdc"; + sha256 = "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6"; + type = "git"; + url = "https://github.com/Sirupsen/logrus.git"; + }; + goPackagePath = "github.com/Sirupsen/logrus"; + } + { + fetch = { + rev = "45863b7fd8640dc12f7fdd397104d97e1986f25a"; + sha256 = "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw"; + type = "git"; + url = "https://github.com/aerospike/aerospike-client-go.git"; + }; + goPackagePath = "github.com/aerospike/aerospike-client-go"; + } + { + fetch = { + rev = "53c1b967405155bfc8758557863bf2e14f814687"; + sha256 = "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4"; + type = "git"; + url = "https://github.com/amir/raidman.git"; + }; + goPackagePath = "github.com/amir/raidman"; + } + { + fetch = { + rev = "13a12060f716145019378a10e2806c174356b857"; + sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; + type = "git"; + url = "https://github.com/aws/aws-sdk-go.git"; + }; + goPackagePath = "github.com/aws/aws-sdk-go"; + } + { + fetch = { + rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; + sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + type = "git"; + url = "https://github.com/beorn7/perks.git"; + }; + goPackagePath = "github.com/beorn7/perks"; + } + { + fetch = { + rev = "4dc77674aceaabba2c7e3da25d4c823edfb73f99"; + sha256 = "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w"; + type = "git"; + url = "https://github.com/cenkalti/backoff.git"; + }; + goPackagePath = "github.com/cenkalti/backoff"; + } + { + fetch = { + rev = "cb664315a324d87d19c879d9cc67fda6be8c2ac1"; + sha256 = "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr"; + type = "git"; + url = "https://github.com/couchbase/go-couchbase.git"; + }; + goPackagePath = "github.com/couchbase/go-couchbase"; + } + { + fetch = { + rev = "a5ea6356f648fec6ab89add00edd09151455b4b2"; + sha256 = "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi"; + type = "git"; + url = "https://github.com/couchbase/gomemcached.git"; + }; + goPackagePath = "github.com/couchbase/gomemcached"; + } + { + fetch = { + rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6"; + sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c"; + type = "git"; + url = "https://github.com/couchbase/goutils.git"; + }; + goPackagePath = "github.com/couchbase/goutils"; + } + { + fetch = { + rev = "e7cac92ea2bc52638791a021f212145acfedb1fc"; + sha256 = "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g"; + type = "git"; + url = "https://github.com/dancannon/gorethink.git"; + }; + goPackagePath = "github.com/dancannon/gorethink"; + } + { + fetch = { + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + type = "git"; + url = "https://github.com/davecgh/go-spew.git"; + }; + goPackagePath = "github.com/davecgh/go-spew"; + } + { + fetch = { + rev = "8924d6900370b4c7e7984be5adc61f50a80d7537"; + sha256 = "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n"; + type = "git"; + url = "https://github.com/docker/engine-api.git"; + }; + goPackagePath = "github.com/docker/engine-api"; + } + { + fetch = { + rev = "f549a9393d05688dff0992ef3efd8bbe6c628aeb"; + sha256 = "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg"; + type = "git"; + url = "https://github.com/docker/go-connections.git"; + }; + goPackagePath = "github.com/docker/go-connections"; + } + { + fetch = { + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + type = "git"; + url = "https://github.com/docker/go-units.git"; + }; + goPackagePath = "github.com/docker/go-units"; + } + { + fetch = { + rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; + sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; + type = "git"; + url = "https://github.com/eapache/go-resiliency.git"; + }; + goPackagePath = "github.com/eapache/go-resiliency"; + } + { + fetch = { + rev = "ded5959c0d4e360646dc9e9908cff48666781367"; + sha256 = "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n"; + type = "git"; + url = "https://github.com/eapache/queue.git"; + }; + goPackagePath = "github.com/eapache/queue"; + } + { + fetch = { + rev = "0f7a459f04f13a41b7ed752d47944528d4bf9a86"; + sha256 = "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh"; + type = "git"; + url = "https://github.com/eclipse/paho.mqtt.golang.git"; + }; + goPackagePath = "github.com/eclipse/paho.mqtt.golang"; + } + { + fetch = { + rev = "1fca743146605a172a266e1654e01e5cd5669bee"; + sha256 = "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38"; + type = "git"; + url = "https://github.com/go-sql-driver/mysql.git"; + }; + goPackagePath = "github.com/go-sql-driver/mysql"; + } + { + fetch = { + rev = "49571a1557cd20e6a2410adc6421f85b66c730b5"; + sha256 = "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk"; + type = "git"; + url = "https://github.com/gobwas/glob.git"; + }; + goPackagePath = "github.com/gobwas/glob"; + } + { + fetch = { + rev = "552c7b9542c194800fd493123b3798ef0a832032"; + sha256 = "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm"; + type = "git"; + url = "https://github.com/golang/protobuf.git"; + }; + goPackagePath = "github.com/golang/protobuf"; + } + { + fetch = { + rev = "427fb6fc07997f43afa32f35e850833760e489a7"; + sha256 = "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b"; + type = "git"; + url = "https://github.com/golang/snappy.git"; + }; + goPackagePath = "github.com/golang/snappy"; + } + { + fetch = { + rev = "e842a11b24c6abfb3dd27af69a17f482e4b483c2"; + sha256 = "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg"; + type = "git"; + url = "https://github.com/gonuts/go-shellquote.git"; + }; + goPackagePath = "github.com/gonuts/go-shellquote"; + } + { + fetch = { + rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; + sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; + type = "git"; + url = "https://github.com/gorilla/context.git"; + }; + goPackagePath = "github.com/gorilla/context"; + } + { + fetch = { + rev = "c9e326e2bdec29039a3761c07bece13133863e1e"; + sha256 = "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6"; + type = "git"; + url = "https://github.com/gorilla/mux.git"; + }; + goPackagePath = "github.com/gorilla/mux"; + } + { + fetch = { + rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; + sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; + type = "git"; + url = "https://github.com/hailocab/go-hostpool.git"; + }; + goPackagePath = "github.com/hailocab/go-hostpool"; + } + { + fetch = { + rev = "5aa90455ce78d4d41578bafc86305e6e6b28d7d2"; + sha256 = "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw"; + type = "git"; + url = "https://github.com/hashicorp/consul.git"; + }; + goPackagePath = "github.com/hashicorp/consul"; + } + { + fetch = { + rev = "b2940955ab8b26e19d43a43c4da0475dd81bdb56"; + sha256 = "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s"; + type = "git"; + url = "https://github.com/hpcloud/tail.git"; + }; + goPackagePath = "github.com/hpcloud/tail"; + } + { + fetch = { + rev = "b79f6829346b8d6e78ba73544b1e1038f1f1c9da"; + sha256 = "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z"; + type = "git"; + url = "https://github.com/influxdata/config.git"; + }; + goPackagePath = "github.com/influxdata/config"; + } + { + fetch = { + rev = "e094138084855d444195b252314dfee9eae34cab"; + sha256 = "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla"; + type = "git"; + url = "https://github.com/influxdata/influxdb.git"; + }; + goPackagePath = "github.com/influxdata/influxdb"; + } + { + fetch = { + rev = "af4df43894b16e3fd2b788d01bd27ad0776ef2d0"; + sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4"; + type = "git"; + url = "https://github.com/influxdata/toml.git"; + }; + goPackagePath = "github.com/influxdata/toml"; + } + { + fetch = { + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + type = "git"; + url = "https://github.com/kardianos/osext.git"; + }; + goPackagePath = "github.com/kardianos/osext"; + } + { + fetch = { + rev = "5e335590050d6d00f3aa270217d288dda1c94d0a"; + sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h"; + type = "git"; + url = "https://github.com/kardianos/service.git"; + }; + goPackagePath = "github.com/kardianos/service"; + } + { + fetch = { + rev = "19b0b332c9e4516a6370a0456e6182c3b5036720"; + sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"; + type = "git"; + url = "https://github.com/klauspost/crc32.git"; + }; + goPackagePath = "github.com/klauspost/crc32"; + } + { + fetch = { + rev = "e182dc4027e2ded4b19396d638610f2653295f36"; + sha256 = "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj"; + type = "git"; + url = "https://github.com/lib/pq.git"; + }; + goPackagePath = "github.com/lib/pq"; + } + { + fetch = { + rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; + sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions.git"; + }; + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + } + { + fetch = { + rev = "cce6c130cdb92c752850880fd285bea1d64439dd"; + sha256 = "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx"; + type = "git"; + url = "https://github.com/miekg/dns.git"; + }; + goPackagePath = "github.com/miekg/dns"; + } + { + fetch = { + rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + type = "git"; + url = "https://github.com/mreiferson/go-snappystream.git"; + }; + goPackagePath = "github.com/mreiferson/go-snappystream"; + } + { + fetch = { + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + type = "git"; + url = "https://github.com/naoina/go-stringutil.git"; + }; + goPackagePath = "github.com/naoina/go-stringutil"; + } + { + fetch = { + rev = "b13fc9d12b0b123ebc374e6b808c6228ae4234a3"; + sha256 = "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i"; + type = "git"; + url = "https://github.com/nats-io/nats.git"; + }; + goPackagePath = "github.com/nats-io/nats"; + } + { + fetch = { + rev = "4f84f5f3b2786224e336af2e13dba0a0a80b76fa"; + sha256 = "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y"; + type = "git"; + url = "https://github.com/nats-io/nuid.git"; + }; + goPackagePath = "github.com/nats-io/nuid"; + } + { + fetch = { + rev = "0b80d6f05e15ca1930e0c5e1d540ed627e299980"; + sha256 = "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr"; + type = "git"; + url = "https://github.com/nsqio/go-nsq.git"; + }; + goPackagePath = "github.com/nsqio/go-nsq"; + } + { + fetch = { + rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; + sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; + type = "git"; + url = "https://github.com/opencontainers/runc.git"; + }; + goPackagePath = "github.com/opencontainers/runc"; + } + { + fetch = { + rev = "18acf9993a863f4c4b40612e19cdd243e7c86831"; + sha256 = "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv"; + type = "git"; + url = "https://github.com/prometheus/client_golang.git"; + }; + goPackagePath = "github.com/prometheus/client_golang"; + } + { + fetch = { + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + type = "git"; + url = "https://github.com/prometheus/client_model.git"; + }; + goPackagePath = "github.com/prometheus/client_model"; + } + { + fetch = { + rev = "e8eabff8812b05acf522b45fdcd725a785188e37"; + sha256 = "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq"; + type = "git"; + url = "https://github.com/prometheus/common.git"; + }; + goPackagePath = "github.com/prometheus/common"; + } + { + fetch = { + rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; + sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + type = "git"; + url = "https://github.com/prometheus/procfs.git"; + }; + goPackagePath = "github.com/prometheus/procfs"; + } + { + fetch = { + rev = "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f"; + sha256 = "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2"; + type = "git"; + url = "https://github.com/samuel/go-zookeeper.git"; + }; + goPackagePath = "github.com/samuel/go-zookeeper"; + } + { + fetch = { + rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; + sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + type = "git"; + url = "https://github.com/shirou/gopsutil.git"; + }; + goPackagePath = "github.com/shirou/gopsutil"; + } + { + fetch = { + rev = "eb32571c2410868d85849ad67d1e51d01273eb84"; + sha256 = "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6"; + type = "git"; + url = "https://github.com/soniah/gosnmp.git"; + }; + goPackagePath = "github.com/soniah/gosnmp"; + } + { + fetch = { + rev = "d4bb42d2c2d39dae68e054116f4538af189e05d5"; + sha256 = "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz"; + type = "git"; + url = "https://github.com/sparrc/aerospike-client-go.git"; + }; + goPackagePath = "github.com/sparrc/aerospike-client-go"; + } + { + fetch = { + rev = "b4f3ceab0337f013208d31348b578d83c0064744"; + sha256 = "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp"; + type = "git"; + url = "https://github.com/streadway/amqp.git"; + }; + goPackagePath = "github.com/streadway/amqp"; + } + { + fetch = { + rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; + sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; + type = "git"; + url = "https://github.com/stretchr/testify.git"; + }; + goPackagePath = "github.com/stretchr/testify"; + } + { + fetch = { + rev = "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2"; + sha256 = "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80"; + type = "git"; + url = "https://github.com/vjeantet/grok.git"; + }; + goPackagePath = "github.com/vjeantet/grok"; + } + { + fetch = { + rev = "46f9a1cf3f670edec492029fadded9c2d9e18866"; + sha256 = "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694"; + type = "git"; + url = "https://github.com/wvanbergen/kafka.git"; + }; + goPackagePath = "github.com/wvanbergen/kafka"; + } + { + fetch = { + rev = "0f768712ae6f76454f987c3356177e138df258f8"; + sha256 = "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16"; + type = "git"; + url = "https://github.com/wvanbergen/kazoo-go.git"; + }; + goPackagePath = "github.com/wvanbergen/kazoo-go"; + } + { + fetch = { + rev = "bf3808abd44b1e55143a2d7f08571aaa80db1808"; + sha256 = "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm"; + type = "git"; + url = "https://github.com/yuin/gopher-lua.git"; + }; + goPackagePath = "github.com/yuin/gopher-lua"; + } + { + fetch = { + rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363"; + sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl"; + type = "git"; + url = "https://github.com/zensqlmonitor/go-mssqldb.git"; + }; + goPackagePath = "github.com/zensqlmonitor/go-mssqldb"; + } + { + fetch = { + rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; + sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; + type = "git"; + url = "https://github.com/golang/crypto.git"; + }; + goPackagePath = "golang.org/x/crypto"; + } + { + fetch = { + rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; + sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; + type = "git"; + url = "https://github.com/golang/net.git"; + }; + goPackagePath = "golang.org/x/net"; + } + { + fetch = { + rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; + sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; + type = "git"; + url = "https://github.com/golang/text.git"; + }; + goPackagePath = "golang.org/x/text"; + } + { + fetch = { + rev = "7d1af5be49cb5ecc7b177bf387d232050299d6ef"; + sha256 = "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi"; + type = "git"; + url = "https://gopkg.in/dancannon/gorethink.v1.git"; + }; + goPackagePath = "gopkg.in/dancannon/gorethink.v1"; + } + { + fetch = { + rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; + sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; + type = "git"; + url = "https://github.com/fatih/pool.git"; + }; + goPackagePath = "gopkg.in/fatih/pool.v2"; + } + { + fetch = { + rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; + sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; + type = "git"; + url = "https://gopkg.in/mgo.v2.git"; + }; + goPackagePath = "gopkg.in/mgo.v2"; + } + { + fetch = { + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + type = "git"; + url = "https://gopkg.in/yaml.v2.git"; + }; + goPackagePath = "gopkg.in/yaml.v2"; + } +] From 9d83af68d840fd37563f25613c43e3d6899bc030 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 16 Sep 2016 10:39:31 +0200 Subject: [PATCH 203/234] pythonPackages.mathics: Fix install This fixes the broken test nixos/tests/mathics.nix --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40f17c88b0a..3bbf8a0e0e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13164,6 +13164,11 @@ in modules // { substituteInPlace setup.py --replace "sympy==0.7.6" "sympy" ''; + postFixup = '' + wrapPythonProgramsIn $out/bin $out + patchPythonScript $out/${python.sitePackages}/mathics/manage.py + ''; + propagatedBuildInputs = with self; [ cython sympy From ccd7d204e10e4efc0606efb25df0242776413480 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 16 Sep 2016 10:55:50 +0200 Subject: [PATCH 204/234] x42-plugins: Fix unpacking and formatting For some reason, adding `xz` to `buildInputs` caused `unpackPhase` to fail. --- .../audio/x42-plugins/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 9ca78ee1a3f..2c3d4b91f25 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, libjack2, mesa_glu, pkgconfig -, libltc, libsndfile, libsamplerate, xz -, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: +{ stdenv, fetchurl, pkgconfig, fetchgit +, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 +, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { version = "20160619"; @@ -11,15 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9"; }; - buildInputs = [ xz mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + buildInputs = [ + mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate + lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver + ]; - makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" ]; + makeFlags = [ + "PREFIX=$(out)" + "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" + "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" + ]; - meta = with stdenv.lib; - { description = "Collection of LV2 plugins by Robin Gareus"; - homepage = https://github.com/x42/x42-plugins; - maintainers = with maintainers; [ magnetophon ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Collection of LV2 plugins by Robin Gareus"; + homepage = https://github.com/x42/x42-plugins; + maintainers = with maintainers; [ magnetophon ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; } From c7e8ca2ce56a1d53936f7a709bbbb33f90bbfd26 Mon Sep 17 00:00:00 2001 From: Zero King Date: Fri, 16 Sep 2016 09:11:22 +0000 Subject: [PATCH 205/234] hping: broken on darwin --- pkgs/tools/networking/hping/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 23322d5b8f2..4b14c9db963 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -40,10 +40,11 @@ stdenv.mkDerivation rec { ln -vs hping3.8.gz "$out/share/man/man8/hping2.8.gz" ''; - meta = { + meta = with stdenv.lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; homepage = "http://www.hping.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + platforms = platforms.all; + broken = stdenv.isDarwin; }; } From 77a67189eff70284644541149c3ee342ab82835d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 16 Sep 2016 11:12:19 +0200 Subject: [PATCH 206/234] lttng-modules: broken on chromiumos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3f4d94a4c2d422836c07ed1206b454cd7b681f01) Signed-off-by: Domen Kožar --- pkgs/os-specific/linux/lttng-modules/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 10551c08077..083362489ad 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.bjornfor ]; broken = (builtins.compareVersions kernel.version "3.18" == -1) || - (kernel.features.grsecurity or false); + (kernel.features.grsecurity or false) || + (kernel.features.chromiumos or false); }; } From 2050f12f4ef473a009f8939befdbab87c9781959 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 16 Sep 2016 11:09:55 +0200 Subject: [PATCH 207/234] linux_4_7: 4.7.3 -> 4.7.4 --- pkgs/os-specific/linux/kernel/linux-4.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix index ff47e1758c7..54b4469a608 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.3"; + version = "4.7.4"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc"; + sha256 = "1zc9lwa9anyn0civwzkymaxgx7v4vwgc6aqsg390qslbazkggaa6"; }; kernelPatches = args.kernelPatches; From d082a7c0fd04ed1f3e44323450112041b45495de Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 16 Sep 2016 11:10:47 +0200 Subject: [PATCH 208/234] grsecurity: 4.7.3-201609072139 -> 4.7.4-201609152234 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index ff47e1758c7..54b4469a608 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.3"; + version = "4.7.4"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc"; + sha256 = "1zc9lwa9anyn0civwzkymaxgx7v4vwgc6aqsg390qslbazkggaa6"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 53e7196c5c3..47057215ce2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -100,9 +100,9 @@ rec { grsecurity_4_4 = throw "grsecurity stable is no longer supported"; grsecurity_testing = grsecPatch - { kver = "4.7.3"; - grrev = "201609072139"; - sha256 = "0c70nfsa1bk07z6sivy645d9w0qkq23pwpwdm28160kfy7dampyh"; + { kver = "4.7.4"; + grrev = "201609152234"; + sha256 = "0314lb1dp5bnq3wibxc63a8z75q0b7w6zsgd6ccmhl9vwv7sm253"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From f0e519d26a7cdab6d3f2c2e658658a6dd88e0ca2 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 16 Sep 2016 13:15:50 +0200 Subject: [PATCH 209/234] linux_mptcp: fix config options broken by b4a4a63cc4ed8ebd8c1fbbfb3b89a408e907045a --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index b39514d45dd..52a52562d60 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -29,12 +29,12 @@ import ./generic.nix (args // rec { # ... but use none by default. # The default is safer if source policy routing is not setup. DEFAULT_DUMMY y - DEFAULT_MPTCP_PM "default" + DEFAULT_MPTCP_PM default # MPTCP scheduler selection. # Disabled as the only non-default is the useless round-robin. MPTCP_SCHED_ADVANCED n - DEFAULT_MPTCP_SCHED "default" + DEFAULT_MPTCP_SCHED default # Smarter TCP congestion controllers TCP_CONG_LIA m From 0201869418906c7cc8e2643bf876feb3ba27f4ab Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 16 Sep 2016 15:10:18 +0200 Subject: [PATCH 210/234] prometheus.nodeExporter module: improve after feedback cc @teh @groxxda @fpletz --- nixos/modules/services/monitoring/prometheus/node-exporter.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index 02aedb53564..52dc14effc4 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -48,13 +48,10 @@ in { }; config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = [ cfg.port ]; - systemd.services.prometheus-node-exporter = { description = "Prometheus exporter for machine metrics"; unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; script = '' exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ ${optionalString (cfg.enabledCollectors != []) From e85e51d41f0f3be40490b0de9a76f20f3685659c Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 16 Sep 2016 15:36:31 +0200 Subject: [PATCH 211/234] nixos/pam: Fix wrong string concatenation Regression introduced by 1010271c63f503113c0e8337977610ea783880ec. This caused the line after using the loginuid module to be concatenated with the next line without a newline. In turn this has caused a lot of the NixOS VM tests to either run very slowly (because of constantly hitting PAM errors) or simply fail. I have tested this only with one of the failing NixOS tests. Signed-off-by: aszlig --- nixos/modules/security/pam.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 6a4f6634c4b..f6ca6877022 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -301,11 +301,11 @@ let session required pam_env.so envfile=${config.system.build.pamEnvironment} '' + '' session required pam_unix.so - '' + optionalString cfg.setLoginUid - "session ${ - if config.boot.isContainer then "optional" else "required" - } pam_loginuid.so" - + optionalString cfg.makeHomeDir '' + '' + optionalString cfg.setLoginUid '' + session ${ + if config.boot.isContainer then "optional" else "required" + } pam_loginuid.so + '' + optionalString cfg.makeHomeDir '' session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022 '' + optionalString cfg.updateWtmp '' session required ${pkgs.pam}/lib/security/pam_lastlog.so silent From 7d20f1b5b7956b4d026812660afa5b643591c1b8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 16 Sep 2016 15:57:09 +0200 Subject: [PATCH 212/234] torbrowser: 6.0.4 -> 6.0.5 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 57fcfe717be..900ad39ecb2 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.4"; + version = "6.0.5"; 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 - "14ds39frkg4hbim0icb372crink902f7i6mqj6dmbaiz2fi88y8q" else - "1d2mg46dg5y16h5lwzq0ilv3zk8aqy3vg3j4a5c3wzsxj0hpl4v5"; + "fc917bd702b1275cae3f7fa8036c3c44af9b4f003f3d4a8fbb9f6c0974277ad4" else + "e0c3ce406b6de082692ce3db52b6e04053e205194b26fbf0eee9014be543d98d"; }; desktopItem = makeDesktopItem { From a20c2ce4b8eeb20376d4b88d7a3da68f82ff3212 Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 16 Sep 2016 14:12:39 +0100 Subject: [PATCH 213/234] xfce: install networkmanager applet when networkmanager is enabled --- nixos/modules/services/x11/desktop-managers/xfce.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 634d2a39576..863c657fc85 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -100,6 +100,7 @@ in pkgs.xfce.tumbler # found via dbus ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager + ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ optionals (!cfg.noDesktop) [ pkgs.xfce.xfce4panel pkgs.xfce.xfdesktop From 29caa185a7e4aaa0d621a4f117f3e8f653261fda Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 16 Sep 2016 14:14:44 +0100 Subject: [PATCH 214/234] lightdm: obbey services.xserver.{window/desktop}Manager.default --- nixos/modules/services/x11/display-managers/lightdm.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 47786f0a432..33cd51f37c6 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -46,13 +46,15 @@ let [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.session.script} + ${optionalString (elem defaultSessionName dmcfg.session.names) '' + user-session = ${defaultSessionName} + ''} ${optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} ${optionalString cfg.autoLogin.enable '' autologin-user = ${cfg.autoLogin.user} autologin-user-timeout = ${toString cfg.autoLogin.timeout} - autologin-session = ${defaultSessionName} ''} ${cfg.extraSeatDefaults} ''; From 3cfcd937d34f42c006609439786c8e783dff08eb Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 16 Sep 2016 14:54:11 +0100 Subject: [PATCH 215/234] ligthdm: 1.18.1 -> 1.19.4 Required applying patch from https://bugs.gentoo.org/show_bug.cgi?id=588764 to lightdm_gtk_greeter --- .../display-managers/lightdm-gtk-greeter/default.nix | 8 ++++++++ pkgs/applications/display-managers/lightdm/default.nix | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index ea80957afb0..235d4d16a40 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j"; }; + patches = [ + (fetchurl { + name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch"; + url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616"; + sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv"; + }) + ]; + buildInputs = [ pkgconfig lightdm intltool makeWrapper ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index c33d06e7822..e788585a0a9 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -5,15 +5,15 @@ }: let - ver_branch = "1.18"; - version = "1.18.1"; + ver_branch = "1.19"; + version = "1.19.4"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "1yl9zhn9l83bj5mbifkxfw15nqgsjzzhqcrgb81fr290wijqaj45"; + sha256 = "1l105y07wkl9dj0cjhbs8qh6flpkyfj97wkw0rdd3n624lknvbqf"; }; patches = [ ./fix-paths.patch ]; From d6f20348f3f7f2f10e9b08551c908ac72146bf48 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Fri, 16 Sep 2016 17:40:19 +0300 Subject: [PATCH 216/234] mlterm: 3.3.8 -> 3.7.2 (#18645) --- pkgs/applications/misc/mlterm/default.nix | 31 +++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index d9b03fd86e1..6d84ef42296 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -1,38 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, libX11, gdk_pixbuf, cairo, libXft, gtk2, fribidi }: +{ stdenv, fetchurl, pkgconfig, autoconf +, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte, fribidi, libssh2 +}: stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.3.8"; + version = "3.7.2"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i"; + sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8"; }; - buildInputs = [ pkgconfig libX11 gdk_pixbuf cairo libXft gtk2 fribidi ]; + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ + libX11 gdk_pixbuf.dev cairo libXft gtk3 vte fribidi libssh2 + ]; preConfigure = '' sed -ie 's#-L/usr/local/lib -R/usr/local/lib##g' \ xwindow/libtype/Makefile.in \ main/Makefile.in \ - java/Makefile.in \ + tool/mlfc/Makefile.in \ tool/mlimgloader/Makefile.in \ - tool/registobmp/Makefile.in \ - tool/mlconfig/Makefile.in - sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' tool/mlconfig/po/Makefile.in.in + tool/mlconfig/Makefile.in \ + xwindow/libotl/Makefile.in + sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \ + tool/mlconfig/po/Makefile.in.in ''; configureFlags = [ + "--with-x=yes" + "--with-gtk=3.0" "--with-imagelib=gdk-pixbuf" + "--with-gui=xlib" "--with-type-engines=cairo,xft,xcore" - "--with-x" "--enable-ind" + "--enable-fribidi" + "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" + "--disable-utmp" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mlterm/; license = licenses.bsd2; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = with platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b77bcb54f7a..a008a119e76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15603,7 +15603,9 @@ in xterm = callPackage ../applications/misc/xterm { }; - mlterm = callPackage ../applications/misc/mlterm { }; + mlterm = callPackage ../applications/misc/mlterm { + vte = gnome3.vte_290; + }; finalterm = callPackage ../applications/misc/finalterm { }; From c187f2f903913ace979915d5a67f0abd7aa95d3f Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Fri, 16 Sep 2016 16:42:44 +0200 Subject: [PATCH 217/234] graylog: 2.1.0 -> 2.1.1 (#18663) --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 5a007a0ac72..829c524113b 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.1.0"; + version = "2.1.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "09rcgjxnv235a9rvyfcfdjvmr3rjb0jg5sph8sqvzgspvas9pgvn"; + sha256 = "0p7vx6b4k6lzxi0v9x44wbrvplw93288lpixpwckc0xx0r7js07z"; }; dontBuild = true; From ceed162b1d343494163f93165a92da1d4ca6a4f7 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 16 Sep 2016 11:10:45 -0400 Subject: [PATCH 218/234] freetts: add jdk buildInput (#18282) --- pkgs/development/libraries/freetts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index 91d2c84252f..8c6f60b9801 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib}: +{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib, jdk}: stdenv.mkDerivation { name = "freetts-1.2.2"; @@ -6,11 +6,11 @@ stdenv.mkDerivation { url = mirror://sourceforge/freetts/freetts-1.2.2-src.zip; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; - buildInputs = [ apacheAnt unzip sharutils ]; + buildInputs = [ apacheAnt unzip sharutils jdk ]; unpackPhase = '' unzip $src -x META-INF/* ''; - + buildPhase = '' cd */lib sed -i -e "s/more/cat/" jsapi.sh @@ -23,7 +23,7 @@ stdenv.mkDerivation { install -v -m755 -d $out/{lib,docs/{audio,images}} install -v -m644 lib/*.jar $out/lib ''; - + meta = { description = "Text to speech system based on Festival written in Java"; longDescription = '' From dc364e8b18484eb2d2782ac92c92a2b7ecadc735 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 16 Sep 2016 16:59:43 +0200 Subject: [PATCH 219/234] nixos/xfce: Fix reference to Gtk 2 Regression introduced by bccd75094fd5108b3d834ad3a86e056eed3b0337. The mentioned commit removed the pkgs.gtk attribute, but forgot to change this within the xfce module. Tested using the xfce NixOS test and it has passed on my machine. Signed-off-by: aszlig --- nixos/modules/services/x11/desktop-managers/xfce.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 863c657fc85..51d7d905d58 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -69,7 +69,7 @@ in services.xserver.updateDbusEnvironment = true; environment.systemPackages = - [ pkgs.gtk # To get GTK+'s themes. + [ pkgs.gtk2 # To get GTK+'s themes. pkgs.hicolor_icon_theme pkgs.tango-icon-theme pkgs.shared_mime_info From a0b643ed06e956080c6acc91b4c209a195b8a18a Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 16 Sep 2016 17:57:32 +0200 Subject: [PATCH 220/234] linux-testing: 4.8-rc4 -> 4.8-rc6 Built successfully on my machine, no runtime tests performed. Signed-off-by: aszlig Verified-with-PGP: ABAF 11C6 5A29 70B1 30AB E3C4 79BE 3E43 0041 1886 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7b4284028ed..6b13b45d1ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8-rc4"; - modDirVersion = "4.8.0-rc4"; + version = "4.8-rc6"; + modDirVersion = "4.8.0-rc6"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0is4pzmci1i59fxw9b645c8710zjnx19dfl20m4k06kxdbbs01wg"; + sha256 = "122qn2r3q85xqcb56lgpkiv06yrd5w742fcdjk1sribqcvl1xlqr"; }; features.iwlwifi = true; From 1c9ac8aabc3105b14c762459bd14a5d53f691449 Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 13 Sep 2016 18:46:53 +0100 Subject: [PATCH 221/234] grub: add boot.loader.grub.efiInstallAsRemovable Closes #16374 --- .../installer/tools/nixos-generate-config.pl | 5 +- .../modules/system/boot/loader/grub/grub.nix | 48 ++++++++++++++++++- .../system/boot/loader/grub/install-grub.pl | 11 +++-- 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 5e576367eb2..f1874f23977 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -527,8 +527,11 @@ EOF # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; # Define on which hard drive you want to install Grub. - # boot.loader.grub.device = "/dev/sda"; + # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only EOF } diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 61c34cc2f03..e47afd061e2 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -55,7 +55,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels - default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios; + default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) @@ -357,6 +357,44 @@ in ''; }; + efiInstallAsRemovable = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Whether to invoke grub-install with + --removable. + + Unless turn this on, GRUB will install itself somewhere (exactly + where depends on other config variables) in + boot.loader.efi.efiSysMountPoint. If you've set + boot.loader.efi.canTouchEfiVariables *AND* you + are currently booted in UEFI mode, then GRUB will use + efibootmgr to modify the boot order in the NVRAM's + EFI variables of your computer to include this location. If you are + *not* booted in UEFI mode at the time grub is being installed, the + NVRAM will not be modified, and your system will not find GRUB at + boot time. GRUB will still succeed (althgouh you'll see a warning + printed "efibootmgr: EFI variables are not supported on + this system."). + + If you do turn this feature on, then GRUB will install itself + in a specific special location within efiSysMountPoint + (namely EFI/boot/boot$arch.efi) which is the firmwares + are hardcoded to try first, regardless of NVRAM EFI variables. + + To summarize, turn this on if: + + You are installing NixOS and want it to boot in UEFI mode, + but you are currently booted in legacy mode + You want to make a drive that will boot regardless of + the NVRAM state of the computer (like a USB "removable" drive) + You simply dislike the idea of depending on some NVRAM + state to make your drive bootable + + ''; + }; + enableCryptodisk = mkOption { default = false; type = types.bool; @@ -484,6 +522,14 @@ in assertion = !cfg.trustedBoot.enable || cfg.trustedBoot.systemHasTPM == "YES_TPM_is_activated"; message = "Trusted GRUB can break the system! Confirm that the system has an activated TPM by setting 'systemHasTPM'."; } + { + assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport; + message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport"; + } + { + assertion = cfg.efiInstallAsRemovable -> !config.boot.loader.efi.canTouchEfiVariables; + message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn off boot.loader.efi.canTouchEfiVariables"; + } ] ++ flip concatMap cfg.mirroredBoots (args: [ { assertion = args.devices != [ ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 06eece5025f..b93395300b7 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -60,6 +60,7 @@ my $grubTargetEfi = get("grubTargetEfi"); my $bootPath = get("bootPath"); my $storePath = get("storePath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); +my $efiInstallAsRemovable = get("efiInstallAsRemovable"); my $efiSysMountPoint = get("efiSysMountPoint"); my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); @@ -544,13 +545,15 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { # install EFI GRUB if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; + my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint"); if ($canTouchEfiVariables eq "true") { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--bootloader-id=$bootloaderId") == 0 - or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; + push @command, "--bootloader-id=$bootloaderId"; } else { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 - or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; + push @command, "--no-nvram"; + push @command, "--removable" if $efiInstallAsRemovable eq "true"; } + + (system @command) == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } From eda4f5d409360c961010a3666b35cc5d61f64a36 Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 16 Sep 2016 18:09:50 +0100 Subject: [PATCH 222/234] grub: clarify efiInstallAsRemovable docstring --- .../modules/system/boot/loader/grub/grub.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index e47afd061e2..b73eefd39e3 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -365,22 +365,22 @@ in Whether to invoke grub-install with --removable. - Unless turn this on, GRUB will install itself somewhere (exactly - where depends on other config variables) in - boot.loader.efi.efiSysMountPoint. If you've set + Unless you turn this on, GRUB will install itself somewhere in + boot.loader.efi.efiSysMountPoint (exactly where + depends on other config variables). If you've set boot.loader.efi.canTouchEfiVariables *AND* you are currently booted in UEFI mode, then GRUB will use - efibootmgr to modify the boot order in the NVRAM's - EFI variables of your computer to include this location. If you are - *not* booted in UEFI mode at the time grub is being installed, the + efibootmgr to modify the boot order in the + EFI variables of your firmware to include this location. If you are + *not* booted in UEFI mode at the time GRUB is being installed, the NVRAM will not be modified, and your system will not find GRUB at - boot time. GRUB will still succeed (althgouh you'll see a warning - printed "efibootmgr: EFI variables are not supported on - this system."). + boot time. However, GRUB will still return success so you may miss + the warning that gets printed ("efibootmgr: EFI variables + are not supported on this system."). - If you do turn this feature on, then GRUB will install itself - in a specific special location within efiSysMountPoint - (namely EFI/boot/boot$arch.efi) which is the firmwares + If you turn this feature on, GRUB will install itself in a special + location within efiSysMountPoint (namely + EFI/boot/boot$arch.efi) which the firmwares are hardcoded to try first, regardless of NVRAM EFI variables. To summarize, turn this on if: @@ -389,7 +389,7 @@ in but you are currently booted in legacy mode You want to make a drive that will boot regardless of the NVRAM state of the computer (like a USB "removable" drive) - You simply dislike the idea of depending on some NVRAM + You simply dislike the idea of depending on NVRAM state to make your drive bootable ''; From 53fe6fc0bb025aed84d39af3df2c66b4c41f05f5 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Fri, 16 Sep 2016 19:26:17 +0200 Subject: [PATCH 223/234] nodejs-6_x: 6.4.0 -> 6.6.0 --- pkgs/development/web/nodejs/v6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index c0a906aeb71..ad941f80d50 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -8,8 +8,8 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; in import ./nodejs.nix (args // rec { - version = "6.4.0"; - sha256 = "1b3xpp38fd2y8zdkpvkyyvsddh5y4vly81hxkf9hi6wap0nqidj9"; + version = "6.6.0"; + sha256 = "0cqswab9idbz5kzj50fnalg1zrircmbn9qga0cr33lvjnv98a134"; extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin '' From 93974eb98b8b8bab5feae11a1a449c98c2d1a8c8 Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 16 Sep 2016 19:12:35 +0100 Subject: [PATCH 224/234] grub: fix manual build --- .../modules/system/boot/loader/grub/grub.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index b73eefd39e3..e84cdb3212c 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -363,9 +363,9 @@ in type = types.bool; description = '' Whether to invoke grub-install with - --removable. + --removable. - Unless you turn this on, GRUB will install itself somewhere in + Unless you turn this on, GRUB will install itself somewhere in boot.loader.efi.efiSysMountPoint (exactly where depends on other config variables). If you've set boot.loader.efi.canTouchEfiVariables *AND* you @@ -376,21 +376,21 @@ in NVRAM will not be modified, and your system will not find GRUB at boot time. However, GRUB will still return success so you may miss the warning that gets printed ("efibootmgr: EFI variables - are not supported on this system."). + are not supported on this system."). - If you turn this feature on, GRUB will install itself in a special - location within efiSysMountPoint (namely + If you turn this feature on, GRUB will install itself in a + special location within efiSysMountPoint (namely EFI/boot/boot$arch.efi) which the firmwares - are hardcoded to try first, regardless of NVRAM EFI variables. + are hardcoded to try first, regardless of NVRAM EFI variables. - To summarize, turn this on if: + To summarize, turn this on if: - You are installing NixOS and want it to boot in UEFI mode, - but you are currently booted in legacy mode - You want to make a drive that will boot regardless of - the NVRAM state of the computer (like a USB "removable" drive) - You simply dislike the idea of depending on NVRAM - state to make your drive bootable + You are installing NixOS and want it to boot in UEFI mode, + but you are currently booted in legacy mode + You want to make a drive that will boot regardless of + the NVRAM state of the computer (like a USB "removable" drive) + You simply dislike the idea of depending on NVRAM + state to make your drive bootable ''; }; From d1b34967fea22f535c1a009f3af290c347455e8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Sep 2016 20:45:09 +0200 Subject: [PATCH 225/234] ghc-8.0.1: Revert "cosmetic fix to the Nix expression to unbreak syntax highlighting" This reverts commit 29a53017a41ee039, which broke filterdiff according to https://github.com/NixOS/nixpkgs/issues/18665#issuecomment-247626588. --- pkgs/development/compilers/ghc/8.0.1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index e607ef7e270..5e903822d4b 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -8,7 +8,7 @@ let fetchFilteredPatch = args: fetchurl (args // { downloadToTemp = true; postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x '"testsuite/"*' "$downloadedFile" > "$out" + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" ''; }); in From ff7f39febb8257e8243bffe0a455f445c1b78534 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 16 Sep 2016 21:42:38 +0200 Subject: [PATCH 226/234] vim: 7.4.1585 -> 8.0.0005 --- pkgs/applications/editors/vim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 1c81cda7ce9..1511b386579 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.1585"; + version = "8.0.0005"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1kjdwpka269i4cyl0rmnmzg23dl26g65k26h32w8ayzfm3kbj123"; + sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; }; enableParallelBuilding = true; From c61d3730b7095e2aab2813e8a29428e13d8f38a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Sep 2016 21:43:40 +0200 Subject: [PATCH 227/234] ghdl_mcode: get 32-bit version even on 64-bit --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a008a119e76..52b90a21a2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4702,7 +4702,7 @@ in profiledCompiler = false; }); - ghdl_mcode = callPackage ../development/compilers/ghdl { }; + ghdl_mcode = callPackage_i686 ../development/compilers/ghdl { }; gcl = callPackage ../development/compilers/gcl { gmp = gmp4; From a6fbd4e7984dfa149762a4b552095a1933eb87ce Mon Sep 17 00:00:00 2001 From: Pierre Radermecker Date: Fri, 16 Sep 2016 22:01:14 +0200 Subject: [PATCH 228/234] configuration-hackage2nix.yaml: language-puppet enable for x86_64-linux only --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c39fa422dca..d5a2620c301 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2420,7 +2420,7 @@ dont-distribute-packages: language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] From 2d2c311304a674d1eb8fbe6c53f719d9ae51e76e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sat, 17 Sep 2016 05:06:16 +0900 Subject: [PATCH 229/234] cadvisor test: fix (#18671) * influxdb module: add postStart * cadvisor module: increase TimeoutStartSec Under high load, the cadvisor module can take longer than the default 90 seconds to start. This change should hopefully fix the test on Hydra. --- nixos/modules/services/databases/influxdb.nix | 13 +++++++++---- nixos/modules/services/monitoring/cadvisor.nix | 1 + nixos/tests/cadvisor.nix | 3 --- nixos/tests/influxdb.nix | 3 --- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index e2268bd556e..11ea0e1b6b4 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -66,16 +66,16 @@ let enabled = false; }]; - collectd = { + collectd = [{ enabled = false; typesdb = "${pkgs.collectd}/share/collectd/types.db"; database = "collectd_db"; port = 25826; - }; + }]; - opentsdb = { + opentsdb = [{ enabled = false; - }; + }]; continuous_queries = { enabled = true; @@ -171,6 +171,11 @@ in mkdir -m 0770 -p ${cfg.dataDir} if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi ''; + postStart = mkBefore '' + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://127.0.0.1${toString configOptions.http.bind-address}'/ping; do + sleep 1; + done + ''; }; users.extraUsers = optional (cfg.user == "influxdb") { diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index a67df158be4..8ae8b12056c 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -90,6 +90,7 @@ in { ${optionalString cfg.storageDriverSecure "-storage_driver_secure"} ''} ''; + TimeoutStartSec=300; }; }; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index 3a887514773..f0083ab18e4 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -24,9 +24,6 @@ import ./make-test.nix ({ pkgs, ... } : { $influxdb->waitForUnit("influxdb.service"); - # Wait until influxdb admin interface is available - $influxdb->waitUntilSucceeds("curl -f 127.0.0.1:8083"); - # create influxdb database $influxdb->succeed(q~ curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root" diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index aca2189716a..ee126091667 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -17,9 +17,6 @@ import ./make-test.nix ({ pkgs, ...} : { $one->waitForUnit("influxdb.service"); - # Check if admin interface is avalible - $one->waitUntilSucceeds("curl -f 127.0.0.1:8083"); - # create database $one->succeed(q~ curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test" From 7be7620e517fa33605850e4d9b12d71cb5f74753 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Wed, 14 Sep 2016 20:26:51 +0200 Subject: [PATCH 230/234] fuse: 2.9.5 -> 2.9.7 --- pkgs/os-specific/linux/fuse/default.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index d86eb2a9756..46f242b2ea0 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, utillinux }: +{ stdenv, fetchFromGitHub, utillinux + ,autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { - name = "fuse-2.9.5"; + name = "fuse-${version}"; + + version = "2.9.7"; #builder = ./builder.sh; - src = fetchurl { - url = "https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/${name}.tar.gz"; - sha256 = "1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp"; + src = fetchFromGitHub { + owner = "libfuse"; + repo = "libfuse"; + rev = name; + sha256 = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; }; - buildInputs = [ utillinux ]; + buildInputs = [ utillinux autoconf automake libtool gettext ]; inherit utillinux; @@ -26,12 +31,15 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\"" sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c + sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh + + ./makeconf.sh ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://fuse.sourceforge.net/; + homepage = https://github.com/libfuse/libfuse; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; maintainers = [ maintainers.mornfall ]; From f12378e5b7aecb1ba0fecb6851046aaca10093cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Sep 2016 22:22:22 +0200 Subject: [PATCH 231/234] xorg xkeyboard-config: 2.17 -> 2.18 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- pkgs/servers/x11/xorg/xkeyboard-config-eo.patch | 10 ++++------ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 23c39a1a7a2..b9e367794f9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2242,11 +2242,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.17"; + name = "xkeyboard-config-2.18"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2; - sha256 = "00878f1v3034ki78pjpf2db0bh7jsmszsnxr3bf5qxripm2bxiny"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2; + sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index c0943e54a01..17dfd72c005 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch index 360768774db..66f45a410f7 100644 --- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch +++ b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch @@ -17,26 +17,24 @@ index ec321f8..e9c3546 100644 <_shortDescription>Irn <_description>Iran diff --git a/symbols/Makefile.am b/symbols/Makefile.am -index 97c816d..d7e3a4e 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -10,7 +10,7 @@ bt by braille \ - ca cd \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ fi fo fr \ gb ge gh gn \ gr hr hu \ diff --git a/symbols/Makefile.in b/symbols/Makefile.in -index b5be077..5cddcc7 100644 --- a/symbols/Makefile.in +++ b/symbols/Makefile.in @@ -222,7 +222,7 @@ bt by braille \ - ca cd \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ fi fo fr \ From 8aad4e8602c077cdc9d5b314b6a021da883d2fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Sep 2016 22:28:28 +0200 Subject: [PATCH 232/234] xf86-video-{ati,amdgpu}: maintenance updates --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/tarballs-7.7.list | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b9e367794f9..bb476ab1928 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.1.0"; + name = "xf86-video-amdgpu-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2; - sha256 = "0cbrqpmi1hgbsi0i93v0yp7lv3wf4s0vbdlrj19cxmglv7gd1xb9"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; + sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.7.0"; + name = "xf86-video-ati-7.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2; - sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; + sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 17dfd72c005..92697913f08 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,10 +127,10 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 From 16ed17d6c86da386fcb9d659700cd364beb08fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Sep 2016 22:38:53 +0200 Subject: [PATCH 233/234] xf86-input-evdev: bugfix 2.10.2 -> 2.10.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bb476ab1928..196670750da 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1582,11 +1582,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.2"; + name = "xf86-input-evdev-2.10.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2; - sha256 = "07gybpiv33rymcq5l729agan7nzv5f97wdczja6p145b846n6fm7"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2; + sha256 = "18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 92697913f08..2ee394faf02 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -119,7 +119,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 From 772d14d8c243c8076ca71f202d0c71546e94ae19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Sep 2016 22:39:38 +0200 Subject: [PATCH 234/234] xorg: expression cleanup The generating script needed to be updated not to overwrite the hardening changes back. --- pkgs/servers/x11/xorg/default.nix | 15 --------------- .../x11/xorg/generate-expr-from-tarballs.pl | 4 +++- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 196670750da..6cdca83256d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2362,21 +2362,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; - # TODO: - # With the current state of ./generate-expr-from-tarballs.pl, - # this will get overwritten when next invoked. - # Could add a special case to ./generate-expr-from-tarballs.pl, - # or perhaps there's a cleaner solution. - #xquartz = (mkDerivation "xquartz" { - # name = "xorg-server-1.14.6"; - # builder = ./builder.sh; - # src = fetchurl { - # url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2; - # sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8"; - # }; - # buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; - #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; - xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 054e3f490e4..74c5ae9d9b8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -239,7 +239,9 @@ let mkDerivation = name: attrs: let newAttrs = (overrides."\${name}" or (x: x)) attrs; stdenv = newAttrs.stdenv or args.stdenv; - in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]); + in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // { + hardeningDisable = [ "bindnow" "relro" ]; + }); overrides = import ./overrides.nix {inherit args xorg;};