diff --git a/doc/configuration.xml b/doc/configuration.xml index cb660452d828..a68ae739f52e 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -45,7 +45,7 @@ However, this does not allow unfree software for individual users. Their configurations are managed separately. - A user's of nixpkgs configuration is stored in a user-specific configuration file located at ~/.config/nixpkgs/config.nix. For example: + A user's nixpkgs configuration is stored in a user-specific configuration file located at ~/.config/nixpkgs/config.nix. For example: { allowUnfree = true; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 88dc42ebc6c2..4b18a9139d8e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -850,9 +850,8 @@ Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is in Packages inside nixpkgs are written by hand. However many tools exist in community to help save time. No tool is preferred at the moment. -- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov -- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas -- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin +- [pypi2nix](https://github.com/nix-community/pypi2nix): Generate Nix expressions for your Python project. Note that [sharing derivations from pypi2nix with nixpkgs is possible but not encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376). +- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov. ### Deterministic builds diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 5495ce29ce31..0b59f90eb490 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1692,7 +1692,7 @@ someVar=$(stripHash $name) - Convenience function for makeWrapper that automatically creates a sane wrapper file It takes all the same arguments as makeWrapper, except for --argv0. + Convenience function for makeWrapper that automatically creates a sane wrapper file. It takes all the same arguments as makeWrapper, except for --argv0. It cannot be applied multiple times, since it will overwrite the wrapper file. @@ -1869,7 +1869,7 @@ addEnvHooks "$hostOffset" myBashFunction - Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list the mechanism is only to be used as a last resort, it might cover most uses. + Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3dbd6282df4e..c187390defa1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -137,6 +137,11 @@ githubId = 2321000; name = "Ruslan Babayev"; }; + acairncross = { + email = "acairncross@gmail.com"; + github = "acairncross"; + name = "Aiken Cairncross"; + }; acowley = { email = "acowley@gmail.com"; github = "acowley"; @@ -546,6 +551,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + arcnmx = { + email = "arcnmx@users.noreply.github.com"; + github = "arcnmx"; + githubId = 13426784; + name = "arcnmx"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a13bd22916a8..1b9dafa25df9 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -37,6 +37,7 @@ lua-zlib,,,,,koral lua_cliargs,,,,, luabitop,,,,, luacheck,,,,, +luacov,,,,, luadbi,,,,, luadbi-mysql,,,,, luadbi-postgresql,,,,, diff --git a/maintainers/scripts/update-discord b/maintainers/scripts/update-discord index 23ec6e401be4..b4c26b3bdefd 100755 --- a/maintainers/scripts/update-discord +++ b/maintainers/scripts/update-discord @@ -6,7 +6,7 @@ exec >${1:?usage: $0 } cat </var/lib/gitlab/state, gitlab and all parent directories must be owned by either root or the user specified in . + + The option is unsupported in combination with in anticipation of defaulting to it by default. diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index bdf56acd5451..ab0951e831ce 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -36,6 +36,19 @@ quirk in the boot menu. + + + By default zfs pools will now be trimmed on a weekly basis. + Trimming is only done on supported devices (i.e. NVME or SSDs) + and should improve throughput and lifetime of these devices. + It is controlled by the services.zfs.trim.enable varname. + The zfs scrub service (services.zfs.autoScrub.enable) + and the zfs autosnapshot service (services.zfs.autoSnapshot.enable) + are now only enabled if zfs is set in config.boot.initrd.supportedFilesystems or + config.boot.supportedFilesystems. These lists will automatically contain + zfs as soon as any zfs mountpoint is configured in fileSystems. + + diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 361c3cfc553d..4888740ba3d5 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -88,6 +88,13 @@ in (mapAttrsToList pamVariable (zipAttrsWith (n: concatLists) [ + # Make sure security wrappers are prioritized without polluting + # shell environments with an extra entry. Sessions which depend on + # pam for its environment will otherwise have eg. broken sudo. In + # particular Gnome Shell sometimes fails to source a proper + # environment from a shell. + { PATH = [ config.security.wrapperDir ]; } + (mapAttrs (n: toList) cfg.sessionVariables) suffixedVariables ])); diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index fcffb2134980..38bdabb4fa81 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -21,8 +21,6 @@ in PAGER = mkDefault "less -R"; EDITOR = mkDefault "nano"; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc - GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes - GTK_EXE_PREFIX = "${config.system.path}"; }; environment.profiles = mkAfter diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 2ad116a7872a..10d42325a6b1 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -8,7 +8,7 @@ let builtins.substring 0 1 x == "/" # absolute path || builtins.substring 0 1 x == "." # relative path || builtins.match "[.*:.*]" == null; # not machine:path - + mkExcludeFile = cfg: # Write each exclude pattern to a new line pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude); @@ -104,12 +104,12 @@ let install = "install -o ${cfg.user} -g ${cfg.group}"; in nameValuePair "borgbackup-job-${name}" (stringAfter [ "users" ] ('' - # Eensure that the home directory already exists + # Ensure that the home directory already exists # We can't assert createHome == true because that's not the case for root - cd "${config.users.users.${cfg.user}.home}" + cd "${config.users.users.${cfg.user}.home}" ${install} -d .config/borg ${install} -d .cache/borg - '' + optionalString (isLocalPath cfg.repo) '' + '' + optionalString (isLocalPath cfg.repo && !cfg.removableDevice) '' ${install} -d ${escapeShellArg cfg.repo} '')); @@ -163,6 +163,13 @@ let + " without at least one public key"; }; + mkRemovableDeviceAssertions = name: cfg: { + assertion = !(isLocalPath cfg.repo) -> !cfg.removableDevice; + message = '' + borgbackup.repos.${name}: repo isn't a local path, thus it can't be a removable device! + ''; + }; + in { meta.maintainers = with maintainers; [ dotlambda ]; @@ -202,6 +209,12 @@ in { example = "user@machine:/path/to/repo"; }; + removableDevice = mkOption { + type = types.bool; + default = false; + description = "Whether the repo (which must be local) is a removable device."; + }; + archiveBaseName = mkOption { type = types.strMatching "[^/{}]+"; default = "${globalConfig.networking.hostName}-${name}"; @@ -511,7 +524,6 @@ in { type = types.attrsOf (types.submodule ( { ... }: { options = { - path = mkOption { type = types.path; description = '' @@ -598,7 +610,8 @@ in { (with config.services.borgbackup; { assertions = mapAttrsToList mkPassAssertion jobs - ++ mapAttrsToList mkKeysAssertion repos; + ++ mapAttrsToList mkKeysAssertion repos + ++ mapAttrsToList mkRemovableDeviceAssertions jobs; system.activationScripts = mapAttrs' mkActivationScript jobs; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index df74cfc9a26b..39192d059485 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -272,8 +272,13 @@ in port = ${toString cfg.port} datadir = ${cfg.dataDir} ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" } - ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} - ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} + ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") + '' + log-bin=mysql-bin-${toString cfg.replication.serverId} + log-bin-index=mysql-bin-${toString cfg.replication.serverId}.index + relay-log=mysql-relay-bin + server-id = ${toString cfg.replication.serverId} + ''} ${optionalString (cfg.ensureUsers != []) '' plugin-load-add = auth_socket.so @@ -381,6 +386,7 @@ in ( echo "stop slave;" echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';" + echo "set global slave_exec_mode='IDEMPOTENT';" echo "start slave;" ) | ${mysql}/bin/mysql -u root -N ''} diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 018fac386163..0f4eb2ccfcad 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -79,7 +79,11 @@ turn_user_lifetime: "${cfg.turn_user_lifetime}" user_creation_max_duration: ${cfg.user_creation_max_duration} bcrypt_rounds: ${cfg.bcrypt_rounds} allow_guest_access: ${boolToString cfg.allow_guest_access} -trusted_third_party_id_servers: ${builtins.toJSON cfg.trusted_third_party_id_servers} + +account_threepid_delegates: + ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"} + ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"} + room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types} ${optionalString (cfg.macaroon_secret_key != null) '' macaroon_secret_key: "${cfg.macaroon_secret_key}" @@ -102,6 +106,7 @@ perspectives: '') cfg.servers)} } } +redaction_retention_period: ${toString cfg.redaction_retention_period} app_service_config_files: ${builtins.toJSON cfg.app_service_config_files} ${cfg.extraConfig} @@ -552,14 +557,18 @@ in { accessible to anonymous users. ''; }; - trusted_third_party_id_servers = mkOption { - type = types.listOf types.str; - default = [ - "matrix.org" - "vector.im" - ]; + account_threepid_delegates.email = mkOption { + type = types.nullOr types.str; + default = null; description = '' - The list of identity servers trusted to verify third party identifiers by this server. + Delegate email sending to https://example.org + ''; + }; + account_threepid_delegates.msisdn = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Delegate SMS sending to this local process (https://localhost:8090) ''; }; room_invite_state_types = mkOption { @@ -600,6 +609,13 @@ in { A list of application service config file to use ''; }; + redaction_retention_period = mkOption { + type = types.int; + default = 7; + description = '' + How long to keep redacted events in unredacted form in the database. + ''; + }; extraConfig = mkOption { type = types.lines; default = ""; @@ -699,4 +715,12 @@ in { }; }; }; + + imports = [ + (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] '' + The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0 + as the behavior is now obsolete. + '') + ]; + } diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 84486aa98a40..35b513bac571 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -30,6 +30,7 @@ let "json" "mail" "minio" + "nextcloud" "nginx" "node" "postfix" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix new file mode 100644 index 000000000000..5f9a52053f79 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.nextcloud; +in +{ + port = 9205; + extraOpts = { + url = mkOption { + type = types.str; + example = "https://domain.tld"; + description = '' + URL to the Nextcloud serverinfo page. + Adding the path to the serverinfo API is optional, it defaults + to /ocs/v2.php/apps/serverinfo/api/v1/info. + ''; + }; + username = mkOption { + type = types.str; + default = "nextcloud-exporter"; + description = '' + Username for connecting to Nextcloud. + Note that this account needs to have admin privileges in Nextcloud. + ''; + }; + passwordFile = mkOption { + type = types.path; + example = "/path/to/password-file"; + description = '' + File containing the password for connecting to Nextcloud. + Make sure that this file is readable by the exporter user. + ''; + }; + timeout = mkOption { + type = types.str; + default = "5s"; + description = '' + Timeout for getting server info document. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = false; + ExecStart = '' + ${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \ + -a ${cfg.listenAddress}:${toString cfg.port} \ + -u ${cfg.username} \ + -t ${cfg.timeout} \ + -l ${cfg.url} \ + -p @${cfg.passwordFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index 82e881236adf..374f83a2939d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -6,6 +6,10 @@ let cfg = config.services.prometheus.exporters.wireguard; in { port = 9586; + imports = [ + (mkRenamedOptionModule [ "addr" ] [ "listenAddress" ]) + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; extraOpts = { verbose = mkEnableOption "Verbose logging mode for prometheus-wireguard-exporter"; @@ -42,14 +46,6 @@ in { Whether or not the remote IP of a WireGuard peer should be exposed via prometheus. ''; }; - - addr = mkOption { - type = types.str; - default = "0.0.0.0"; - description = '' - IP address of the exporter. - ''; - }; }; serviceOpts = { path = [ pkgs.wireguard-tools ]; @@ -59,7 +55,7 @@ in { ExecStart = '' ${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \ -p ${toString cfg.port} \ - -l ${cfg.addr} \ + -l ${cfg.listenAddress} \ ${optionalString cfg.verbose "-v"} \ ${optionalString cfg.singleSubnetPerField "-s"} \ ${optionalString cfg.withRemoteIp "-r"} \ diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 597fb57a1790..e5990aec4b9c 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -170,8 +170,9 @@ in "plymouth-start.service" ]; systemd.services.display-manager.conflicts = [ - "getty@tty${gdm.initialVT}.service" - "plymouth-quit.service" + "getty@tty${gdm.initialVT}.service" + # TODO: Add "plymouth-quit.service" so GDM can control when plymouth quits. + # Currently this breaks switching configurations while using plymouth. ]; systemd.services.display-manager.onFailure = [ "plymouth-quit.service" diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index cfdc0a31020b..fe11917c609c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -16,9 +16,7 @@ let inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; - enableAutoSnapshots = cfgSnapshots.enable; - enableAutoScrub = cfgScrub.enable; - enableZfs = inInitrd || inSystem || enableAutoSnapshots || enableAutoScrub; + enableZfs = inInitrd || inSystem; kernel = config.boot.kernelPackages; @@ -392,10 +390,11 @@ in }; environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/"; + environment.etc."zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/"; system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck environment.systemPackages = [ packages.zfsUser ] - ++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags + ++ optional cfgSnapshots.enable autosnapPkg; # so the user can run the command to see flags services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc. systemd.packages = [ packages.zfsUser ]; @@ -487,7 +486,7 @@ in systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; }) - (mkIf enableAutoSnapshots { + (mkIf (enableZfs && cfgSnapshots.enable) { systemd.services = let descr = name: if name == "frequent" then "15 mins" else if name == "hourly" then "hour" @@ -525,7 +524,7 @@ in }) snapshotNames); }) - (mkIf enableAutoScrub { + (mkIf (enableZfs && cfgScrub.enable) { systemd.services.zfs-scrub = { description = "ZFS pools scrubbing"; after = [ "zfs-import.target" ]; @@ -552,15 +551,13 @@ in }; }) - (mkIf cfgTrim.enable { + (mkIf (enableZfs && cfgTrim.enable) { systemd.services.zpool-trim = { description = "ZFS pools trim"; after = [ "zfs-import.target" ]; path = [ packages.zfsUser ]; startAt = cfgTrim.interval; - script = '' - zpool list -H -o name | xargs -n1 zpool trim - ''; + serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'zpool list -H -o name | xargs --no-run-if-empty -n1 zpool trim'"; }; }) ]; diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome3-xorg.nix index f12361da0372..eb4c376319be 100644 --- a/nixos/tests/gnome3-xorg.nix +++ b/nixos/tests/gnome3-xorg.nix @@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForUnit("default.target","alice"); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index b6fe602a7327..ab363efb6a19 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -44,7 +44,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForUnit("default.target","alice"); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); # Wait for the wayland server $machine->waitForFile("/run/user/1000/wayland-0"); diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index 2a7c063d3033..bd8ed23a7b8e 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -48,12 +48,12 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: # Check whether systemd gives and removes device ownership as # needed. subtest "device permissions", sub { - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->sendKeys("alt-f1"); $machine->waitUntilSucceeds("[ \$(fgconsole) = 1 ]"); - $machine->fail("getfacl /dev/snd/timer | grep -q alice"); + $machine->fail("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("chvt 2"); - $machine->waitUntilSucceeds("getfacl /dev/snd/timer | grep -q alice"); + $machine->waitUntilSucceeds("getfacl -p /dev/snd/timer | grep -q alice"); }; # Log out. diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 81c269c23788..f655aba9d45e 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -36,49 +36,16 @@ in { }; services.redis = { - unixSocket = "/var/run/redis/redis.sock"; enable = true; - extraConfig = '' - unixsocketperm 770 - ''; - }; - - systemd.services.redis = { - preStart = '' - mkdir -p /var/run/redis - chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis - ''; - serviceConfig.PermissionsStartOnly = true; }; systemd.services.nextcloud-setup= { requires = ["postgresql.service"]; after = [ "postgresql.service" - "chown-redis-socket.service" ]; }; - # At the time of writing, redis creates its socket with the "nobody" - # group. I figure this is slightly less bad than making the socket world - # readable. - systemd.services.chown-redis-socket = { - enable = true; - script = '' - until ${pkgs.redis}/bin/redis-cli ping; do - echo "waiting for redis..." - sleep 1 - done - chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis/redis.sock - ''; - after = [ "redis.service" ]; - requires = [ "redis.service" ]; - wantedBy = [ "redis.service" ]; - serviceConfig = { - Type = "oneshot"; - }; - }; - services.postgresql = { enable = true; ensureDatabases = [ "nextcloud" ]; @@ -94,8 +61,8 @@ in { testScript = let configureRedis = pkgs.writeScript "configure-redis" '' #!${pkgs.stdenv.shell} - nextcloud-occ config:system:set redis 'host' --value '/var/run/redis/redis.sock' --type string - nextcloud-occ config:system:set redis 'port' --value 0 --type integer + nextcloud-occ config:system:set redis 'host' --value 'localhost' --type string + nextcloud-occ config:system:set redis 'port' --value 6379 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\Redis' --type string nextcloud-occ config:system:set memcache.locking --value '\OC\Memcache\Redis' --type string ''; diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index c50f77f86173..9888887ee8b5 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -42,7 +42,7 @@ import ./make-test.nix ({ pkgs, ...} : $machine->waitForWindow(qr/plank/); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); # Open elementary terminal $machine->execute("su - alice -c 'DISPLAY=:0.0 io.elementary.terminal &'"); diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 88d4ff334369..614fc9bf316e 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : $machine->waitForWindow("^Desktop "); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->execute("su - alice -c 'DISPLAY=:0.0 dolphin &'"); $machine->waitForWindow(" Dolphin"); diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 9826b56b74d7..676183f6356f 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -229,6 +229,40 @@ let ''; }; + nextcloud = { + exporterConfig = { + enable = true; + passwordFile = "/var/nextcloud-pwfile"; + url = "http://localhost/negative-space.xml"; + }; + metricProvider = { + systemd.services.nc-pwfile = let + passfile = (pkgs.writeText "pwfile" "snakeoilpw"); + in { + requiredBy = [ "prometheus-nextcloud-exporter.service" ]; + before = [ "prometheus-nextcloud-exporter.service" ]; + serviceConfig.ExecStart = '' + ${pkgs.coreutils}/bin/install -o nextcloud-exporter -m 0400 ${passfile} /var/nextcloud-pwfile + ''; + }; + services.nginx = { + enable = true; + virtualHosts."localhost" = { + basicAuth.nextcloud-exporter = "snakeoilpw"; + locations."/" = { + root = "${pkgs.prometheus-nextcloud-exporter.src}/serverinfo/testdata"; + }; + }; + }; + }; + exporterTest = '' + waitForUnit("nginx.service") + waitForUnit("prometheus-nextcloud-exporter.service") + waitForOpenPort(9205) + succeed("curl -sSf http://localhost:9205/metrics | grep -q 'nextcloud_up 1'") + ''; + }; + nginx = { exporterConfig = { enable = true; diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 6cb4fae2021f..7ff623062d93 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -32,7 +32,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->sleep(10); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'"); $machine->waitForWindow(qr/Terminal/); diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix index 94378f0c8d34..d9b87b084376 100644 --- a/nixos/tests/xfce4-14.nix +++ b/nixos/tests/xfce4-14.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.desktopManager.xfce4-14.enable = true; hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then - + virtualisation.memorySize = 1024; }; @@ -27,7 +27,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->sleep(10); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'"); $machine->waitForWindow(qr/Terminal/); diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 8f1f79169d7b..604fe4c4ab71 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "drumkv1"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983"; + sha256 = "0h08r6vq23dlnag67fcfcpx83wampx4fag82v4bgkqg2sdh64p3n"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 90b81e1163d8..22cef5414f84 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.40.0"; + version = "3.41.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v"; + sha256 = "1bdcxsvb756rchyp9cj1y5x1w0w6p2hp7grgar5c4cyh3kshc2kj"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 9cff98f61372..4a6cdc44f446 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "5.981"; + version = "5.983"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0v4347i0pgzlinas4431dfbv1h9fk6vihvahh73valxvhydyxr8q"; + sha256 = "16xw3gsxgjfdxd1ldm8zxd48qh6lgxacnj9yjryy0brhw51dw1q4"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 9502cb7b7e7e..cd8079e31dce 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2 +{ stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 , libGLU_combined, pkgconfig, ttf_bitstream_vera }: stdenv.mkDerivation rec { pname = "setbfree"; - version = "0.8.8"; + version = "0.8.9"; - src = fetchurl { + src = fetchzip { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "1ldxwds99azingkjh246kz7x3j7307jhr0fls5rjjbcfchpg7v99"; + sha256 = "097bby2da47zlkaqy2jl8j6q0h5pxaq67lz473ygadqs5ic3nhc1"; }; - patchPhase = '' + postPatch = '' sed 's#/usr/local#$(out)#g' -i common.mak sed 's#/usr/share/fonts/truetype/ttf-bitstream-vera#${ttf_bitstream_vera}/share/fonts/truetype#g' \ -i b_synth/Makefile @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A DSP tonewheel organ emulator"; - homepage = http://setbfree.org; + homepage = "http://setbfree.org"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; # fails on ARM and Darwin maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 0936fe5a8ed7..74a59c0e963f 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { pname = "yoshimi"; - version = "1.5.11.3"; + version = "1.6.0.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2"; - sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154"; + sha256 = "140f2k4akj39pny8c7i794q125415gyvmy4rday0il5ncp3glik4"; }; buildInputs = [ diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix index 846e81e5e80b..26f27f44e863 100644 --- a/pkgs/applications/blockchains/jormungandr/default.nix +++ b/pkgs/applications/blockchains/jormungandr/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "jormungandr"; - version = "0.5.6"; + version = "0.6.1"; src = fetchgit { url = "https://github.com/input-output-hk/${pname}"; - rev = "v${version}+lock"; - sha256 = "0l6rxr1xjp5hfkf0qfx8qsa1slxn0ly28akci1rwgdhlzjn43zqr"; + rev = "v${version}"; + sha256 = "1w0xcx1h09wv25qdyybamxxl8sqd2npja12n3vpvz0sgv88c3mix"; fetchSubmodules = true; }; - cargoSha256 = "0590gsghr25bzfmxfyrpg58a0l77y88jwnrkgjxf06x3d66kkn3l"; + cargoSha256 = "0pflam5am760z4pz3j1ga4arsixmay2487sgpqrhrkiaws4nxy57"; nativeBuildInputs = [ pkgconfig protobuf ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 795472bf64af..4d221e970997 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,8 +1,32 @@ -{ stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb -, glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox -, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala, fetchpatch -, withQt4 ? false, qt4 -, withQt5 ? false, qtbase +{ stdenv +, fetchFromGitHub +, substituteAll +, plymouth +, pam +, pkgconfig +, autoconf +, automake +, libtool +, libxcb +, glib +, libXdmcp +, itstool +, intltool +, libxklavier +, libgcrypt +, audit +, busybox +, polkit +, accountsservice +, gtk-doc +, gnome3 +, gobject-introspection +, vala +, fetchpatch +, withQt4 ? false +, qt4 +, withQt5 ? false +, qtbase }: with stdenv.lib; @@ -53,11 +77,20 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch"; sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n"; }) + # Don't use etc/dbus-1/system.d (fetchpatch { url = "https://github.com/canonical/lightdm/commit/a99376f5f51aa147aaf81287d7ce70db76022c47.patch"; sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn"; }) + + # Hardcode plymouth to fix transitions. + # For some reason it can't find `plymouth` + # even when it's in PATH in environment.systemPackages. + (substituteAll { + src = ./fix-paths.patch; + plymouth = "${plymouth}/bin/plymouth"; + }) ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; @@ -83,6 +116,10 @@ stdenv.mkDerivation rec { --replace /bin/rm ${busybox}/bin/rm ''; + postInstall = '' + rm -rf $out/etc/apparmor.d $out/etc/init $out/etc/pam.d + ''; + meta = { homepage = https://github.com/CanonicalLtd/lightdm; description = "A cross-desktop display manager"; diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch new file mode 100644 index 000000000000..4498bc4d1a3e --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/plymouth.c b/src/plymouth.c +index d1ed91f4..318f9409 100644 +--- a/src/plymouth.c ++++ b/src/plymouth.c +@@ -24,7 +24,7 @@ static gboolean has_active_vt = FALSE; + static gboolean + plymouth_run_command (const gchar *command, gint *exit_status) + { +- g_autofree gchar *command_line = g_strdup_printf ("plymouth %s", command); ++ g_autofree gchar *command_line = g_strdup_printf ("@plymouth@ %s", command); + g_autoptr(GError) error = NULL; + gboolean result = g_spawn_command_line_sync (command_line, NULL, NULL, exit_status, &error); + diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 993d4ba7ecdb..8cb20f7944d9 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-34"; - sha256 = "0sqrgyfi7i7x1akna95c1qhk9sxxswzm3pkssfi4w6v7bn24g25g"; + version = "6.9.10-68"; + sha256 = "0ldkw6j4x0k7l6ykgpx9hz9cs7dmlapz2lv3lbrgz2nn9znqswxk"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 30f7739167ca..52397ac33c4f 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.2.6"; + version = "4.2.7.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0qdaw8xx3h91v8iw6nw2h276ka8hflaq4r4qwz5mqfd3h254jzym"; + sha256 = "1sx4j4brk71bas3cpqzk4bd8bknyl3x4fdg5pv4r7pcfd3vpq2vy"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 28d05480dae1..4279af4cb78b 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -6,11 +6,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.16"; + version = "0.9.17"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "0ij3li17jcqjx79ldv6zg2ckn8m2l9n4xvvq2x79y4q8yx9fqg85"; + sha256 = "10vqbi9rcg8r0jxpx2kn8xmahwgdcal28wpix2fg6nkp5rfwxnr6"; }; # Disable version check and fix install tests diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 4f5fb12faa62..a80e89e72bcd 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { shared-mime-info glib gdk-pixbuf perl ]; - preFixup = '' - rm $out/share/icons/*/icon-theme.cache - ''; - meta = { description = "Fast and simple image viewer"; longDescription = diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index ee19f5cebfe2..083debb1c99d 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.08.2/ ) diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 58eb288f6cc2..2d46b3cdaab3 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,7 +4,7 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras, knewstuff, qttools + qtx11extras, knewstuff, kwayland, qttools }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor - knewstuff + knewstuff kwayland ]; postPatch = '' substituteInPlace desktop/org.kde.spectacle.desktop \ diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 9e5346be9cd5..400dfcd7cec1 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1739 +3,1739 @@ { akonadi = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-19.08.1.tar.xz"; - sha256 = "32233b59c696a5053f2ee4b7368804635a04e2a5f6d3605848eadafa0306c44d"; - name = "akonadi-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-19.08.2.tar.xz"; + sha256 = "f67f0fac07d480739b2d6715862ee47a93fd38f057ac7ef888ed8ddfdc99934f"; + name = "akonadi-19.08.2.tar.xz"; }; }; akonadi-calendar = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-19.08.1.tar.xz"; - sha256 = "5e8c66d4c86e6458469dbb393458ee8b5e6afc1b4712ce8395709d4226864d6c"; - name = "akonadi-calendar-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-calendar-19.08.2.tar.xz"; + sha256 = "5beba24af485c8dae96944e4b5bd570460eb2868ba069580c2e5d784be38a3c8"; + name = "akonadi-calendar-19.08.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-tools-19.08.1.tar.xz"; - sha256 = "033fae40bcbdcfa52981026f783b7cc8fecde384d6683747cd3f307bd43b2570"; - name = "akonadi-calendar-tools-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-calendar-tools-19.08.2.tar.xz"; + sha256 = "a352c2bf8659ad7939f31009b8e35e8b1e629162f681a70999e5e88f9aaf6cbb"; + name = "akonadi-calendar-tools-19.08.2.tar.xz"; }; }; akonadiconsole = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadiconsole-19.08.1.tar.xz"; - sha256 = "9a0f88903757eaf0d3271d4438b3a170640b7cb01a7b2f0fbf10a75fa0093184"; - name = "akonadiconsole-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadiconsole-19.08.2.tar.xz"; + sha256 = "273b8f3d56ea65bd71a51103867b0e718d883478432bb971a262df1ea4c6df6c"; + name = "akonadiconsole-19.08.2.tar.xz"; }; }; akonadi-contacts = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-contacts-19.08.1.tar.xz"; - sha256 = "f182883b4cc16034a798feb966df268e84d9c5b8d3c6e14d5698f7ead85a21d7"; - name = "akonadi-contacts-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-contacts-19.08.2.tar.xz"; + sha256 = "eafeb550faea91a56109821864eedfbd619dc7850887746d31c1724ea7561920"; + name = "akonadi-contacts-19.08.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-import-wizard-19.08.1.tar.xz"; - sha256 = "d66088ded8917f6034de8981ce71d5d0e1808f6d58f7fdb7e0a806ff0834e27b"; - name = "akonadi-import-wizard-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-import-wizard-19.08.2.tar.xz"; + sha256 = "038713e7d30686eb1b8e49c595ec853ffa52d335e435a5b0bdf2f2a2448cae45"; + name = "akonadi-import-wizard-19.08.2.tar.xz"; }; }; akonadi-mime = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-mime-19.08.1.tar.xz"; - sha256 = "0a4f4652a665229b290431adb59940890effba0804fe33a0e79a24322f90b35c"; - name = "akonadi-mime-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-mime-19.08.2.tar.xz"; + sha256 = "16f8034d7990828c50a85474fe16641dfa46e22d00f49d8045d3483c61815264"; + name = "akonadi-mime-19.08.2.tar.xz"; }; }; akonadi-notes = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-notes-19.08.1.tar.xz"; - sha256 = "44896f17fc2f625f9fc8c77690acd787291c5e08e8261c5d113c94045bd5bdd8"; - name = "akonadi-notes-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-notes-19.08.2.tar.xz"; + sha256 = "64684c50d06664d8ccda098f8bfa536e861e4938c8f27688ef97653f7788fdde"; + name = "akonadi-notes-19.08.2.tar.xz"; }; }; akonadi-search = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akonadi-search-19.08.1.tar.xz"; - sha256 = "c68387f3452bcd390f1c99549531c72d95db0def29d8ba10330e68891b0d0b53"; - name = "akonadi-search-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akonadi-search-19.08.2.tar.xz"; + sha256 = "75c9713b84a03c60a68ff36652decbf57f4f56a0fb39579f53e7ed80a5ee8525"; + name = "akonadi-search-19.08.2.tar.xz"; }; }; akregator = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/akregator-19.08.1.tar.xz"; - sha256 = "b73fcf1c509398ff496864f0105491792b5b15f37c52f9a8ca74ca254a75494a"; - name = "akregator-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/akregator-19.08.2.tar.xz"; + sha256 = "cefc0785f40508a80fbf4534eef4d1164e349cfd50455483cef044945d1888c4"; + name = "akregator-19.08.2.tar.xz"; }; }; analitza = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/analitza-19.08.1.tar.xz"; - sha256 = "f963a8abe31d4c0d2b0e0a7e78ec78ced8eb7a0af60df1620ccc2f2409df6a91"; - name = "analitza-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/analitza-19.08.2.tar.xz"; + sha256 = "cbd51fd14d5ba74a7a3590ddca18ed688cbf724cd40f21c87b905f12fadf9399"; + name = "analitza-19.08.2.tar.xz"; }; }; ark = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ark-19.08.1.tar.xz"; - sha256 = "b5638bc4559d775d0a0c2aee022cadc021543bf92e8be6b9b803c50e7e7f1835"; - name = "ark-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ark-19.08.2.tar.xz"; + sha256 = "63fcec0a32d806cfc82fb1c136b5e037bfe75459b148ac08c00be7e45ac70c50"; + name = "ark-19.08.2.tar.xz"; }; }; artikulate = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/artikulate-19.08.1.tar.xz"; - sha256 = "856488a4914ae0cfa594106b4d5c7b5ffd996b009075dfa009ab9cdd2cbc2f9d"; - name = "artikulate-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/artikulate-19.08.2.tar.xz"; + sha256 = "b2b0778f18f04096b84caf72c28dd4bdfdbbc8f0a22ef118b8d18dba19a3f85b"; + name = "artikulate-19.08.2.tar.xz"; }; }; audiocd-kio = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/audiocd-kio-19.08.1.tar.xz"; - sha256 = "e072ed20f07fe246267b3e7c459812fe63d94125a1d2fbcda1c0403e9fe0a520"; - name = "audiocd-kio-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/audiocd-kio-19.08.2.tar.xz"; + sha256 = "383c0e9055b0093661b589395288bb8d173372572490a4ba4960d214b2746b3a"; + name = "audiocd-kio-19.08.2.tar.xz"; }; }; baloo-widgets = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/baloo-widgets-19.08.1.tar.xz"; - sha256 = "83429a70de735edc4714dc1b6f1a5a8c7d3d68a93165e98d2cadeecafa82af7b"; - name = "baloo-widgets-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/baloo-widgets-19.08.2.tar.xz"; + sha256 = "529f3b587098eb9b7d1aaa8b311f98c58d16ed88384fa0900f9fb9f8e242c070"; + name = "baloo-widgets-19.08.2.tar.xz"; }; }; blinken = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/blinken-19.08.1.tar.xz"; - sha256 = "dbe7b13bc6cad69f049f9eefa56f99012bc0906233193bf951477b3f5c8eb87e"; - name = "blinken-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/blinken-19.08.2.tar.xz"; + sha256 = "7f9d909bb845c365dbf49388b79687e7491c271dd7d2f9481a20397153a670f6"; + name = "blinken-19.08.2.tar.xz"; }; }; bomber = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/bomber-19.08.1.tar.xz"; - sha256 = "750110da07a1e316e2a55d043a0e988c91e6e57866b941a5cce1b6f569096f4f"; - name = "bomber-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/bomber-19.08.2.tar.xz"; + sha256 = "26285fe9e510cd334bb933281c615c2971084bfa787618ba0190175c36ada741"; + name = "bomber-19.08.2.tar.xz"; }; }; bovo = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/bovo-19.08.1.tar.xz"; - sha256 = "0d923b6b0eaf2ffd7a1eca833d1f110cc6fdaade3b11d07e8fa53a244a778658"; - name = "bovo-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/bovo-19.08.2.tar.xz"; + sha256 = "63f7a3860de2344be69366f636e841cd3db19743a8a29c42e14402256ed3122b"; + name = "bovo-19.08.2.tar.xz"; }; }; calendarsupport = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/calendarsupport-19.08.1.tar.xz"; - sha256 = "74d1b19a924f2aad7f5a034a7e3b11f2ed5bb94cd21458f0255a64ac6163de97"; - name = "calendarsupport-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/calendarsupport-19.08.2.tar.xz"; + sha256 = "9ae448463ca60e075f1ea9a22489f0acf6ea672c00f9bd7b49027e548e82c2af"; + name = "calendarsupport-19.08.2.tar.xz"; }; }; cantor = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/cantor-19.08.1.tar.xz"; - sha256 = "93b43426c3383718e6ff7b62f073e3c39371a519b98e890c2b7c15cb5086c039"; - name = "cantor-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/cantor-19.08.2.tar.xz"; + sha256 = "039bb1e61b996ab3776502db9367ed1f7fb7e674292647f1b28f5bd9b1c1b9cb"; + name = "cantor-19.08.2.tar.xz"; }; }; cervisia = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/cervisia-19.08.1.tar.xz"; - sha256 = "726c8d4bd942280e08891e15e47d0a0a88ee951addb3c10e1e9955fad2794b7f"; - name = "cervisia-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/cervisia-19.08.2.tar.xz"; + sha256 = "7cbff9d32e2721f6f594a84b42feef6dd76f830e2cc27c6d442d9b6ccbe7fceb"; + name = "cervisia-19.08.2.tar.xz"; }; }; dolphin = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/dolphin-19.08.1.tar.xz"; - sha256 = "a612dac0cf50301af46ad5fa29aad630bb33a8a4bd416a4d6023b65fb00f25cc"; - name = "dolphin-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/dolphin-19.08.2.tar.xz"; + sha256 = "0c56515737fc0f96020b3c157a93023095d1a1e23637e7670e068c6c286bbc3b"; + name = "dolphin-19.08.2.tar.xz"; }; }; dolphin-plugins = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz"; - sha256 = "ce2452d9f878dfcff45739ff9eb4a3bde69c449c36182dee6b768f362e75ae2e"; - name = "dolphin-plugins-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/dolphin-plugins-19.08.2.tar.xz"; + sha256 = "da2114bd8ed0a70fba3c3cba82a5543cce2f91af7e1dc12bc7457eeffc03099d"; + name = "dolphin-plugins-19.08.2.tar.xz"; }; }; dragon = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/dragon-19.08.1.tar.xz"; - sha256 = "b015dbba4b8278a4987164f12a9d9e42745d2eb1772da8b8b0c849b28ba03c90"; - name = "dragon-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/dragon-19.08.2.tar.xz"; + sha256 = "3924dba504f370415c0d68cb5079acfc941aa761e9d9d2df2ea48b302ef9ce61"; + name = "dragon-19.08.2.tar.xz"; }; }; eventviews = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/eventviews-19.08.1.tar.xz"; - sha256 = "a44d82e774017171f2eef3ef94b3c5b2765ce08fab5eec0a87b286fd5ea815f7"; - name = "eventviews-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/eventviews-19.08.2.tar.xz"; + sha256 = "48da7f85c86bcc7a64d475c5bbcbb531471e70cfc9f4bda76030280f0671132d"; + name = "eventviews-19.08.2.tar.xz"; }; }; ffmpegthumbs = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ffmpegthumbs-19.08.1.tar.xz"; - sha256 = "527ef798db833e71e2faf315fc89596716bd2bd7d11c78bc1bb2ef9b1549a71b"; - name = "ffmpegthumbs-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ffmpegthumbs-19.08.2.tar.xz"; + sha256 = "deba57ff10525efdf404401f6b605c1be0f02ec0bfe00465e080b42dc379d570"; + name = "ffmpegthumbs-19.08.2.tar.xz"; }; }; filelight = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/filelight-19.08.1.tar.xz"; - sha256 = "170e633e0d2f8c9b13cccfd5957590100be435f9e7258e84c6f15fabc636768e"; - name = "filelight-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/filelight-19.08.2.tar.xz"; + sha256 = "313ff23fceb427509b37efa012535e651618d42bde35c62cdc7732e463c346a6"; + name = "filelight-19.08.2.tar.xz"; }; }; granatier = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/granatier-19.08.1.tar.xz"; - sha256 = "3015a25f961ae3d746db2814a322bfb204e4e39cd95145fbf2aa819f1dc0417e"; - name = "granatier-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/granatier-19.08.2.tar.xz"; + sha256 = "81a0c288edd0be6d7c994a8ad1469679b7e78174d641f9c4f90d31613bad4b47"; + name = "granatier-19.08.2.tar.xz"; }; }; grantlee-editor = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/grantlee-editor-19.08.1.tar.xz"; - sha256 = "77661ac1d125349cd3439d130164ad172f0022376d6c6038c860c0440939e52c"; - name = "grantlee-editor-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/grantlee-editor-19.08.2.tar.xz"; + sha256 = "8e65ca3d949dcdd2b6c2edd582351b123eef49eb104a2dd6c027028315c2d502"; + name = "grantlee-editor-19.08.2.tar.xz"; }; }; grantleetheme = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/grantleetheme-19.08.1.tar.xz"; - sha256 = "61ec8f4902573727d5a292ba55c3663b267d3b1b8017c003ac3445164c2627cb"; - name = "grantleetheme-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/grantleetheme-19.08.2.tar.xz"; + sha256 = "a9d4e70089debdfaffb4af881cf2064ba68a0ad3fe007985c8e5997f0cf0e836"; + name = "grantleetheme-19.08.2.tar.xz"; }; }; gwenview = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/gwenview-19.08.1.tar.xz"; - sha256 = "1ed46507ea30c43e4672b51996ac413683a863978999be91a9df135f9369f3cb"; - name = "gwenview-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/gwenview-19.08.2.tar.xz"; + sha256 = "fa49352a208c9472c911d3579f7601fb915831ad42caf74a053ed749bf5bb1fb"; + name = "gwenview-19.08.2.tar.xz"; }; }; incidenceeditor = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/incidenceeditor-19.08.1.tar.xz"; - sha256 = "591781da9b3bc4b0f366ffa8de658aa31f48e1f435a434669b7c11b5f3a55403"; - name = "incidenceeditor-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/incidenceeditor-19.08.2.tar.xz"; + sha256 = "f2f7bf3a12af21e6f9e4a5f2ba93346e06a6988366af7b452d6268ac9fb4fc3d"; + name = "incidenceeditor-19.08.2.tar.xz"; }; }; juk = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/juk-19.08.1.tar.xz"; - sha256 = "f91de1fa697fba3fe73a086b0f3c254959fbceb769d3752353ee2078b86611f9"; - name = "juk-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/juk-19.08.2.tar.xz"; + sha256 = "b3f0e006d6defa58e0724088a1c99c1c412bc5764f8d1bebadf31b5f331d51d3"; + name = "juk-19.08.2.tar.xz"; }; }; k3b = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/k3b-19.08.1.tar.xz"; - sha256 = "8995f39457932fb6597f0f6124e0dfe09ecb2a25a6ec8506ce3ef870da293749"; - name = "k3b-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/k3b-19.08.2.tar.xz"; + sha256 = "a16796a873018bc5fd9f562297fea56d3f6d32a1e903a3e145814ea7d9be5209"; + name = "k3b-19.08.2.tar.xz"; }; }; kaccounts-integration = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kaccounts-integration-19.08.1.tar.xz"; - sha256 = "7436bb0c8e024122d7137971749ef975878dee557befa4b95bc02ce0801a8450"; - name = "kaccounts-integration-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kaccounts-integration-19.08.2.tar.xz"; + sha256 = "b422c23eb3eefc3a79c4ccb9360ae6269a86982575e981bb949c0782f1f813ce"; + name = "kaccounts-integration-19.08.2.tar.xz"; }; }; kaccounts-providers = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kaccounts-providers-19.08.1.tar.xz"; - sha256 = "ce885be3c0d59b7f65373fbadc8ff4510998f9067d3a7c96dc1eb05df78b071b"; - name = "kaccounts-providers-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kaccounts-providers-19.08.2.tar.xz"; + sha256 = "d5ad6882ff151d2f0cff2b76a83e38cf37c72a0dbdf4a0aff64420903266a309"; + name = "kaccounts-providers-19.08.2.tar.xz"; }; }; kaddressbook = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kaddressbook-19.08.1.tar.xz"; - sha256 = "8091a3bd77ec17757386d71a98a0ef2b6d68e35ca2f9f9b71e4e36c2a3cce5c9"; - name = "kaddressbook-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kaddressbook-19.08.2.tar.xz"; + sha256 = "4d67480ebf8ee96fcde85e66f8ad32119b006e36c87f4e4ac20ecfa967599260"; + name = "kaddressbook-19.08.2.tar.xz"; }; }; kajongg = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kajongg-19.08.1.tar.xz"; - sha256 = "ae40b7ceb7c591f8d92371e3c7584eeae0d84e4680927834eca7ffacd5b9bbf6"; - name = "kajongg-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kajongg-19.08.2.tar.xz"; + sha256 = "08c80ea5d44ee25812de9d9e95d7800cc84c1c02006f59eb08e54f2a0d4c756b"; + name = "kajongg-19.08.2.tar.xz"; }; }; kalarm = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kalarm-19.08.1.tar.xz"; - sha256 = "9eb7c6b160e82ae8d5d294ebd781ef2ac5579e556a564c70598c08925e2021fa"; - name = "kalarm-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kalarm-19.08.2.tar.xz"; + sha256 = "54d61b469042d27b8df903c5fc95dd68c1d108218f1402a733d974ab02576d24"; + name = "kalarm-19.08.2.tar.xz"; }; }; kalarmcal = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kalarmcal-19.08.1.tar.xz"; - sha256 = "add9ee09287491236c9a25cfcb32d437845d094d8fef3682954f561dc2917984"; - name = "kalarmcal-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kalarmcal-19.08.2.tar.xz"; + sha256 = "4dc6e1cd8a9cbf6e3f8e593e68ef6fa912819ece56efa64852ab33e3f582e6b7"; + name = "kalarmcal-19.08.2.tar.xz"; }; }; kalgebra = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kalgebra-19.08.1.tar.xz"; - sha256 = "c9859e0b2b847652007a3244bc658f7e160fe88fc70ea7da6e60f003f54f46c9"; - name = "kalgebra-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kalgebra-19.08.2.tar.xz"; + sha256 = "351a0df1bf637b14683d1a38d8f1eff0153596c5f93723f28f799aead6ee0757"; + name = "kalgebra-19.08.2.tar.xz"; }; }; kalzium = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kalzium-19.08.1.tar.xz"; - sha256 = "2519866172476bec297e9d02ff917b1c676b980edc2f20a9c3297bc255e045f0"; - name = "kalzium-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kalzium-19.08.2.tar.xz"; + sha256 = "e63d88526c86dd67ab133694dc23b6a35fd5514643bd7a7f1790db8c2a8490d9"; + name = "kalzium-19.08.2.tar.xz"; }; }; kamera = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kamera-19.08.1.tar.xz"; - sha256 = "109a030ef55b941758e8d4a58b2abed4c5e1bb7e13e8d239b7132867c801acf5"; - name = "kamera-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kamera-19.08.2.tar.xz"; + sha256 = "2db474afa6201f330631640e04e1bd6ebb96838ce4c16d37617a10063b1fa757"; + name = "kamera-19.08.2.tar.xz"; }; }; kamoso = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kamoso-19.08.1.tar.xz"; - sha256 = "76d7a9ea70646f8e86e912b72bd9f9ab42711f0cd53c7bed1403a274de036675"; - name = "kamoso-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kamoso-19.08.2.tar.xz"; + sha256 = "2b84b3b3fb7f423bbe69716114563f018e02d63ce7b9b85084d098123e4e29b8"; + name = "kamoso-19.08.2.tar.xz"; }; }; kanagram = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kanagram-19.08.1.tar.xz"; - sha256 = "85ba60dc1485f61054847262832edd112224a618effe8759a2dcc8ee73b130a6"; - name = "kanagram-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kanagram-19.08.2.tar.xz"; + sha256 = "251d08a8b73e85af4b90ed429d873b17f56c1e094c4a62116eee3b6bffc96388"; + name = "kanagram-19.08.2.tar.xz"; }; }; kapman = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kapman-19.08.1.tar.xz"; - sha256 = "e80057b4fa9b8af86ecae30871005d4c7508bbc99618cf36dcf1c9c7fa905321"; - name = "kapman-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kapman-19.08.2.tar.xz"; + sha256 = "240d7b0c611728bd1974230227c669bdcfe80081cff2ddae6278d5393bab7a4e"; + name = "kapman-19.08.2.tar.xz"; }; }; kapptemplate = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kapptemplate-19.08.1.tar.xz"; - sha256 = "c1e5d239ce3749e72bcce30dfc8c0a12c3d347b72a2566caa0d23dcc930499a2"; - name = "kapptemplate-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kapptemplate-19.08.2.tar.xz"; + sha256 = "2b719cf75bf8e9b495a8d9aa8288ddb528617c2e76bd1312cfdb2a43b27d6208"; + name = "kapptemplate-19.08.2.tar.xz"; }; }; kate = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kate-19.08.1.tar.xz"; - sha256 = "5389e1620a7eb8d7bab7396ee0db1a886fbdd44c8415291db6a917e89dcc77b7"; - name = "kate-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kate-19.08.2.tar.xz"; + sha256 = "9897f652996e3ebca8a749562cc2d609d704c80b08ec4716622def38f5980b47"; + name = "kate-19.08.2.tar.xz"; }; }; katomic = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/katomic-19.08.1.tar.xz"; - sha256 = "05453f2a1cba1a9bb7c558e9628361685d9b9b44fc4d65599eb05fec6ca3bd5d"; - name = "katomic-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/katomic-19.08.2.tar.xz"; + sha256 = "822963024107e122a3f53f55ae6863a10d92ca59eef5966cded6c9daf5f989b3"; + name = "katomic-19.08.2.tar.xz"; }; }; kbackup = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kbackup-19.08.1.tar.xz"; - sha256 = "93ec83cdb8cb1ad28f444f85aaec2270fbbf3108b3ce0cf22f42a737e0f9cc59"; - name = "kbackup-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kbackup-19.08.2.tar.xz"; + sha256 = "1678ac00c1930f430d620f542dc7913bf1575106654cc9d4b534aed65e023fb8"; + name = "kbackup-19.08.2.tar.xz"; }; }; kblackbox = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kblackbox-19.08.1.tar.xz"; - sha256 = "478b235e9498e9c5bf1c3626db651c85cf41bdd824dec484bccd38f6e73ffcc7"; - name = "kblackbox-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kblackbox-19.08.2.tar.xz"; + sha256 = "4ed8e2fe00e4d2ce0b194f85491f46ceaeec28114ff2dc667c0b112f8237a9ca"; + name = "kblackbox-19.08.2.tar.xz"; }; }; kblocks = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kblocks-19.08.1.tar.xz"; - sha256 = "15afc3b7083fc1ea08d6caa196d883a6ec7f9603302b5774c7ad97eea833f449"; - name = "kblocks-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kblocks-19.08.2.tar.xz"; + sha256 = "8b52c949e2d446a4ccf81b09818fc90234f2f55d8722c385491ee67e1f2abf93"; + name = "kblocks-19.08.2.tar.xz"; }; }; kblog = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kblog-19.08.1.tar.xz"; - sha256 = "e1926ebfb352f6b8c35963fdece240b03be8d3ec094cee46ba694e2869c85cae"; - name = "kblog-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kblog-19.08.2.tar.xz"; + sha256 = "f4d9017d38746b9669efebf5b6cfdc5ebf1cbaf1bbf45ab331530ade3c21cbb5"; + name = "kblog-19.08.2.tar.xz"; }; }; kbounce = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kbounce-19.08.1.tar.xz"; - sha256 = "e3d67ab3fac471b07a45abbcd78d02912392ad3f25e9d48b70a050bfda4a5fb0"; - name = "kbounce-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kbounce-19.08.2.tar.xz"; + sha256 = "8436ba58bb88360b08c2d220c1a92c924b15587769103f04881ac17583cc93c8"; + name = "kbounce-19.08.2.tar.xz"; }; }; kbreakout = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kbreakout-19.08.1.tar.xz"; - sha256 = "1f086f6794b40c6054f0c00d7fbebecea845f2ee7e7e3253efe33942f4ebe19e"; - name = "kbreakout-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kbreakout-19.08.2.tar.xz"; + sha256 = "9550d3ee6f6d412816bd12686272c3f0f0b5b9194242f9b22e2085c39d9720a9"; + name = "kbreakout-19.08.2.tar.xz"; }; }; kbruch = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kbruch-19.08.1.tar.xz"; - sha256 = "74b387e6eafc5fac8b7a75df6f8d61a2b4b0380a82b5c43f3a10c9b75855318f"; - name = "kbruch-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kbruch-19.08.2.tar.xz"; + sha256 = "a2cead23cab880b21769e41086505b50de659630860d056b6a8504caafd4dcf0"; + name = "kbruch-19.08.2.tar.xz"; }; }; kcachegrind = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcachegrind-19.08.1.tar.xz"; - sha256 = "e677f82e5527caecb0cdacad3f001665c40ba9e6a542a6a4d91fb898b45026c1"; - name = "kcachegrind-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcachegrind-19.08.2.tar.xz"; + sha256 = "baf17a5c11f21deb7b019a7e3a9819348ec8d20af5c8c4a6108b96266e425b46"; + name = "kcachegrind-19.08.2.tar.xz"; }; }; kcalc = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcalc-19.08.1.tar.xz"; - sha256 = "7b3c110a97b851e8db03302484cadc59a59ec8378501ee61dd094ac2c7caa203"; - name = "kcalc-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcalc-19.08.2.tar.xz"; + sha256 = "94a6d004266813449b6b9efbe0e3b0da3e5368059134668277a344a720f65fd9"; + name = "kcalc-19.08.2.tar.xz"; }; }; kcalcore = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcalcore-19.08.1.tar.xz"; - sha256 = "8c1bbd8e7673907de2c3682cbc1c4fe4a165cbe0b9a2fe399c4b0ae73894228a"; - name = "kcalcore-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcalcore-19.08.2.tar.xz"; + sha256 = "f7d33ec65cf954a0460258694ecb2e14bf6c00cee5ea9fdc3e015e78947d896a"; + name = "kcalcore-19.08.2.tar.xz"; }; }; kcalutils = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcalutils-19.08.1.tar.xz"; - sha256 = "b0f17fd7ced68d03666038ee97e6ca96bd504fc8b7f0ae9b53443cefb57558d7"; - name = "kcalutils-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcalutils-19.08.2.tar.xz"; + sha256 = "3f789a18348152f9fc70965dbc2e9a8bd0ba872968c3d0631afacd0e78d3ce13"; + name = "kcalutils-19.08.2.tar.xz"; }; }; kcharselect = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcharselect-19.08.1.tar.xz"; - sha256 = "8b5c418e9b35a12eeaa1ebf7834f2a13613926e824699e13214fe35276c42457"; - name = "kcharselect-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcharselect-19.08.2.tar.xz"; + sha256 = "ff2a8c78fc4a12dd727e8ad8677216d5a480a8c82aff97269397ee8ae01e36df"; + name = "kcharselect-19.08.2.tar.xz"; }; }; kcolorchooser = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcolorchooser-19.08.1.tar.xz"; - sha256 = "a36cccbbf5dda16c0d97bff2ce415e678481fee5c2a7640b2c2db2f0ea7c70cb"; - name = "kcolorchooser-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcolorchooser-19.08.2.tar.xz"; + sha256 = "4eb50f314b190f1980e73212a45fe86db39f278f789288cd76cb0763f3176edc"; + name = "kcolorchooser-19.08.2.tar.xz"; }; }; kcontacts = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcontacts-19.08.1.tar.xz"; - sha256 = "020177eb155d3df44314e89da1824916d125aab48131fce76c2131b40eae8f39"; - name = "kcontacts-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcontacts-19.08.2.tar.xz"; + sha256 = "0677177d6810047876a219445232c0bf91dc1cdba3cbe4133a0a7eda98c381e8"; + name = "kcontacts-19.08.2.tar.xz"; }; }; kcron = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kcron-19.08.1.tar.xz"; - sha256 = "e60eb14cb2aef0b0398088930102d68817c96a83c54895af6626693fc18c7ed9"; - name = "kcron-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kcron-19.08.2.tar.xz"; + sha256 = "270ee81cba5ef9d92158a3fc71cf8c50c658468018eb0415c9d3d0bc7abea5e5"; + name = "kcron-19.08.2.tar.xz"; }; }; kdav = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdav-19.08.1.tar.xz"; - sha256 = "38f34f39e165ba3a843acbc9efc3296c111a6bfa8c5ba23e1f55f98860b84d41"; - name = "kdav-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdav-19.08.2.tar.xz"; + sha256 = "8572a77ee3d0f8a7e09e4975fcf0420394c16e908c4a19aecc409415770595f9"; + name = "kdav-19.08.2.tar.xz"; }; }; kdebugsettings = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdebugsettings-19.08.1.tar.xz"; - sha256 = "4195a000558b56d849eb6e79880c5140fc30cd8b0657d4a9932035434f4c2649"; - name = "kdebugsettings-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdebugsettings-19.08.2.tar.xz"; + sha256 = "2823e53da647dec2bd780a3029c6b093917faad3db973147ef74eb8f1c1733df"; + name = "kdebugsettings-19.08.2.tar.xz"; }; }; kde-dev-scripts = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kde-dev-scripts-19.08.1.tar.xz"; - sha256 = "36af795eaa175f142556949fa4cc678a6d3fdad3607d169877d94bea785850d1"; - name = "kde-dev-scripts-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kde-dev-scripts-19.08.2.tar.xz"; + sha256 = "9a47b048cec42eedcec05602eb84d4124a1f67d451c22095e688cb24f7057327"; + name = "kde-dev-scripts-19.08.2.tar.xz"; }; }; kde-dev-utils = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kde-dev-utils-19.08.1.tar.xz"; - sha256 = "c529bb33dbd3b80e5c4737c3be0d17e88901ece48d3b19e61c8c14adab60177c"; - name = "kde-dev-utils-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kde-dev-utils-19.08.2.tar.xz"; + sha256 = "30bbcfa632cbf76a2b3a27f1044ff9708509921882b91a5623cc2a30d40acb32"; + name = "kde-dev-utils-19.08.2.tar.xz"; }; }; kdeedu-data = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdeedu-data-19.08.1.tar.xz"; - sha256 = "107dff744219210c732aa007d97c8c8d8e87cff5cd446d987b8ac2600ea1f1b7"; - name = "kdeedu-data-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdeedu-data-19.08.2.tar.xz"; + sha256 = "0ead96a7a10ecbf98c88464f9987e7d8e2efdf7879782e5262b5cda694f3e343"; + name = "kdeedu-data-19.08.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdegraphics-mobipocket-19.08.1.tar.xz"; - sha256 = "b1760e3a22869715881f571c0bc79c1b91876e41f508a5ba53659be774a6628c"; - name = "kdegraphics-mobipocket-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdegraphics-mobipocket-19.08.2.tar.xz"; + sha256 = "9621b0b3564ce7fcd6890c15c48e11d00c1cf2d3b408b255ec590bd6d113439f"; + name = "kdegraphics-mobipocket-19.08.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdegraphics-thumbnailers-19.08.1.tar.xz"; - sha256 = "86a81ff786168778cbe0ad7c185320dbf052b1df2e6269f14323df04b48ed2ff"; - name = "kdegraphics-thumbnailers-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdegraphics-thumbnailers-19.08.2.tar.xz"; + sha256 = "12e2b096d65c5dfde6d16bc2c35b236343ce02ba1ef1b3b68b11257250da02c8"; + name = "kdegraphics-thumbnailers-19.08.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdenetwork-filesharing-19.08.1.tar.xz"; - sha256 = "b7d229d06926ad53dcffd4508fde70060260a03cdfc6b59551f5ea551274bdac"; - name = "kdenetwork-filesharing-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdenetwork-filesharing-19.08.2.tar.xz"; + sha256 = "ceffdaabd3417db306c05ecd6a62b521d0b3eb5996d320d65ae5c51ea46bfdda"; + name = "kdenetwork-filesharing-19.08.2.tar.xz"; }; }; kdenlive = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdenlive-19.08.1.tar.xz"; - sha256 = "0d19c0d24e16518fd3b57eddffeb7d004723942889bd62e869749f02a1dcc036"; - name = "kdenlive-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdenlive-19.08.2.tar.xz"; + sha256 = "5ca3b7a2457d2aa355309bc7471791f691edd8774af9a19cbfc8fac39ad53c78"; + name = "kdenlive-19.08.2.tar.xz"; }; }; kdepim-addons = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdepim-addons-19.08.1.tar.xz"; - sha256 = "eff8e21ae66bf99a33c946886e7d84f5d717b123b06f86e891c9528858b9ec32"; - name = "kdepim-addons-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdepim-addons-19.08.2.tar.xz"; + sha256 = "1e7d647689d2bfa243a2f4583df7030238409fb05bbcda5b168ef024e6accc89"; + name = "kdepim-addons-19.08.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdepim-apps-libs-19.08.1.tar.xz"; - sha256 = "40a265cde8770a3fd6181b656da49d460dc67ed06d175067da0092116cd9862e"; - name = "kdepim-apps-libs-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdepim-apps-libs-19.08.2.tar.xz"; + sha256 = "d542b1d532d3ce3d9f1c63f4455175c7e855cd1e095a1addf1322074afc11923"; + name = "kdepim-apps-libs-19.08.2.tar.xz"; }; }; kdepim-runtime = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdepim-runtime-19.08.1.tar.xz"; - sha256 = "d7dd6c0108f6c7a37dc1ac0d7b9449664c76ecd3ca4f303f3a1b214862a4b20e"; - name = "kdepim-runtime-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdepim-runtime-19.08.2.tar.xz"; + sha256 = "9b98980003d2d107596e9acc9482dfc3ea26a2485c75a700bd82b53b9be72ebf"; + name = "kdepim-runtime-19.08.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdesdk-kioslaves-19.08.1.tar.xz"; - sha256 = "4bf6d32a33f53b7668313d0e5be81568934b8309f86c9554b25e9346344b2051"; - name = "kdesdk-kioslaves-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdesdk-kioslaves-19.08.2.tar.xz"; + sha256 = "308bdbbd484f60d14bd4f75e72af1e3308c497696a5f7b011b18bc0f203fd7e5"; + name = "kdesdk-kioslaves-19.08.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdesdk-thumbnailers-19.08.1.tar.xz"; - sha256 = "3da4aa540435fbc848bfc4f1b39f37145072e0856da31b4f5ac3d89719308f03"; - name = "kdesdk-thumbnailers-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdesdk-thumbnailers-19.08.2.tar.xz"; + sha256 = "d607f956e9c62ee9e9aa000d5444d33e68621e0741072d0d8c14e52bd4cc96be"; + name = "kdesdk-thumbnailers-19.08.2.tar.xz"; }; }; kdf = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdf-19.08.1.tar.xz"; - sha256 = "2aedb0a4f64d2417728b67e4a289488b59153683d5dd15bca259a64f9c51325e"; - name = "kdf-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdf-19.08.2.tar.xz"; + sha256 = "f0a27bbf25d5791272cc8598561e53afed9840d38bf08ed3146f36701dfb7b04"; + name = "kdf-19.08.2.tar.xz"; }; }; kdialog = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdialog-19.08.1.tar.xz"; - sha256 = "6b2ed8636d50d13104b0029f33b11943d6f7087297ad089d61c76a57d3b425a0"; - name = "kdialog-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdialog-19.08.2.tar.xz"; + sha256 = "7aef7b5a5f340cc0066e02572ec8cef8b227bc6c7f5b066677ef6422632db95a"; + name = "kdialog-19.08.2.tar.xz"; }; }; kdiamond = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kdiamond-19.08.1.tar.xz"; - sha256 = "20280e44742d57508b0a0c4a70f7545bdbacf913300ca35f427801b46c808f8e"; - name = "kdiamond-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kdiamond-19.08.2.tar.xz"; + sha256 = "e0e6104a34711864bc00d12acc5d4ac0143acfaefc5fec8a7f9ec5f7242d32e7"; + name = "kdiamond-19.08.2.tar.xz"; }; }; keditbookmarks = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/keditbookmarks-19.08.1.tar.xz"; - sha256 = "f023c7b3d362c19373e3f886300420488ef53835f753c318f9fd9c0bb7e53a8a"; - name = "keditbookmarks-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/keditbookmarks-19.08.2.tar.xz"; + sha256 = "6a22c3ccdd89d07ad13b34b89704afcc9bf3b5a177d4dc137dcb5eaf1580f6dd"; + name = "keditbookmarks-19.08.2.tar.xz"; }; }; kfind = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kfind-19.08.1.tar.xz"; - sha256 = "a4910d5a3f2b918090084c776ca16bf1e9ae47ced0c2e4eb2a3d0071204527de"; - name = "kfind-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kfind-19.08.2.tar.xz"; + sha256 = "7ce5255fa4ef3e98db937eb23e8cdc89bd6b5e5429ccb5fea769e99da2bc424a"; + name = "kfind-19.08.2.tar.xz"; }; }; kfloppy = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kfloppy-19.08.1.tar.xz"; - sha256 = "c22864e0dfef37ccb9a5329467b9058a14880e88b54c448b5933b57aa98b021b"; - name = "kfloppy-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kfloppy-19.08.2.tar.xz"; + sha256 = "743f9043bdc24855bb597d3f7cf2bbf4793c58be22eb73cd72ff1e3f8cff2f69"; + name = "kfloppy-19.08.2.tar.xz"; }; }; kfourinline = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kfourinline-19.08.1.tar.xz"; - sha256 = "a138908ccb21ab16399edf6a0aa6f95d6197a77dfef9e4ed87c8914ceb8d5b84"; - name = "kfourinline-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kfourinline-19.08.2.tar.xz"; + sha256 = "14d1cd1be7f1524758697f79d55c0c40e8e6359f2039929349e017a97acdc4dc"; + name = "kfourinline-19.08.2.tar.xz"; }; }; kgeography = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kgeography-19.08.1.tar.xz"; - sha256 = "c0c04e902626d52118e81da9fc24fbd87d49d0bcf4ad229f83eef8e4f84fb551"; - name = "kgeography-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kgeography-19.08.2.tar.xz"; + sha256 = "ca535319e5dd3938e572d9d4f4a216a29a5435546742bb6616d2a716f1a1dfcc"; + name = "kgeography-19.08.2.tar.xz"; }; }; kget = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kget-19.08.1.tar.xz"; - sha256 = "ecc9cc31f23304baa8c909335db57460460db27fbffb97438c1ed12703c6b9b9"; - name = "kget-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kget-19.08.2.tar.xz"; + sha256 = "e93795eec8f51cac2719ab31cfa6f5f4f642b166ffbb3f876ab3c866a4cd7df1"; + name = "kget-19.08.2.tar.xz"; }; }; kgoldrunner = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kgoldrunner-19.08.1.tar.xz"; - sha256 = "78c284edc000ec3f3f64bcf0d6c92a50f79632804696de676ed149055de7a6f8"; - name = "kgoldrunner-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kgoldrunner-19.08.2.tar.xz"; + sha256 = "fc719386cd1f0784c9be9813326e3fded8eb2951096abf7fcc4d577e5ed5501a"; + name = "kgoldrunner-19.08.2.tar.xz"; }; }; kgpg = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kgpg-19.08.1.tar.xz"; - sha256 = "441a0bfa58df14bad87f5f446b89113dc20365424f6a87aec30125c9221815c5"; - name = "kgpg-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kgpg-19.08.2.tar.xz"; + sha256 = "90795c649cd32b65b6030ed965e0db5b0570719afa36abb5d4893268461aa841"; + name = "kgpg-19.08.2.tar.xz"; }; }; khangman = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/khangman-19.08.1.tar.xz"; - sha256 = "eb95c48baa57475319f456ee1df11b715e7ceb5b1912e2657a2b1f4617bf2b26"; - name = "khangman-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/khangman-19.08.2.tar.xz"; + sha256 = "dfa7d2f19ab7cd7aa90d91bab1818d48e6df88ddebf729732cca8d6aca15d1f3"; + name = "khangman-19.08.2.tar.xz"; }; }; khelpcenter = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/khelpcenter-19.08.1.tar.xz"; - sha256 = "ae3243fcdc1281937772a091d902adaba0681abe82c222bf7ef895df0899ab63"; - name = "khelpcenter-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/khelpcenter-19.08.2.tar.xz"; + sha256 = "22b9f5225dfb9e8ad85becb7c2986cbee2a1366f84257fcbf76d5d7292dccdd9"; + name = "khelpcenter-19.08.2.tar.xz"; }; }; kidentitymanagement = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kidentitymanagement-19.08.1.tar.xz"; - sha256 = "3ff41eddf047fb1074473fd028b22ddd0fb467c062918148305f10c2fd74f42e"; - name = "kidentitymanagement-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kidentitymanagement-19.08.2.tar.xz"; + sha256 = "8f93f9546d570c8f7b2602a3a171641d488595ec8da3c47b0a08ef4f5083e884"; + name = "kidentitymanagement-19.08.2.tar.xz"; }; }; kig = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kig-19.08.1.tar.xz"; - sha256 = "8b073fd0310e62483a548ada000b4230f2b70dec8ab11ac8303bd64961829675"; - name = "kig-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kig-19.08.2.tar.xz"; + sha256 = "60bab2ccdf69df8ebaed672dc9201e468563d78761f191c43ee5673f9a54246a"; + name = "kig-19.08.2.tar.xz"; }; }; kigo = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kigo-19.08.1.tar.xz"; - sha256 = "7afc2e08192d7e7bf17d67e00aebc498e37b40b47ce78cb7cf2d943a5563817b"; - name = "kigo-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kigo-19.08.2.tar.xz"; + sha256 = "c53a85b312e4acfcc35905a7e5602f3d623e45227fbd3644410b3fd962a9f1a0"; + name = "kigo-19.08.2.tar.xz"; }; }; killbots = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/killbots-19.08.1.tar.xz"; - sha256 = "16fb2338125d342166e630cf589a346a69874ea1da32c0a3c591d6e17241e05e"; - name = "killbots-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/killbots-19.08.2.tar.xz"; + sha256 = "c4407bf534dc9de604d6c169cf278b8cb9ca03055d96b71cbfe3916dbafea479"; + name = "killbots-19.08.2.tar.xz"; }; }; kimagemapeditor = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kimagemapeditor-19.08.1.tar.xz"; - sha256 = "0baa2f3fa5810ab63d08db2d0223af04407bb14e4bda20ad17dbfb6c63f33b3a"; - name = "kimagemapeditor-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kimagemapeditor-19.08.2.tar.xz"; + sha256 = "3be222d94bad94adf4d589fb98c9556af0f0e6c66106a217ee3b9ab031412597"; + name = "kimagemapeditor-19.08.2.tar.xz"; }; }; kimap = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kimap-19.08.1.tar.xz"; - sha256 = "a4fde0c17fcdbc672b8e7ad6ed727e18b6bc2cc3c7f23857a6b1455d99999bbf"; - name = "kimap-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kimap-19.08.2.tar.xz"; + sha256 = "250479c78517610aab810f54184d8826fb981438ec9f0d5c423ad781a796ee00"; + name = "kimap-19.08.2.tar.xz"; }; }; kio-extras = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kio-extras-19.08.1.tar.xz"; - sha256 = "de0ba7f3ce73db34b878cb88e36711d6b31aad57a5a735744330f92920666c52"; - name = "kio-extras-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kio-extras-19.08.2.tar.xz"; + sha256 = "a0b8f08ab8f9d36cfdc950470f75726e90e9fba159bc2035931cfa6efbfe4394"; + name = "kio-extras-19.08.2.tar.xz"; }; }; kipi-plugins = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kipi-plugins-19.08.1.tar.xz"; - sha256 = "6cc8fdc47fbfa5d8b4f9aeb4d82b5f1c9779a300cffbc17f8776dcb2ed61f0e4"; - name = "kipi-plugins-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kipi-plugins-19.08.2.tar.xz"; + sha256 = "2894f50989a14f7fd4be0035efec3cb14583d2285ff11729605b641af0fed192"; + name = "kipi-plugins-19.08.2.tar.xz"; }; }; kirigami-gallery = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kirigami-gallery-19.08.1.tar.xz"; - sha256 = "b981b26fb268448f20077f3e69b3e12f45de91289f5b2026c618cdbff9ec5241"; - name = "kirigami-gallery-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kirigami-gallery-19.08.2.tar.xz"; + sha256 = "db6cf765cd3c7126d9e4d94cacf66478711fe8b676c9505c22604863092d975e"; + name = "kirigami-gallery-19.08.2.tar.xz"; }; }; kiriki = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kiriki-19.08.1.tar.xz"; - sha256 = "ca22215394b7ea172cd1c5eef301871df2526a321b4f3c6b1aa042d4f15abf7c"; - name = "kiriki-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kiriki-19.08.2.tar.xz"; + sha256 = "8aa1749e2b14dbb4b508515a0b1f5164243ee793141ec2af7bfc6be1f6eb67da"; + name = "kiriki-19.08.2.tar.xz"; }; }; kiten = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kiten-19.08.1.tar.xz"; - sha256 = "01e963fd76c87a631bb5a4f86bc8be624907571c60368e6bf5bdce55cff6b59a"; - name = "kiten-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kiten-19.08.2.tar.xz"; + sha256 = "e35552dd49507c66574ae7fc22fe75597a954044a09522652cc1e457d3425edc"; + name = "kiten-19.08.2.tar.xz"; }; }; kitinerary = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kitinerary-19.08.1.tar.xz"; - sha256 = "f84dafa874c958b335ee80dbe85dce3605b40b83ac9468e6555250da8f480967"; - name = "kitinerary-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kitinerary-19.08.2.tar.xz"; + sha256 = "d814a2f1deaadce5fec85b1122aab6ff926c53ca8f020aadc99401bd31597eaa"; + name = "kitinerary-19.08.2.tar.xz"; }; }; kjumpingcube = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kjumpingcube-19.08.1.tar.xz"; - sha256 = "18c7bc9ab96308a4b874226f92f15da38cbb293372fdae8deec45029d6d31f20"; - name = "kjumpingcube-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kjumpingcube-19.08.2.tar.xz"; + sha256 = "7ff90a22670818eee7d02fd8119923761e003e059d0666873d5299cd31c96eb3"; + name = "kjumpingcube-19.08.2.tar.xz"; }; }; kldap = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kldap-19.08.1.tar.xz"; - sha256 = "b6fb822df67449870fb5c0bfe1adb1bd3d44535e3f2186ef6be286e4a590bd54"; - name = "kldap-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kldap-19.08.2.tar.xz"; + sha256 = "79c540693b85c138ae7bf4f72213dfad6dfa48dfc0ab414004d93f15d2ffac6e"; + name = "kldap-19.08.2.tar.xz"; }; }; kleopatra = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kleopatra-19.08.1.tar.xz"; - sha256 = "ef63fbe1a24a24b8c6b491fe19e0bebd9518a2e1340a9dfee7215eb3740369c7"; - name = "kleopatra-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kleopatra-19.08.2.tar.xz"; + sha256 = "7d0667b71796f8cbf9081c74c80def1e6618366400d4fbe56e690bb7049e4085"; + name = "kleopatra-19.08.2.tar.xz"; }; }; klettres = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/klettres-19.08.1.tar.xz"; - sha256 = "9d9616e35f2b82e39916b89a049bee4faca5a4235eb22989c9e8485c7e75239b"; - name = "klettres-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/klettres-19.08.2.tar.xz"; + sha256 = "919fc2b5d722bfdd741f0b1202f31c9aefc5d240ceb88ab785c2acd98a1b8284"; + name = "klettres-19.08.2.tar.xz"; }; }; klickety = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/klickety-19.08.1.tar.xz"; - sha256 = "cb12f79123e96920b323e752b057f21942aba0844d79e310ad343bda0108b273"; - name = "klickety-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/klickety-19.08.2.tar.xz"; + sha256 = "97e165d250d88a5a9f00fc5e111f641c43bed8e1445fd9d7c59f986cf5517271"; + name = "klickety-19.08.2.tar.xz"; }; }; klines = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/klines-19.08.1.tar.xz"; - sha256 = "e8ac5d344c6b9e6d8a9fa9a0fe7da5ebdceec049fbdc8ff476604a0760877aab"; - name = "klines-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/klines-19.08.2.tar.xz"; + sha256 = "1e7f5600b32a43ed4e5b7490430fb20309837e35aceb6b9b904951f23beec86f"; + name = "klines-19.08.2.tar.xz"; }; }; kmag = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmag-19.08.1.tar.xz"; - sha256 = "28504935665df18246cc6db4288dc2b33f24ed7114007df008f4310ce8792ceb"; - name = "kmag-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmag-19.08.2.tar.xz"; + sha256 = "6e8ecfab87dca12804a5a8d0a8adf1545e9e17039e0f9667b10a8f2832512e71"; + name = "kmag-19.08.2.tar.xz"; }; }; kmahjongg = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmahjongg-19.08.1.tar.xz"; - sha256 = "621e30ce5d76ab9f8736cfe13a076501c8822d7d1402d195bfe12c21ffa507c3"; - name = "kmahjongg-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmahjongg-19.08.2.tar.xz"; + sha256 = "8b2c4b0e3cb9bb85fa6d5f0fc5c55fcca96149e510cde25be2bcd688834a8d08"; + name = "kmahjongg-19.08.2.tar.xz"; }; }; kmail = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmail-19.08.1.tar.xz"; - sha256 = "4deb5d7c5304c0856fbbafeb7bf09436e28782b96dc5ec342a09b2c26ea386c0"; - name = "kmail-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmail-19.08.2.tar.xz"; + sha256 = "0ad2a5439da7f255923eeb4c4cf267ece721619aa046a04439f56763aeabac85"; + name = "kmail-19.08.2.tar.xz"; }; }; kmail-account-wizard = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmail-account-wizard-19.08.1.tar.xz"; - sha256 = "b4f2f769b44845dd02632ce282fc740a35f7f784e9fb54091153365ee88fb864"; - name = "kmail-account-wizard-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmail-account-wizard-19.08.2.tar.xz"; + sha256 = "769b151d0de47d49e41eaeca501526de41c174f9df99b46418e955163c38e9a8"; + name = "kmail-account-wizard-19.08.2.tar.xz"; }; }; kmailtransport = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmailtransport-19.08.1.tar.xz"; - sha256 = "521bcfd334a0e7e4986e6cebff3bae4095175a11fd45f777da673f1460d733da"; - name = "kmailtransport-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmailtransport-19.08.2.tar.xz"; + sha256 = "c545fb5546e82f7dfcea4c6e1a8b565ad04e34851c33876c9bf74c9fbc3165c7"; + name = "kmailtransport-19.08.2.tar.xz"; }; }; kmbox = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmbox-19.08.1.tar.xz"; - sha256 = "5fa59ffd16df1ae28f7ebf026f67df708c5b84e54e1ab47fd5de957c5b8fc75e"; - name = "kmbox-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmbox-19.08.2.tar.xz"; + sha256 = "82e2f64b90a1386100e13f9b2afea5d71952a1cb9547f965ddcdb3b8c59c35b1"; + name = "kmbox-19.08.2.tar.xz"; }; }; kmime = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmime-19.08.1.tar.xz"; - sha256 = "e8693458734f11a9d33a4d761f2b5ccae8f9ed87bb1e9dfc97f4bd0fa7089557"; - name = "kmime-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmime-19.08.2.tar.xz"; + sha256 = "f153332bb71de9d4451b8d28135a914059f5156fc8dda33f6375671603477771"; + name = "kmime-19.08.2.tar.xz"; }; }; kmines = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmines-19.08.1.tar.xz"; - sha256 = "8aedc9eeb3426a394a6e048508f700d466c18b262a9b98e01eff379a8d6003fb"; - name = "kmines-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmines-19.08.2.tar.xz"; + sha256 = "735a3b7b844fbfc970187ddc9d4fe312a5dd6c037e8ad87712388578482d12d8"; + name = "kmines-19.08.2.tar.xz"; }; }; kmix = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmix-19.08.1.tar.xz"; - sha256 = "a6006ab35bdfc2896188aa99ba50f1b28e8d5172ec8a1068efb15a50c43f87a7"; - name = "kmix-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmix-19.08.2.tar.xz"; + sha256 = "5d852df8b54d3abca98db4aa2b259973231fed0a597d511d54fb41c6389ce61a"; + name = "kmix-19.08.2.tar.xz"; }; }; kmousetool = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmousetool-19.08.1.tar.xz"; - sha256 = "d9a3164a0709fa0d2fc3e30ade2bd42c86fb73c7cf4adc341dd7e11e686f7956"; - name = "kmousetool-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmousetool-19.08.2.tar.xz"; + sha256 = "7cdc327e82548bf70c4ef4feab7a30938f3aefa1e80fccb343ce0d5ca8976ccb"; + name = "kmousetool-19.08.2.tar.xz"; }; }; kmouth = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmouth-19.08.1.tar.xz"; - sha256 = "531b7b3716fea8c679c5c39c7c04214cb561430182747ce08a9854a76105821e"; - name = "kmouth-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmouth-19.08.2.tar.xz"; + sha256 = "7a71d9d15d6a5f72c86f41e874f7cb3b45d8edaae2b3bd5409b20bd7bad4a0d3"; + name = "kmouth-19.08.2.tar.xz"; }; }; kmplot = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kmplot-19.08.1.tar.xz"; - sha256 = "7797dc95f64738b918cb19481bc74cebd1f66b5a537592bb53e98e1715701fe2"; - name = "kmplot-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kmplot-19.08.2.tar.xz"; + sha256 = "62017429db210c5b8f99301a6768a6eb10becd0f1f6af6d886a539657d8518a0"; + name = "kmplot-19.08.2.tar.xz"; }; }; knavalbattle = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/knavalbattle-19.08.1.tar.xz"; - sha256 = "6fa3cc1b7de95d22a6c356f411367399626a334ce648abc50ac724a860468915"; - name = "knavalbattle-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/knavalbattle-19.08.2.tar.xz"; + sha256 = "31f25b5397c36434c1910bf8968f92548019ad172b4d5399e6c01939389915ba"; + name = "knavalbattle-19.08.2.tar.xz"; }; }; knetwalk = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/knetwalk-19.08.1.tar.xz"; - sha256 = "0c62b756d3375f0c51046e92904f380544ba77bcc0109607bb38055907579ccf"; - name = "knetwalk-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/knetwalk-19.08.2.tar.xz"; + sha256 = "057b8571f165a716a6cc13ec6489e7b5f9b4c14fa72080180a2098fa0fa028a1"; + name = "knetwalk-19.08.2.tar.xz"; }; }; knights = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/knights-19.08.1.tar.xz"; - sha256 = "bdd99e6ba75e03f19eac5fe6e50c84496eb614725da021208db9119539cea132"; - name = "knights-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/knights-19.08.2.tar.xz"; + sha256 = "2b70338d1cb2b770157a5b061a797620d8dd7dd8c6da0bcb7e2a9db375e71a07"; + name = "knights-19.08.2.tar.xz"; }; }; knotes = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/knotes-19.08.1.tar.xz"; - sha256 = "30b835c063e03d3d9047cbaacf389ee1e261368d2cf73fdfab71b4f9138b8bf7"; - name = "knotes-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/knotes-19.08.2.tar.xz"; + sha256 = "aa0aa4d215507750b055e9af91f552e723aee8163b36f65a3dd19786cf327cf3"; + name = "knotes-19.08.2.tar.xz"; }; }; kolf = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kolf-19.08.1.tar.xz"; - sha256 = "5199274d7ec557d396e74485debe4c7572050de6d31f128cca9ab737062f83bc"; - name = "kolf-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kolf-19.08.2.tar.xz"; + sha256 = "88b9a58885eda34bf5b349db5e84c20df9beb1462922ed6e973a61bd95d853e8"; + name = "kolf-19.08.2.tar.xz"; }; }; kollision = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kollision-19.08.1.tar.xz"; - sha256 = "0f2bac3898ceb26bd17bdcc3481d76709b793a83ace75ba8f6f45fbf54428697"; - name = "kollision-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kollision-19.08.2.tar.xz"; + sha256 = "f2e7d851181033ce39d43a038601ca70c608ae9d0cb0e88228512ca1dbd0cf19"; + name = "kollision-19.08.2.tar.xz"; }; }; kolourpaint = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kolourpaint-19.08.1.tar.xz"; - sha256 = "59c1a2a9d8f012ff1c483dae4f1019232ec667bd88e61c6c8fc07e47312ef23f"; - name = "kolourpaint-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kolourpaint-19.08.2.tar.xz"; + sha256 = "e8bde8d516159ae93dfe56565eea2919d2154606fd1814202f30caf21f659cda"; + name = "kolourpaint-19.08.2.tar.xz"; }; }; kompare = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kompare-19.08.1.tar.xz"; - sha256 = "325a14529c8e015fbae0231511ddd5c61dd3d78cbc6ad92eaccfd1c90a2f1afd"; - name = "kompare-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kompare-19.08.2.tar.xz"; + sha256 = "b14f23ac6eb72622a06e2e489fc2d684124f520ad13e032338397fef342659eb"; + name = "kompare-19.08.2.tar.xz"; }; }; konqueror = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/konqueror-19.08.1.tar.xz"; - sha256 = "48a2847c7fcd5e30ae02d64523c3053b958ae9d3a7a649685660b1340aa644df"; - name = "konqueror-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/konqueror-19.08.2.tar.xz"; + sha256 = "336da877ea44fb100ca5396bc843994d77d0939fe3c969ad8fa85f0e1644d111"; + name = "konqueror-19.08.2.tar.xz"; }; }; konquest = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/konquest-19.08.1.tar.xz"; - sha256 = "114e76a10a992efb3fbd094bd1b66c3d6266c540c41289a0627ec04a8db52ec0"; - name = "konquest-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/konquest-19.08.2.tar.xz"; + sha256 = "3dda62a480e37d97aabdc4670a8ac1cf209605ed274c872ee3575ff1ecff6936"; + name = "konquest-19.08.2.tar.xz"; }; }; konsole = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/konsole-19.08.1.tar.xz"; - sha256 = "7530157a3fa01a9b21971e271a9d46addb5c71dce290db97265928803b57d37f"; - name = "konsole-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/konsole-19.08.2.tar.xz"; + sha256 = "4702fe52279c99e7d8da313285ace26955776669a78bdcb6dac7aec76cabe5ed"; + name = "konsole-19.08.2.tar.xz"; }; }; kontact = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kontact-19.08.1.tar.xz"; - sha256 = "7b57b44ee72211b30fc743fae6580867100ede718909617b90cb926732ecbabb"; - name = "kontact-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kontact-19.08.2.tar.xz"; + sha256 = "d24023381304fbe388a0840921599d13c86912a1285acfc0a7d607962e37c5cf"; + name = "kontact-19.08.2.tar.xz"; }; }; kontactinterface = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kontactinterface-19.08.1.tar.xz"; - sha256 = "adb5c380fd73102b84c72ea27975689dc289b0f5c8dd10f86bf0a857e00170be"; - name = "kontactinterface-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kontactinterface-19.08.2.tar.xz"; + sha256 = "cbd34915ddf6fbcf02395f7c876050f2b732f3769627489f04979e419cfdc869"; + name = "kontactinterface-19.08.2.tar.xz"; }; }; kopete = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kopete-19.08.1.tar.xz"; - sha256 = "c4943c5cbb384eb8697668be2a38dcc0dc16f26485a38c3657658c1cc4dbd2a8"; - name = "kopete-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kopete-19.08.2.tar.xz"; + sha256 = "cf4e4f6ff6dcd6e42a1c3d5339be4a65ed0379ef786155c12cf13f8af339e022"; + name = "kopete-19.08.2.tar.xz"; }; }; korganizer = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/korganizer-19.08.1.tar.xz"; - sha256 = "d7e347df36986926d0e0d1af38130a089b581e400a90cc8bf199cecb29b78023"; - name = "korganizer-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/korganizer-19.08.2.tar.xz"; + sha256 = "969930b66a445873a28bfe2e67876388259e35e89ffce45607583b4a668d9194"; + name = "korganizer-19.08.2.tar.xz"; }; }; kpat = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kpat-19.08.1.tar.xz"; - sha256 = "65bf7299c59d3d7512ab39174fd0e5d044f307784c02895130399534e044831c"; - name = "kpat-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kpat-19.08.2.tar.xz"; + sha256 = "6322d86e12996da3d95f6d4afd1d2e70cfd1771698bab393aaf987fd4fe0ef67"; + name = "kpat-19.08.2.tar.xz"; }; }; kpimtextedit = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kpimtextedit-19.08.1.tar.xz"; - sha256 = "f7e0dc9c706c94fa74a561d42d41246eae57f60c03da1ec52f2311172052d7fe"; - name = "kpimtextedit-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kpimtextedit-19.08.2.tar.xz"; + sha256 = "e565774d77f310165fc44c8b109ef835aae82a2f763d89d1ffb6e5b820cd850d"; + name = "kpimtextedit-19.08.2.tar.xz"; }; }; kpkpass = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kpkpass-19.08.1.tar.xz"; - sha256 = "893ee1f127c2d0c7135fe77c5c2895d04f95c9a6ed3b162c30856f4e99d4afb3"; - name = "kpkpass-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kpkpass-19.08.2.tar.xz"; + sha256 = "daf4da30fd5c834915e6210bf64609adc116e5c6919365d000a400b6cd5f3e26"; + name = "kpkpass-19.08.2.tar.xz"; }; }; kqtquickcharts = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kqtquickcharts-19.08.1.tar.xz"; - sha256 = "af191d150a4777e53b27c39c86f32f80cec8b6eb2442d03425496902f78e79c8"; - name = "kqtquickcharts-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kqtquickcharts-19.08.2.tar.xz"; + sha256 = "3341f99ba3a35e9c4fd70911faebaf4312d7700a342edd242de2118f9a77c9fb"; + name = "kqtquickcharts-19.08.2.tar.xz"; }; }; krdc = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/krdc-19.08.1.tar.xz"; - sha256 = "319bccbc3c3274b89ae58679d063a303df4b95504b1bef97f925da70a0fbcbde"; - name = "krdc-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/krdc-19.08.2.tar.xz"; + sha256 = "c5e6193115afe742f25365bacb55aea21428acf38407659f77636217c589d8ff"; + name = "krdc-19.08.2.tar.xz"; }; }; kreversi = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kreversi-19.08.1.tar.xz"; - sha256 = "f4c691dcc5c7864c8201f7e06470e2856996c35c5317020e56822c48af0b810e"; - name = "kreversi-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kreversi-19.08.2.tar.xz"; + sha256 = "345c72ad38b9bd759f7569c7c0541c08a2cdad5ab92d08c1db8b6cf8ffaf1ce2"; + name = "kreversi-19.08.2.tar.xz"; }; }; krfb = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/krfb-19.08.1.tar.xz"; - sha256 = "3abe42f6e648f171fa38652fe03184725d1abcccf16bf1c1039ebada1f3c64c3"; - name = "krfb-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/krfb-19.08.2.tar.xz"; + sha256 = "08877020abf6b7ac38e393443c34e7791456fc5bea8c43c552551148fd67b67e"; + name = "krfb-19.08.2.tar.xz"; }; }; kross-interpreters = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kross-interpreters-19.08.1.tar.xz"; - sha256 = "d6acb31bd4c97364aa4a77767e012af32ecd0f560da939901a81be5776f2de49"; - name = "kross-interpreters-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kross-interpreters-19.08.2.tar.xz"; + sha256 = "e0c63d73441c08c1b5b6627e9c02172c72f079ac0baeb596849a49ad38f8723c"; + name = "kross-interpreters-19.08.2.tar.xz"; }; }; kruler = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kruler-19.08.1.tar.xz"; - sha256 = "040eef3746a660798e1701af6d9d17f4d091c30db9321dd5d37b172f5b91d59c"; - name = "kruler-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kruler-19.08.2.tar.xz"; + sha256 = "2a3c51a60f503807694cf49796b3bf82c6992ec4c0c15cf38adae92a8dbc24cc"; + name = "kruler-19.08.2.tar.xz"; }; }; kshisen = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kshisen-19.08.1.tar.xz"; - sha256 = "1631baaff368ca40a386c60998a9a491a2054a951f5b7311bea74f708d61d65f"; - name = "kshisen-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kshisen-19.08.2.tar.xz"; + sha256 = "3c18bc546f2dadcff03af2a25b6f468357967560b7fddf916aea2b27d22c2364"; + name = "kshisen-19.08.2.tar.xz"; }; }; ksirk = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ksirk-19.08.1.tar.xz"; - sha256 = "42e00d3591fbfbe1db6de4caad963606a0ca5ee9a224b757157594bebb8c733c"; - name = "ksirk-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ksirk-19.08.2.tar.xz"; + sha256 = "6016d929de52d6e03ae1c1ba483e5e505542f16edfbd37c8dfbb9d0913e7f7f8"; + name = "ksirk-19.08.2.tar.xz"; }; }; ksmtp = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ksmtp-19.08.1.tar.xz"; - sha256 = "71401abcbb6aedd2845c84bca65f77297722b3414f4d4caeaa6ac6b8f2edc46c"; - name = "ksmtp-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ksmtp-19.08.2.tar.xz"; + sha256 = "0d1308fd01f7261e78bedb465983be2ccf5a1514cfa31125e0a3488f67ab6590"; + name = "ksmtp-19.08.2.tar.xz"; }; }; ksnakeduel = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ksnakeduel-19.08.1.tar.xz"; - sha256 = "130e6545102a4e39f284a409213e9d45066ed27c077ff881839f33db78f62dd5"; - name = "ksnakeduel-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ksnakeduel-19.08.2.tar.xz"; + sha256 = "bb13aa91d0e75c1099a57606e0ea1f567a3ffe8f4efbf6a94420bd372ff10289"; + name = "ksnakeduel-19.08.2.tar.xz"; }; }; kspaceduel = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kspaceduel-19.08.1.tar.xz"; - sha256 = "47a6d9c78b1d24e80803b7e1765bb6de37157e9f1e733ef5ce50a54612c16bf9"; - name = "kspaceduel-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kspaceduel-19.08.2.tar.xz"; + sha256 = "3e2af55afcf78f74ca1fa67ea46da2db4cbc6fd9f522a94d3adb9bed6b518aa8"; + name = "kspaceduel-19.08.2.tar.xz"; }; }; ksquares = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ksquares-19.08.1.tar.xz"; - sha256 = "39fd1b73c3c13c3322a5658b8deed31261b0e68edc5cb9666ade374d5d9d8283"; - name = "ksquares-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ksquares-19.08.2.tar.xz"; + sha256 = "f16fa641f02a6462085d291ed8d3262891cdeeeff8bbbde4e0aabfdac3dc7bc9"; + name = "ksquares-19.08.2.tar.xz"; }; }; ksudoku = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ksudoku-19.08.1.tar.xz"; - sha256 = "cae801e0c595009e35aa11df370de421164f10d9840ae4dede2cd57f19cd6866"; - name = "ksudoku-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ksudoku-19.08.2.tar.xz"; + sha256 = "4630117e12c10c2f326a4e55dceed7f19d183b597eadc3d4308aecf5a5455156"; + name = "ksudoku-19.08.2.tar.xz"; }; }; ksystemlog = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ksystemlog-19.08.1.tar.xz"; - sha256 = "7dde2a350b32011027d6ab9648859218a053c5509ad08bce8c2de875d2ae73db"; - name = "ksystemlog-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ksystemlog-19.08.2.tar.xz"; + sha256 = "742bff9c71cc42d7a57a7732f039a944f60fe4dd70cf71c32f37ba914b57b5de"; + name = "ksystemlog-19.08.2.tar.xz"; }; }; kteatime = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kteatime-19.08.1.tar.xz"; - sha256 = "a4b80c5ca6f48c1d291a9502c43293cd0aa383f2e089b9435b02ff79b317c310"; - name = "kteatime-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kteatime-19.08.2.tar.xz"; + sha256 = "075470af370b7913fdb085dd6984da91f863b6c03a4b713854e85437e6f9cdbe"; + name = "kteatime-19.08.2.tar.xz"; }; }; ktimer = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktimer-19.08.1.tar.xz"; - sha256 = "f81af279e9e79bb3044718fa868973524e85df65dfaf654b8f45824b6f9d17cb"; - name = "ktimer-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktimer-19.08.2.tar.xz"; + sha256 = "81be41497e14f5fb72150e238805744c9b09463ac261cf5d7d2ca011a41a05a0"; + name = "ktimer-19.08.2.tar.xz"; }; }; ktnef = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktnef-19.08.1.tar.xz"; - sha256 = "bab23e40af2fe5ba2dd0be71687fbdd56d0868f2ef2a399721da88b12c65764f"; - name = "ktnef-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktnef-19.08.2.tar.xz"; + sha256 = "d8efabe72eedd5e89f3de9637a1a6d68ce670ec071e031470aa6852f9ad8561d"; + name = "ktnef-19.08.2.tar.xz"; }; }; ktouch = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktouch-19.08.1.tar.xz"; - sha256 = "d97ee5f253dd4e4d802bb8109c2e12d4d48bc7741686d07783e5687a499a2da7"; - name = "ktouch-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktouch-19.08.2.tar.xz"; + sha256 = "d36659c21d05465c7a77330dbfbbab09946093eac1db6c02147d81a838eba636"; + name = "ktouch-19.08.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-accounts-kcm-19.08.1.tar.xz"; - sha256 = "2f76fc870bd7a96540aa91054b3cac38b917f90c129fada86c3639815dfa27a5"; - name = "ktp-accounts-kcm-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-accounts-kcm-19.08.2.tar.xz"; + sha256 = "7995813bc983c80b200cddf6b0f55fa8c48be3297ee03e3e0a7601cbc86b8dd8"; + name = "ktp-accounts-kcm-19.08.2.tar.xz"; }; }; ktp-approver = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-approver-19.08.1.tar.xz"; - sha256 = "a446c23836f6e38bb739246595cf1773f4909279cf1522b96ccd6626ba36430a"; - name = "ktp-approver-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-approver-19.08.2.tar.xz"; + sha256 = "74670d519578486e05237f5085a51fe0a8ce833be413c06702f38b27b27913ec"; + name = "ktp-approver-19.08.2.tar.xz"; }; }; ktp-auth-handler = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-auth-handler-19.08.1.tar.xz"; - sha256 = "9a86ce184596cd54b914a7ff0424cadbee24b98f00b8736380e4153ee8596f64"; - name = "ktp-auth-handler-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-auth-handler-19.08.2.tar.xz"; + sha256 = "b13304909d8e66adc2a0658081fd41e72b0ef7513e041b9a8f3261a8ffd7bb22"; + name = "ktp-auth-handler-19.08.2.tar.xz"; }; }; ktp-call-ui = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-call-ui-19.08.1.tar.xz"; - sha256 = "bab48fcdc4f4a7becfeca99dbe9061b9d08a510f94548c6ebdf720100ddb5a4c"; - name = "ktp-call-ui-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-call-ui-19.08.2.tar.xz"; + sha256 = "0d735c34f937a436e82e994c9d60b851473d31b3dc07f1d2ec7eeeab63b83658"; + name = "ktp-call-ui-19.08.2.tar.xz"; }; }; ktp-common-internals = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-common-internals-19.08.1.tar.xz"; - sha256 = "985d55a259df9cb0593db50ac88bd5d3ab155c6e26563386230fe66294c3dc63"; - name = "ktp-common-internals-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-common-internals-19.08.2.tar.xz"; + sha256 = "b08cb6dc05e325c80f9d1753db23d1969fc6c2defc571401e7b2e87772721f7e"; + name = "ktp-common-internals-19.08.2.tar.xz"; }; }; ktp-contact-list = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-contact-list-19.08.1.tar.xz"; - sha256 = "a3ade7f7bacd53c90062923b488a7f60968a45d6d63890a618638f514dd3a5b2"; - name = "ktp-contact-list-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-contact-list-19.08.2.tar.xz"; + sha256 = "ab5778049e1351bc5cec29e3bfd98588f24b9877d385e787eb1f68715d624d34"; + name = "ktp-contact-list-19.08.2.tar.xz"; }; }; ktp-contact-runner = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-contact-runner-19.08.1.tar.xz"; - sha256 = "385bc8bebb7847cefdd17738ecaf03b102794ac7f38dc58ebe10d100385b769f"; - name = "ktp-contact-runner-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-contact-runner-19.08.2.tar.xz"; + sha256 = "6ec9fd151b98c2f48d1ef4361c063e83fe51562fc34868c032d39495ab38fb85"; + name = "ktp-contact-runner-19.08.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-desktop-applets-19.08.1.tar.xz"; - sha256 = "ec26ba5893998f1e5c293d40e5410a7170ae4e0dea46f03bd5241c51c3240951"; - name = "ktp-desktop-applets-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-desktop-applets-19.08.2.tar.xz"; + sha256 = "96975cf9208d215da1844619e2792be0919238a03ede71073813584042d6c774"; + name = "ktp-desktop-applets-19.08.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-filetransfer-handler-19.08.1.tar.xz"; - sha256 = "34f7eed85709524efaa89924de85842c3532b1ade8572fe28dc2e8ce3f6026eb"; - name = "ktp-filetransfer-handler-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-filetransfer-handler-19.08.2.tar.xz"; + sha256 = "cd2a8fb944e76b6a1ea4f8c956db2d9914a0d5bd472c3fac2e9b568144bf87ab"; + name = "ktp-filetransfer-handler-19.08.2.tar.xz"; }; }; ktp-kded-module = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-kded-module-19.08.1.tar.xz"; - sha256 = "323b538c08da82aaf66503463b4334bc603a37bb358fa6f1d5794562c05eed4f"; - name = "ktp-kded-module-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-kded-module-19.08.2.tar.xz"; + sha256 = "340bffd880fee602868cb44bc4c5474db1c34be62375298affedf3cc7eb1579f"; + name = "ktp-kded-module-19.08.2.tar.xz"; }; }; ktp-send-file = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-send-file-19.08.1.tar.xz"; - sha256 = "1e4f9348dab9546d344d00783d6a5ad93b9b299b96d551dd09325c95932cbcd2"; - name = "ktp-send-file-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-send-file-19.08.2.tar.xz"; + sha256 = "30a4a27b4c37c8ca75ebc407c6070395197b9b88ba8e422d7055eee93ec0ae9d"; + name = "ktp-send-file-19.08.2.tar.xz"; }; }; ktp-text-ui = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktp-text-ui-19.08.1.tar.xz"; - sha256 = "21c9c58bd498623a6bc9bbfa01c82548af29fdf7f690a359eb57ccd9a3de3105"; - name = "ktp-text-ui-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktp-text-ui-19.08.2.tar.xz"; + sha256 = "a0b7d8469b12ae6820541cc38dd57fad8866ad6e236c4864b7cf94629ca0cc33"; + name = "ktp-text-ui-19.08.2.tar.xz"; }; }; ktuberling = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/ktuberling-19.08.1.tar.xz"; - sha256 = "b373c7552ff695e7d3428b7f2551315de00786177a5dc4bb96f777bdb84887cc"; - name = "ktuberling-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/ktuberling-19.08.2.tar.xz"; + sha256 = "e6cfcd7175c7ed081ecd743c2fdd845f88b25d6cb4d46f9e6d58e35eb11c66ad"; + name = "ktuberling-19.08.2.tar.xz"; }; }; kturtle = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kturtle-19.08.1.tar.xz"; - sha256 = "5643434e861391471674e6cf86347c362b076e1d3fe1396022b5080b899bf934"; - name = "kturtle-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kturtle-19.08.2.tar.xz"; + sha256 = "1f1245c444aba511aea0630f80953171dd11334f55f6b9547a844e25293cf833"; + name = "kturtle-19.08.2.tar.xz"; }; }; kubrick = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kubrick-19.08.1.tar.xz"; - sha256 = "51ff60a682c69f829af7f7e4748128d48e691aacd584379e099c437473a45c03"; - name = "kubrick-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kubrick-19.08.2.tar.xz"; + sha256 = "89c181f8c82db143cd671fe78105e95a229e43fd64cab17ccdb80774b4ca8638"; + name = "kubrick-19.08.2.tar.xz"; }; }; kwalletmanager = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kwalletmanager-19.08.1.tar.xz"; - sha256 = "b6206da5001f79b67264f641210925b0400b41dc59562b978d402b9524835c14"; - name = "kwalletmanager-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kwalletmanager-19.08.2.tar.xz"; + sha256 = "5c0cd648d6bf4515cd71b4575ab8051004dcf505c2bfe502fb42b7ba01cb51b2"; + name = "kwalletmanager-19.08.2.tar.xz"; }; }; kwave = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kwave-19.08.1.tar.xz"; - sha256 = "6febc3d01c15f94fa0f75a731a375b76642c2cdce9afc373a5c1e92fb3753891"; - name = "kwave-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kwave-19.08.2.tar.xz"; + sha256 = "7836b7737d3f578f6d44b40dddf8b3abae53eaa84b3352bfed242eb6ef3d5604"; + name = "kwave-19.08.2.tar.xz"; }; }; kwordquiz = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/kwordquiz-19.08.1.tar.xz"; - sha256 = "ead21c1caa1d1665a8ef685c4b46a442b7423aba63153617008985e84ff4c318"; - name = "kwordquiz-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/kwordquiz-19.08.2.tar.xz"; + sha256 = "9bb9abc4058b8520a9229317d7da6cbbddb8a715549ca487c04af5f9eb425019"; + name = "kwordquiz-19.08.2.tar.xz"; }; }; libgravatar = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libgravatar-19.08.1.tar.xz"; - sha256 = "d39d6970b5113b2b805b048ca9b14770ab16d59c8ec755b0c5f6d4f7d6df73a2"; - name = "libgravatar-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libgravatar-19.08.2.tar.xz"; + sha256 = "393370a9d7d4a74627469b2e67bb3f7a0ef73dac8b11a3ab5af6c384c20a0de5"; + name = "libgravatar-19.08.2.tar.xz"; }; }; libkcddb = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkcddb-19.08.1.tar.xz"; - sha256 = "f73d3f802e1ffec6b75246505cbec5a7baa328b808c23b42608e05fd8c7b30a5"; - name = "libkcddb-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkcddb-19.08.2.tar.xz"; + sha256 = "f3e4c650b0abe10f281037bd6c805243a656fecdfc046a8586324c760ba90e48"; + name = "libkcddb-19.08.2.tar.xz"; }; }; libkcompactdisc = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkcompactdisc-19.08.1.tar.xz"; - sha256 = "53d206967d98e9ee8254aca58d1ba34458761106c323deb449fa94bed1e24037"; - name = "libkcompactdisc-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkcompactdisc-19.08.2.tar.xz"; + sha256 = "e185f528a4c6fea1b789186fe64a183197afc447c8cb939c9b6b9957f60d04e0"; + name = "libkcompactdisc-19.08.2.tar.xz"; }; }; libkdcraw = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkdcraw-19.08.1.tar.xz"; - sha256 = "b159a669cb4c01770c363b4dd53033248402d37b29acb416ec45e71ac12449e2"; - name = "libkdcraw-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkdcraw-19.08.2.tar.xz"; + sha256 = "735ab40633efec394c6265d83f86ad7caf278f63d1dd33cc6edf572da4925fcb"; + name = "libkdcraw-19.08.2.tar.xz"; }; }; libkdegames = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkdegames-19.08.1.tar.xz"; - sha256 = "1b365627bd0a3a42a32a0a8d401b53d2ac09f0f9cf040b4b0483c5574991b774"; - name = "libkdegames-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkdegames-19.08.2.tar.xz"; + sha256 = "83456cec44502a1f79c0be00c983090e32fd8aea5fec1461fbfbd37b5f8866ac"; + name = "libkdegames-19.08.2.tar.xz"; }; }; libkdepim = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkdepim-19.08.1.tar.xz"; - sha256 = "46966eaae2bc71a5bab0c22bcfff858e299d7f1cec2203c1d12cebbc084ee9ce"; - name = "libkdepim-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkdepim-19.08.2.tar.xz"; + sha256 = "67578e4c98e7e5d94249144e3720ae5fbc17231d4ecc46cb0e1be6e7ced4a71b"; + name = "libkdepim-19.08.2.tar.xz"; }; }; libkeduvocdocument = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkeduvocdocument-19.08.1.tar.xz"; - sha256 = "9e7eb36b0c649231a792f618b28fd110b3782ea086cce81436191e9f73c6674e"; - name = "libkeduvocdocument-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkeduvocdocument-19.08.2.tar.xz"; + sha256 = "74338cb3fcb9346a981585484f758aabd372d1a43afe9facd93d94c229424250"; + name = "libkeduvocdocument-19.08.2.tar.xz"; }; }; libkexiv2 = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkexiv2-19.08.1.tar.xz"; - sha256 = "bee9a16eda002146b42f358b0dc58c5db832719870761264cc6cf0a199ab0537"; - name = "libkexiv2-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkexiv2-19.08.2.tar.xz"; + sha256 = "abdafabe834862e157356f2686ae871f00302d82ae639dbf89030d19ccc54b1b"; + name = "libkexiv2-19.08.2.tar.xz"; }; }; libkgapi = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkgapi-19.08.1.tar.xz"; - sha256 = "1ad2491348cc97f591aa681f7a649f2337c9a92e845980304c1110c69eecd579"; - name = "libkgapi-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkgapi-19.08.2.tar.xz"; + sha256 = "b220908dd4a21e589a25b964b7786f1154f63ca98bf90c43ced3120adf4fb0a6"; + name = "libkgapi-19.08.2.tar.xz"; }; }; libkgeomap = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkgeomap-19.08.1.tar.xz"; - sha256 = "aed369217007698beaa3230bf5b5360602d44ca6d333026158b15666f3670555"; - name = "libkgeomap-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkgeomap-19.08.2.tar.xz"; + sha256 = "145692b900d87a84b74507b53ddc05947e6c1cce46381d8960559b5907296219"; + name = "libkgeomap-19.08.2.tar.xz"; }; }; libkipi = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkipi-19.08.1.tar.xz"; - sha256 = "ec2012821c90062e43ad7c77861ab519b24aea429ed9f0b7bdf6ef9c00e82ba4"; - name = "libkipi-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkipi-19.08.2.tar.xz"; + sha256 = "fcaf576afb961d9a36c1f69c034c43b9f0991cbd0726ea684c2c49096f36d5c6"; + name = "libkipi-19.08.2.tar.xz"; }; }; libkleo = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkleo-19.08.1.tar.xz"; - sha256 = "5808a40d9c9358048d558a4c96f90e8c51b2dab3588ab3c678b02d5810020a31"; - name = "libkleo-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkleo-19.08.2.tar.xz"; + sha256 = "0acf296ffb0144096071e47ce1365b9e5b07b59cad4700f89c875c7bee4573bd"; + name = "libkleo-19.08.2.tar.xz"; }; }; libkmahjongg = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkmahjongg-19.08.1.tar.xz"; - sha256 = "c4e3a29bb923ead76f1fb528fa62c677423ebb4ac07dd149a6fc3f6ae055eb39"; - name = "libkmahjongg-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkmahjongg-19.08.2.tar.xz"; + sha256 = "8699949fae90c0e92dd046b904b0624f79c37fecaa46557c808f20f24e215947"; + name = "libkmahjongg-19.08.2.tar.xz"; }; }; libkomparediff2 = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libkomparediff2-19.08.1.tar.xz"; - sha256 = "a020ba9287ee084a0f5a10896f1559f11aff1c97957405f47deeda32a0874b31"; - name = "libkomparediff2-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libkomparediff2-19.08.2.tar.xz"; + sha256 = "c5738f96dbda3d7272ad08ff9518722ae9b7ee737ab7e27c9e88cedb418371d7"; + name = "libkomparediff2-19.08.2.tar.xz"; }; }; libksane = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libksane-19.08.1.tar.xz"; - sha256 = "215fae62d8ea1f70908cafc5bc8667c02d4f0329669d056c99443a7b14a6e589"; - name = "libksane-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libksane-19.08.2.tar.xz"; + sha256 = "97e05423f4a9205b9db0bbce5111615d6bf8e8d53a391d3398275babccd91aa0"; + name = "libksane-19.08.2.tar.xz"; }; }; libksieve = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/libksieve-19.08.1.tar.xz"; - sha256 = "ab384877148710e7de92e88a192f52beaad667804bbc641b63c21cfdaa0aee31"; - name = "libksieve-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/libksieve-19.08.2.tar.xz"; + sha256 = "5c5bb9182e53a2a928d70985f6dd514c8b308891c4899b942784e80d221318f6"; + name = "libksieve-19.08.2.tar.xz"; }; }; lokalize = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/lokalize-19.08.1.tar.xz"; - sha256 = "fe1e1f8fb2f2ad3cde1830b2ddbcce0e41ffe5696c6e32b0639c8931967b3943"; - name = "lokalize-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/lokalize-19.08.2.tar.xz"; + sha256 = "3fe3af9f647bcda7f89eab5c3ebb7bce4e9ceb0b7cfb5206c2f6ecdf9cdbe3ee"; + name = "lokalize-19.08.2.tar.xz"; }; }; lskat = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/lskat-19.08.1.tar.xz"; - sha256 = "e4b073cc65be0f1e7e01b4b2aa28bed30480aef097f5185eb608b4e45b9352e9"; - name = "lskat-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/lskat-19.08.2.tar.xz"; + sha256 = "3ae219b92cbc4c9acfacbb16e262e82b03cd5ddba024820e82d8de7312327a9c"; + name = "lskat-19.08.2.tar.xz"; }; }; mailcommon = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/mailcommon-19.08.1.tar.xz"; - sha256 = "3fb6f09ce8bc9ccddfa1420fa1a7c60a47065afdfbb5a30292179efbcebba833"; - name = "mailcommon-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/mailcommon-19.08.2.tar.xz"; + sha256 = "39df1544c0278600d5a1a57697835828358ae44203087e29430ce1bd0c355e20"; + name = "mailcommon-19.08.2.tar.xz"; }; }; mailimporter = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/mailimporter-19.08.1.tar.xz"; - sha256 = "4236938a2dca5ea0bc572afbe76ae28fc6ad1e65f383743de98a4e505f674962"; - name = "mailimporter-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/mailimporter-19.08.2.tar.xz"; + sha256 = "27780c381919ebc9e6fc0de7021cd03277dd3962d4c4c15770fcf44cd6126814"; + name = "mailimporter-19.08.2.tar.xz"; }; }; marble = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/marble-19.08.1.tar.xz"; - sha256 = "7e09e3037287be117e47de402d1f5ea7dd49f625ccf4a46d1d016a527d487e9e"; - name = "marble-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/marble-19.08.2.tar.xz"; + sha256 = "4add63522a51fdea7b425f29bd3d35c558a0b881336ff6a90bfc07483acbf6a6"; + name = "marble-19.08.2.tar.xz"; }; }; mbox-importer = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/mbox-importer-19.08.1.tar.xz"; - sha256 = "3f4c96ee65ffa0488df09522e1bda2ea38c0adf420ae66fff11f670566c5536c"; - name = "mbox-importer-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/mbox-importer-19.08.2.tar.xz"; + sha256 = "644175d6fcb66b878309de899f4a3e060e29d4f31ce337d44ee6e1af5901044f"; + name = "mbox-importer-19.08.2.tar.xz"; }; }; messagelib = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/messagelib-19.08.1.tar.xz"; - sha256 = "ec43d913028124a49eaa440e4b55dba23b6ab503728b897a3ad8e1fc5e446802"; - name = "messagelib-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/messagelib-19.08.2.tar.xz"; + sha256 = "d761e94d2fa71c2de6a52e0c1756f52f0006ada35711189b343eccdafe0a0390"; + name = "messagelib-19.08.2.tar.xz"; }; }; minuet = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/minuet-19.08.1.tar.xz"; - sha256 = "524c389060c13b37a3df4662ca9ca5e2862d20ea71f47b1a5157a088d2d065d4"; - name = "minuet-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/minuet-19.08.2.tar.xz"; + sha256 = "1713ac758388443bbd1e2f5158cba594c35c3afdc5122a993fc66d70b07eb904"; + name = "minuet-19.08.2.tar.xz"; }; }; okular = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/okular-19.08.1.tar.xz"; - sha256 = "9e363b73febd5da1a17e53a8f89914784b555c1f0085ddc0f55ef56082b0bd54"; - name = "okular-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/okular-19.08.2.tar.xz"; + sha256 = "ff3d2eac444a110a611add71c30b0556085f5aaccdd821a80bd070a646c9f6b3"; + name = "okular-19.08.2.tar.xz"; }; }; palapeli = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/palapeli-19.08.1.tar.xz"; - sha256 = "c9eeafe854529ea5a09e9ef6fd37b8be3d0d370322938c009c826bd936953adc"; - name = "palapeli-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/palapeli-19.08.2.tar.xz"; + sha256 = "bae810595c7ba7bdac0fa5c27e6c2a3a9bb1bbdae3521cfc036ec0cdcd9ef1a7"; + name = "palapeli-19.08.2.tar.xz"; }; }; parley = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/parley-19.08.1.tar.xz"; - sha256 = "6ee4d538ddaecd5b6c3d855db62a4b5061240b2089b3dcc592712398fd1d066b"; - name = "parley-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/parley-19.08.2.tar.xz"; + sha256 = "1201945d55657d6b89e309220edb1a60a61debf0bbf59b508d1c0a21a8dc407e"; + name = "parley-19.08.2.tar.xz"; }; }; picmi = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/picmi-19.08.1.tar.xz"; - sha256 = "47e0dd79ee4ae86d8be6822f9328fac2f00ce68cf862202e889c0f77a88d0d91"; - name = "picmi-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/picmi-19.08.2.tar.xz"; + sha256 = "ecfa211043327991a0927be852c185223adebe5f15cdc39e79e31022802f904b"; + name = "picmi-19.08.2.tar.xz"; }; }; pimcommon = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/pimcommon-19.08.1.tar.xz"; - sha256 = "5956e2767ea88efd73cbefef9cb80d16bb4cb5cb63857975fbb6ead1b984026c"; - name = "pimcommon-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/pimcommon-19.08.2.tar.xz"; + sha256 = "ccdf2624a055a9db31b0b8109c791776d111ae91438f41ed50dcb9faca287e4c"; + name = "pimcommon-19.08.2.tar.xz"; }; }; pim-data-exporter = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/pim-data-exporter-19.08.1.tar.xz"; - sha256 = "766e8b15f7853d84629bc49ad33aa59291d6d95cfd9db279e9e0ad70b0fab1fe"; - name = "pim-data-exporter-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/pim-data-exporter-19.08.2.tar.xz"; + sha256 = "e4703d7a10935814738394a38c5ad54f9923c58e43c397e2e78a4b1b1176f4c2"; + name = "pim-data-exporter-19.08.2.tar.xz"; }; }; pim-sieve-editor = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/pim-sieve-editor-19.08.1.tar.xz"; - sha256 = "b49045d7326cf0ca7fabbf58d8508d61986701887871c4df53fad1f960a64438"; - name = "pim-sieve-editor-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/pim-sieve-editor-19.08.2.tar.xz"; + sha256 = "ae9f7de78ab9adffe2575bf1367b1ae4928afee1fd299bb91ca2d26b3bb86c03"; + name = "pim-sieve-editor-19.08.2.tar.xz"; }; }; poxml = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/poxml-19.08.1.tar.xz"; - sha256 = "d38dce3114b01bc72163329dac629c4e5d36db15e09d52dd0ffbcaa645408d98"; - name = "poxml-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/poxml-19.08.2.tar.xz"; + sha256 = "c5e36bd10d3a8d0474f903eebd45e026ca306beb74829c43a1e7be4ed34ca9e8"; + name = "poxml-19.08.2.tar.xz"; }; }; print-manager = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/print-manager-19.08.1.tar.xz"; - sha256 = "b1fd9aa067329a4f5bb715e7db736160954bbec303be0ba5bc8f98852071e731"; - name = "print-manager-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/print-manager-19.08.2.tar.xz"; + sha256 = "c0702208b6f485e2e44337aaf203b9e391adda22d6526bf0dd34b31230e0fb05"; + name = "print-manager-19.08.2.tar.xz"; }; }; rocs = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/rocs-19.08.1.tar.xz"; - sha256 = "eaa2fefae8123071e5802d0c13016d0b99608f91c75c7c6e4fbe6f2c6dc12adf"; - name = "rocs-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/rocs-19.08.2.tar.xz"; + sha256 = "4e61226334f79a260f0ccc7789a099a91c7643d9fdfcdd052b002f2fe6f64885"; + name = "rocs-19.08.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/signon-kwallet-extension-19.08.1.tar.xz"; - sha256 = "7d558509cf015641c76d4203c8dadc4e9720278fb39b4561eb2bce4e5412bb83"; - name = "signon-kwallet-extension-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/signon-kwallet-extension-19.08.2.tar.xz"; + sha256 = "2521cd2c4f25717f5caf9915474f75614be7dec7053f1e94c1429fac7045cc29"; + name = "signon-kwallet-extension-19.08.2.tar.xz"; }; }; spectacle = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/spectacle-19.08.1.tar.xz"; - sha256 = "21057fd4990048df33f5d739fc98af2a555ca4b7db50688333fecabc12f24786"; - name = "spectacle-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/spectacle-19.08.2.tar.xz"; + sha256 = "4cf2f0903cec2787a03a8bbdbd219acc29ac412f352a4ff94ef50ae9a6eb459e"; + name = "spectacle-19.08.2.tar.xz"; }; }; step = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/step-19.08.1.tar.xz"; - sha256 = "533750dda4adcd0f3d8ec269103f35ee1ab4b4e9eae9721522b1b278660577a6"; - name = "step-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/step-19.08.2.tar.xz"; + sha256 = "dede94c073b2903fa4fa6806623cb980ebe93d15cc76376aadac4ca8cd61a96c"; + name = "step-19.08.2.tar.xz"; }; }; svgpart = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/svgpart-19.08.1.tar.xz"; - sha256 = "4ed6277d3f2c12a4a53dd308911c613af5ae65f53819aeacf42e08dcd08dbd5b"; - name = "svgpart-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/svgpart-19.08.2.tar.xz"; + sha256 = "6c6510b604bba3aebbeca136ec9534c416bc0ba55125227bdd0af2a86052855c"; + name = "svgpart-19.08.2.tar.xz"; }; }; sweeper = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/sweeper-19.08.1.tar.xz"; - sha256 = "cc539649fa4a2698ad07653f9427981381bf8b5344f05dab76acdf1704b4479a"; - name = "sweeper-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/sweeper-19.08.2.tar.xz"; + sha256 = "da65cbfc952d8b63ddfbcba373d9a828ef5acefc68196ddd4c2c602c672cbb5f"; + name = "sweeper-19.08.2.tar.xz"; }; }; umbrello = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/umbrello-19.08.1.tar.xz"; - sha256 = "ce56fa6d96bbc78cf69246d6f45e9b098f8fcc75d7771875a8e638b01bbf6efa"; - name = "umbrello-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/umbrello-19.08.2.tar.xz"; + sha256 = "69a721d27ecedbe694d232e04469002dcf2319dd320982aacc2a02e32430c382"; + name = "umbrello-19.08.2.tar.xz"; }; }; yakuake = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/yakuake-19.08.1.tar.xz"; - sha256 = "184fec9d07505faf820821e197582f7733694848cc17e71ee4f525772e78fc10"; - name = "yakuake-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/yakuake-19.08.2.tar.xz"; + sha256 = "3ebf477069c85a8705302b6b51902a74af7bb92349fab41000f71484a4de5aee"; + name = "yakuake-19.08.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.08.1"; + version = "19.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.1/src/zeroconf-ioslave-19.08.1.tar.xz"; - sha256 = "0c5f8931dd2997345fc6d3e8ef73c36615a73f8c906fb6be9c27432bc038000a"; - name = "zeroconf-ioslave-19.08.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.2/src/zeroconf-ioslave-19.08.2.tar.xz"; + sha256 = "19e31534d1a4503d1dd4bd8ef60cfb48a91ee167dd4b0db99e53b318a355dae0"; + name = "zeroconf-ioslave-19.08.2.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 4997a9c7f2ac..06321d9d6218 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,19 +1,59 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, libxml2, desktop-file-utils, wrapGAppsHook, evolution-data-server, gtkspell3, gpgme, libcryptui -, glib, gtk3, gtksourceview3, sqlite, cairo, atk, gcr, gnome3 }: +{ stdenv +, fetchurl +, atk +, cairo +, desktop-file-utils +, evolution-data-server +, gcr +, gettext +, glib +, gnome3 +, gpgme +, gtk3 +, gtksourceview3 +, gtkspell3 +, libcryptui +, libxml2 +, meson +, ninja +, pkgconfig +, sqlite +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "almanah"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1g0fyykq8bs3x1xqc0l0bk9zazcrxja784m68myymv1zfqqnp9h0"; + sha256 = "09rxx4s4c34d1axza6ayss33v78p44r9bpx058shllh1sf5avpcb"; }; - nativeBuildInputs = [ pkgconfig intltool libxml2 desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ + desktop-file-utils + gettext + libxml2 + meson + ninja + pkgconfig + wrapGAppsHook + ]; - buildInputs = [ glib gtk3 gtksourceview3 sqlite cairo atk gcr gtkspell3 evolution-data-server gnome3.evolution gpgme libcryptui ]; + buildInputs = [ + atk + cairo + evolution-data-server + gcr + glib + gnome3.evolution + gpgme + gtk3 + gtksourceview3 + gtkspell3 + libcryptui + sqlite + ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 04cf627b2818..702a9c585a31 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1qnai8vmgy5lx3lapw96j41i8mw9p6r99i3qzs709l9yzrix6l86"; + sha256 = "1wf60qr0wqsci5skp55qr8h56s3x5s2icxbn58ia9s4a5hhvnsmf"; }; materials = fetchFromGitHub { diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 6d04cef76ce7..590e4cdc4cba 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "exercism"; - version = "3.0.11"; + version = "3.0.12"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "1wg23bvibsk6j4iqwyw35wl9plfwdqxiql81zci7r1x4d5cp26av"; + sha256 = "1xvxcl7j5izx5lgmjd97zd28lg2sydwgbgn2cnisz5r0d27pj3ra"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index c38a27d55e63..38d69406da45 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "nnn"; - version = "2.5"; + version = "2.7"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "0hvb0q6jg2nmvb40q43jj7v45afkjgcq6q9ldmmrh5558d0n65cw"; + sha256 = "19kiikjblkq3bx2j6h3f2d467p2v582albqr7nbrm9c1yg4qx38z"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { # shell completions postInstall = '' - install -Dm555 scripts/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash - install -Dm555 scripts/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions - install -Dm555 scripts/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d + install -Dm555 misc/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash + install -Dm555 misc/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions + install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d ''; meta = { diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index a795c4485160..f3cd6fdb0f62 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig -, boost, curl, expat, glew, libpng, tbb, wxGTK30 +, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK30 , gtest, nlopt, xorg, makeDesktopItem }: let @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.0.0"; + version = "2.1.0"; enableParallelBuilding = true; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pkgconfig ]; - # We could add Eigen, but it doesn't currently compile with the version in - # nixpkgs. buildInputs = [ boost + cereal curl + eigen expat glew libpng @@ -40,10 +40,15 @@ stdenv.mkDerivation rec { # We need to set the path via the NLOPT environment variable instead. NLOPT = nlopt; + # Disable compiler warnings that clutter the build log + # It seems to be a known issue for Eigen: + # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 + NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; + prePatch = '' # In nix ioctls.h isn't available from the standard kernel-headers package - # on other distributions. As the copy in glibc seems to be identical to the - # one in the kernel, we use that one instead. + # like in other distributions. The copy in glibc seems to be identical to the + # one in the kernel though, so we use that one instead. sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' src/libslic3r/GCodeSender.cpp '' + lib.optionalString (lib.versionOlder "2.5" nloptVersion) '' # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx @@ -54,7 +59,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "135wn2sza2f2kvbja1haxil5kx1b74lc1i7dsa35i1y3phabykhz"; + sha256 = "172nz01iiqfjzkpcbl78j6almq6av70l71jgrzrcdw6ham1wqnpr"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index cd232088b5bb..13ae1f1ba7d3 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, makeWrapper, libXScrnSaver }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: let src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji"; + sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji"; + sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10"; }; -in stdenv.mkDerivation { +in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.14.3.1"; + name = "rescuetime-2.14.5.2"; inherit src; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 dontStrip = true; unpackPhase = '' diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index e747531b9e75..15c675c902fb 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,14 +1,25 @@ -{ stdenv, fetchFromGitHub -, vala, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas -, gnome3, pantheon, gobject-introspection, wrapGAppsHook -, gtk3, json-glib, glib, glib-networking +{ stdenv +, fetchFromGitHub +, fetchpatch +, vala +, meson +, ninja +, pkgconfig +, python3 +, libgee +, gsettings-desktop-schemas +, gnome3 +, pantheon +, wrapGAppsHook +, gtk3 +, json-glib +, glib +, glib-networking }: -let +stdenv.mkDerivation rec { pname = "tootle"; version = "0.2.0"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bleakgrey"; @@ -18,7 +29,6 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig @@ -26,20 +36,36 @@ in stdenv.mkDerivation { vala wrapGAppsHook ]; + buildInputs = [ - gtk3 pantheon.granite json-glib glib glib-networking - libgee gnome3.libsoup gsettings-desktop-schemas + glib + glib-networking + gnome3.libsoup + gsettings-desktop-schemas + gtk3 + json-glib + libgee + pantheon.granite + ]; + + patches = [ + # Fix build with Vala 0.46 + # https://github.com/bleakgrey/tootle/pull/164 + (fetchpatch { + url = "https://github.com/worldofpeace/tootle/commit/0a88bdad6d969ead1e4058b1a19675c9d6857b16.patch"; + sha256 = "0xyx00pgswnhxxbsxngsm6khvlbfcl6ic5wv5n64x7klk8rzh6cm"; + }) ]; postPatch = '' - chmod +x ./meson/post_install.py - patchShebangs ./meson/post_install.py + chmod +x meson/post_install.py + patchShebangs meson/post_install.py ''; meta = with stdenv.lib; { description = "Simple Mastodon client designed for elementary OS"; - homepage = https://github.com/bleakgrey/tootle; - license = licenses.gpl3; + homepage = https://github.com/bleakgrey/tootle; + license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index a80210542c53..057118567439 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.255"; + version = "32.0.0.270"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1rqb54kqxq66vvqk5yrr3rsy3wcj9r9wnkngk27c7jayzm6bwgvv"; + sha256 = "1z8nfw7b3dsy79gb50bmmdjz66j5gx6m0hkw1abp35xdgh2sz2ak"; stripRoot = false; }; @@ -81,7 +81,11 @@ let dontStrip = true; - meta.platforms = platforms.x86_64; + meta = { + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + platforms = platforms.x86_64; + }; }; in { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index fb3a6723817b..29954e4129e0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.255"; + version = "32.0.0.270"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1hd5z8qmki36k2wdwgg3v4sj32g8590r5563gdrjrk7bmrqfjnji" + "1c3dn4gkl40i5sjkvpbkn9fl82vjhy1v7dhrayk3ncfsxcyvbcm0" else - "0y13bxdgkxaqsyab09skiqj8dfjw76n2lr7p525ba8lbfbc8xj52" + "1g7i9mihn5g9i71xyf805k19yk41vsr85gzk87gm426m0hcgg89i" else if arch == "x86_64" then - "0qkslkaiw3c9xk1rjcl4x9d0fi6i91k7g01mf0gq28wgzcyz4cw7" + "16lxgkbr2hg49vhc7414zkh1kblhysf779854faay308ml3i5kdw" else - "0qblmaa3nq1g7825yhvz98pvd1591q3q7bsrhv5bbhdbmb9c1qd5"; + "0jrdzm8pw7aq32w7m4rvkhj7mmqyddh5yxpj7q3d9hxrwshkikvj"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 527eb2610067..27ec18aa6c88 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.255"; + version = "32.0.0.270"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1igc23mljmw1bw6fwx3rwpz7kxiy8n5znkng20w3yin2zh8qw8sy" + "0k5azrl92hkbn7adjz7s2lv8h59n7gsjrcprqdc485i4f7sjmkwj" else - "0rfvgx1g0s8wswwpmfjx6p59yh1cxya3x3bczbissrq4rcb1v315"; + "1la5s4wxchfpl8in576xj675yrg84pify22pwf063h0jg3rdgi68"; }; nativeBuildInputs = [ unzip ]; @@ -97,7 +97,7 @@ stdenv.mkDerivation { description = "Adobe Flash Player standalone executable"; homepage = https://www.adobe.com/support/flashplayer/debug_downloads.html; license = stdenv.lib.licenses.unfree; - maintainers = []; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" ]; # Application crashed with an unhandled SIGSEGV # Not on all systems, though. Video driver problem? diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index 2b2e173342c5..9b537c553376 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "next"; - version = "1.3.1"; + version = "1.3.4"; src = fetchFromGitHub { owner = "atlas-engineer"; repo = "next"; rev = version; - sha256 = "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj"; + sha256 = "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"; }; # Stripping destroys the generated SBCL image @@ -25,32 +25,38 @@ stdenv.mkDerivation rec { --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" ''; - nativeBuildInputs = [ sbcl makeWrapper ]; + nativeBuildInputs = + [ sbcl makeWrapper ] ++ (with lispPackages; + [ prove-asdf trivial-features ]); + buildInputs = with lispPackages; [ - trivial-features - trivial-garbage alexandria bordeaux-threads + cl-annot + cl-ansi-text + cl-css + cl-hooks cl-json cl-markup cl-ppcre cl-ppcre-unicode + cl-prevalence closer-mop + dbus dexador ironclad + local-time + log4cl lparallel + mk-string-metrics parenscript quri - cl-css - log4cl - mk-string-metrics sqlite str swank trivia trivial-clipboard unix-opts - dbus ]; propagatedBuildInputs = [ next-gtk-webkit ]; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index d9d4fda1aedd..0437ab933bd7 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, wrapGAppsHook , glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk +, xorg, dmenu, findutils, gnused, coreutils , patches ? null }: @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + # Add run-time dependencies to PATH. Append them to PATH so the user can + # override the dependencies with their own PATH. + preFixup = let + depsPath = lib.makeBinPath [ xorg.xprop dmenu findutils gnused coreutils ]; + in '' + gappsWrapperArgs+=( + --suffix PATH : ${depsPath} + ) + ''; + meta = with stdenv.lib; { description = "A simple web browser based on WebKit/GTK"; longDescription = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index c95a996abeba..1297a4618310 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.8.1664.40-1"; + version = "2.8.1664.44-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "07v7p3r9yc566xkwhiazd80pj2d6rcvs3xnbnwjambi1rajbs5sx"; + sha256 = "0z1d03zw0jhvi14n06qfdr1n63idq56ly7mgiv27s21zvdma887k"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 16056d9185b5..fcc55c5e1d05 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -714,4 +714,11 @@ version = "0.2.0"; sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; }; + wavefront = + { + owner = "spaceapegames"; + repo = "terraform-provider-wavefront"; + version = "2.1.0"; + sha256 = "1ir2wkg5mfng7h5544kar1arkjb5ffjhki5qr25a5x0rpwlg99sx"; + }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt index 286e3d6efe04..d04f85fe455a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt @@ -20,3 +20,6 @@ tweag/terraform-provider-secret # include terraform-provider-segment ajbosco/terraform-provider-segment + +# include terraform-provider-wavefront +spaceapegames/terraform-provider-wavefront diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index f7a9521c9937..8ff8041e467b 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,14 +3,14 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.16.1"; + version = "2.17.1"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz"; - sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0"; + sha256 = "15qr2y35yvl0hzsf34d863n8v042v78ks6ksh5p1awvi055x5sy1"; }; - cargoSha256 = "0ck2dgfk4fay4cjl66wqkbnq4rqrd717jl63l1mvqmvad9i19igm"; + cargoSha256 = "0db4j6y43gacazrvcmq823fzl5pdfdlg8mkjpysrw6h9fxisq83f"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 3cd5fe4b8ea5..62f755c4d7c7 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -16,6 +16,7 @@ , libpcap , libyaml , luajit +, lz4 , nspr , nss , pcre @@ -29,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "02901wjf90171rhkymcgp0h48hkn3wv8iwrhz4d8ppraz68hv99d"; + sha256 = "0jy738rs3ds1gbn8hv26ck23z9k6pjrjxdpavkyn7znpbi9zdrff"; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { libpcap libyaml luajit + lz4 nspr nss pcre @@ -86,7 +88,7 @@ stdenv.mkDerivation rec { "--with-libnet-libraries=${libnet}/lib" ] ++ lib.optional hyperscanSupport [ - "--with-libhs-includes=${hyperscan}/include" + "--with-libhs-includes=${hyperscan.dev}/include/hs" "--with-libhs-libraries=${hyperscan}/lib" ] ++ lib.optional redisSupport [ "--enable-hiredis" ] diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6bedde3ebd64..a54c4f4955aa 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,36 +1,36 @@ { branch ? "stable", pkgs }: - +# Generated by /maintainers/scripts/update-discord let inherit (pkgs) callPackage fetchurl; in { - stable = callPackage ./base.nix { + stable = callPackage ./base.nix rec { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; version = "0.0.9"; src = fetchurl { - url = "https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.tar.gz"; + url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf"; }; }; - ptb = callPackage ./base.nix { + ptb = callPackage ./base.nix rec { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; version = "0.0.16"; src = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/linux/0.0.16/discord-ptb-0.0.16.tar.gz"; + url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; sha256 = "1ia94xvzygim9rx1sjnnss518ggw0i20mhp9pby33q70ha35n0aq"; }; }; - canary = callPackage ./base.nix { + canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.96"; + version = "0.0.97"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.96/discord-canary-0.0.96.tar.gz"; - sha256 = "1fxyh9v5xglwbgr5sidn0cv70qpzcd2q240wsv87k3nawhvfcwsp"; + url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; + sha256 = "17kwgk2kwrfqgjqmfv055gvlqq144gz7bywwrs6i2x7mimz4345x"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 5ca28fca7a79..d7741bda646e 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchFromGitHub, cmake -, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell +, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine +, libidn, qca2-qt5, qtkeychain, libXScrnSaver, hunspell , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.504"; + version = "1.4.904"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q"; + sha256 = "1bs7yk3qp91sm8nb9gna8vm59381afn1wfs7aii9yi29bhx6fw9h"; }; resources = fetchFromGitHub { owner = "psi-plus"; repo = "resources"; - rev = "d623f57db35eb5af81ccdf69b2cbe1c437190f29"; - sha256 = "024cyazyxka5vcbjrkkw32c5zw6aa70n50fdp6zh5v5c51d9ci8k"; + rev = "182c92ca0bcc055579d8c91bccba9efe157e77a9"; + sha256 = "06k7q63cxpifpzjnlw1snclkr2mwf9fh71cgfd40n7jgzswzwhpb"; }; postUnpack = '' @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit - libidn qca2-qt5 libXScrnSaver hunspell + qtbase qtmultimedia qtx11extras qttools qtwebengine + libidn qca2-qt5 qtkeychain libXScrnSaver hunspell libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; @@ -44,6 +45,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej ]; license = licenses.gpl2; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index 284fdf7a124d..71c696036317 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: let - version = "2019.2.5"; + version = "2019.3.0.3"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0k94y4x6lj1vcb89a95v9mzl95mkpwp9n4a2gwvq0g90zpbnn493"; + sha256 = "1ivhqh1rl4ll0af9nfgfm7f647vc9zk61aplinvz73xb3grb4j6f"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index a3eda731db79..6c09cc1de472 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , cmake , gdk-pixbuf , gtk3 @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { vala wrapGAppsHook ]; + buildInputs = [ pantheon.elementary-icon-theme pantheon.granite @@ -49,6 +51,15 @@ stdenv.mkDerivation rec { libsoup ]; + patches = [ + # Fix build with Vala 0.46 + # https://github.com/Philip-Scott/Spice-up/pull/288 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/Philip-Scott/Spice-up/pull/288.patch"; + sha256 = "0kyfd8v2sk4cvcq1j8ysp64snfjhnpr3iz7l04lx7if7h372xj39"; + }) + ]; + meta = with stdenv.lib; { description = "Create simple and beautiful presentations"; homepage = https://github.com/Philip-Scott/Spice-up; diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index ce0fbf0e16dc..343b0bf8cba2 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tqsl"; - version = "2.4.3"; + version = "2.4.7"; src = fetchurl { url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; - sha256 = "0f8pa5wnp0x0mjjr5kanka9hirgmp5wf6jsb95dc6hjlzlvy6kz9"; + sha256 = "1i33bk3annz4rnjc58knprfajq1pbyjqyrhygqybvl7bsp70c5ri"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index f32dca86bdf5..8cd23fe06edb 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.1a"; + version = "2.7.2b"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "0n6g4s4hgw7qygs1z97j7a2dgz8gfaa4cv5pjvvvmarvk0x07hyg"; + sha256 = "1fb63n3jm1l8k60wdjbq9asv4l1kf7algxxs1aqzvvidx3a8fvzq"; }; sourceRoot = "source/source"; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index bd57e355c757..5d069c5a219f 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "kicad"; series = "5.0"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { url = "https://launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz"; - sha256 = "12kp82ms2dwqkhilmh3mbhg5rsj5ykk99pnkhp4sx89nni86qdw4"; + sha256 = "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j"; }; postPatch = '' @@ -73,22 +73,22 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; passthru = { - i18n = mkLib version "i18n" "08a8lpz2j7bhwn155s0ii538qlynnnvq6fmdw1dxjfgmfy7y3r66" { + i18n = mkLib version "i18n" "1dk7wis4cncmihl8fnic3jyhqcdzpifchzsp7hmf214h0vp199zr" { buildInputs = [ gettext ]; meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 }; - symbols = mkLib version "symbols" "0l5r53wcv0518x2kl0fh1zi0d50cckc7z1739fp9z3k5a4ddk824" { + symbols = mkLib version "symbols" "1lna4xlvzrxif3569pkp6mrg7fj62z3a3ri5j97lnmnnzhiddnh3" { meta.license = licenses.cc-by-sa-40; }; - footprints = mkLib version "footprints" "0q7y7m10pav6917ri37pzjvyh71c8lf4lh9ch258pdpl3w481zk6" { + footprints = mkLib version "footprints" "0c0kcywxlaihzzwp9bi0dsr2v9j46zcdr85xmfpivmrk19apss6a" { meta.license = licenses.cc-by-sa-40; }; - templates = mkLib version "templates" "1nva4ckq0l2lrah0l05355cawlwd7qfxcagcv32m8hcrn781455q" { + templates = mkLib version "templates" "1bagb0b94cjh7zp9z0h23b60j45kwxbsbb7b2bdk98dmph8lmzbb" { meta.license = licenses.cc-by-sa-40; }; - packages3d = mkLib version "packages3d" "0xla9k1rnrs00fink90y9qz766iks5lyqwnf1h2i508djqhqm5zi" { + packages3d = mkLib version "packages3d" "0h2qjj8vf33jz6jhqdz90c80h5i1ydgfqnns7rn0fqphlnscb45g" { hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store meta.license = licenses.cc-by-sa-40; }; @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") - wrapGApp "$out/bin/kicad" + wrapGApp "$out/bin/kicad" --prefix LD_LIBRARY_PATH : "${libngspice}/lib" ''; meta = { @@ -116,5 +116,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ berce ]; platforms = with platforms; linux; + broken = stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 99e9d856a717..81102338870d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -7,8 +7,9 @@ { stdenv, fetchFromGitHub, writeText, pkgconfig , ocamlPackages, ncurses -, buildIde ? true +, buildIde ? !stdenv.lib.versionAtLeast version "8.10" # lablgtk3 cannot be built with GTK3 at version 3.24.11 , glib, gnome3, wrapGAppsHook +, darwin , csdp ? null , version }: @@ -28,7 +29,7 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; - "8.10+beta3" = "08c7q97jyblsf7dhk8jf1fx1cp9qr3dr5s42wigx10wh7i6j7pca"; + "8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; @@ -101,10 +102,13 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ]) + buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] + ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 + ++ [ ocamlPackages.num ] ++ stdenv.lib.optionals buildIde (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa else [ ocamlPackages.lablgtk ]); postPatch = '' diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index fba3bc479060..c0512b744884 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let boolToCmake = x: if x then "ON" else "OFF"; - rev = "2deeadeff214e975c9f7508bc8a24fa05a1a0c32"; - sha256 = "09yhym2lxmn3xbhw5fcxawnmvms5jd9fw9m7x2wzil7yvy4vwdjn"; + rev = "1.8.0"; + sha256 = "0q3a8x3iih25xkp2bm842sm2hxlb8hxlls4qmvj7vzwrh4lvsl7b"; pname = "monosat"; - version = substring 0 7 sha256; + version = rev; src = fetchFromGitHub { owner = "sambayless"; @@ -25,7 +25,11 @@ let inherit src; buildInputs = [ cmake zlib gmp jdk8 ]; - cmakeFlags = [ "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" ]; + cmakeFlags = [ + "-DBUILD_STATIC=OFF" + "-DJAVA=${boolToCmake includeJava}" + "-DGPL=${boolToCmake includeGplCode}" + ]; postInstall = optionalString includeJava '' mkdir -p $out/share/java @@ -39,7 +43,7 @@ let platforms = platforms.unix; license = if includeGplCode then licenses.gpl2 else licenses.mit; homepage = https://github.com/sambayless/monosat; - broken = true; + maintainers = [ maintainers.acairncross ]; }; }; @@ -51,18 +55,15 @@ let propagatedBuildInputs = [ core cython ]; - # This tells setup.py to use cython + # This tells setup.py to use cython, which should produce faster bindings MONOSAT_CYTHON = true; # The relative paths here don't make sense for our Nix build - # Also, let's use cython since it should produce faster bindings # TODO: do we want to just reference the core monosat library rather than copying the # shared lib? The current setup.py copies the .dylib/.so... postPatch = '' - substituteInPlace setup.py \ - --replace '../../../../libmonosat.dylib' '${core}/lib/libmonosat.dylib' \ - --replace '../../../../libmonosat.so' '${core}/lib/libmonosat.so' + --replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"' ''; }; in core diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 610d7494ed80..58f464575b0c 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.23"; + version = "3.24"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "068xg5ps4j4v2sqqyl4vf83nfazp54gsy84gvlw52h94c4mj4xmp"; + sha256 = "1r9zgfx5npjw4mk0ywxx07jyi1m1b1i06j0m60n3dsrz75492x6m"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index cb098f502768..db82cc541351 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -74,6 +74,8 @@ let git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; + git-annex-utils = callPackage ./git-annex-utils { }; + git-bug = callPackage ./git-bug { }; # support for bugzilla diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix new file mode 100644 index 000000000000..081341957035 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, gmp }: + +stdenv.mkDerivation rec { + pname = "git-annex-utils"; + version = "0.04-3-g531bb33"; + src = fetchgit { + url = http://git.mysteryvortex.com/repositories/git-annex-utils.git; + rev = "531bb33"; + sha256 = "1sv7s2ykc840cjwbfn7ayy743643x9i1lvk4cd55w9l052xvzj65"; + }; + buildInputs = [ autoconf automake libtool gmp ]; + preConfigure = "./autogen.sh"; + + meta = { + description = "gadu, a du like utility for annexed files"; + longDescription = '' + This is a set of utilities that are handy to use with git-annex repositories. + Currently there is only one utility gadu, a du like utility for annexed files. + ''; + homepage = http://git-annex.mysteryvortex.com/git-annex-utils.html; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ woffs ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index c55eb342e069..35c78dfd50a4 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.9.8"; + version = "0.11"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "1w1wy4sj9zqfysrpf04shhppcf5ap4rp7i3ja81sv2fm27k4m9nl"; + sha256 = "10dzas5fyh2lpa0kf1xv8z9c4g4cf0zlmnpilyvpcyccyfjf6cp2"; }; buildInputs = [ python ]; diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index 6d1c4b10c91a..00a8a2f61fcc 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, bdftopcf }: +{ stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: stdenv.mkDerivation rec { pname = "cherry"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "turquoise-hexagon"; repo = pname; rev = version; - sha256 = "1zaiqspf6y0hpszhihdsvsyw33d3ffdap4dym7w45wfrhdpvpi0p"; + sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586"; }; - nativeBuildInputs = [ bdftopcf ]; + nativeBuildInputs = [ fonttosfnt mkfontdir ]; buildPhase = '' patchShebangs make.sh @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/fonts/misc - cp *.pcf $out/share/fonts/misc + cp *.otb $out/share/fonts/misc + + # create fonts.dir so NixOS xorg module adds to fp + mkfontdir $out/share/fonts/misc ''; meta = with stdenv.lib; { diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index f8830bbd2116..c5dfc1e156f9 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchurl }: +{ lib, fetchurl, mkfontdir }: let pname = "spleen"; - version = "1.3.0"; + version = "1.5.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -12,11 +12,13 @@ in fetchurl { postFetch = '' tar xvf $downloadedFile --strip=1 d="$out/share/fonts/X11/misc/spleen" - gzip -n9 *.pcf install -Dm644 *.{pcf.gz,psfu,bdf} -t $d install -m644 fonts.alias-spleen $d/fonts.alias + + # create fonts.dir so NixOS xorg module adds to fp + ${mkfontdir}/bin/mkfontdir $d ''; - sha256 = "1l1ksl8xnz1yh7jl8h2g25a7wfm9xgj3lay8ddqzlxzydkkm110q"; + sha256 = "13ndyw1m6c778k7jr7qwbfg28gqmpcgksprn2mjgsv75wvy51z19"; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b227c9576fbc..dbe3ee201f48 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20190919"; + version = "20191009"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "1pykrvh232b12wlhc56yd992vl4p3j2ap21mhhcwyxml06riwvki"; + sha256 = "1ljbaq0c6rhvfwj5q2kvd6rxbjykb0sbgcpjrxrzpdy08zr1kdvd"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 51d23e475ff3..077ba2268c9b 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-netbook"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00n162bskbvxhy4k2w14f9zwlsg3wgi43228ssx7sc2p95psmm64"; + sha256 = "0m38v2276s2d3zs7smxyf70nyl7bcwp5665zgva28lvs8ip3gijx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 676fa19d9e85..6949f6e3b2ad 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -4,20 +4,11 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; }; - - elmNodePackages = - import ./packages/node-composition.nix { - inherit nodejs pkgs; - inherit (stdenv.hostPlatform) system; - }; - hsPkgs = haskell.packages.ghc865.override { overrides = self: super: with haskell.lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { # sadly with parallelism most of the time breaks compilation - # also compilation is slower with increasing number of cores anyway (Tested on Ryzen 7 and i7) enableParallelBuilding = false; preConfigure = self.fetchElmDeps { elmPackages = (import ./packages/elm-srcs.nix); @@ -42,25 +33,10 @@ let `package/nix/build.sh` */ elm-format = justStaticExecutables (doJailbreak (self.callPackage ./packages/elm-format.nix {})); - elmi-to-json = justStaticExecutables (self.callPackage ./packages/elmi-to-json.nix {}); inherit fetchElmDeps; elmVersion = elmPkgs.elm.version; - - /* - Node/NPM based dependecies can be upgraded using script - `packages/generate-node-packages.sh`. - Packages which rely on `bin-wrap` will fail by default - and can be patched using `patchBinwrap` function defined in `packages/patch-binwrap.nix`. - */ - elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test; - elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples; - elm-language-server = elmNodePackages."@elm-tooling/elm-language-server"; - - # elm-analyse@0.16.4 build is not working - elm-analyse = elmNodePackages."elm-analyse-0.16.3"; - inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref; }; in elmPkgs // { inherit elmPkgs; @@ -69,4 +45,31 @@ let indents = self.callPackage ./packages/indents.nix {}; }; }; -in hsPkgs.elmPkgs + + /* + Node/NPM based dependecies can be upgraded using script + `packages/generate-node-packages.sh`. + Packages which rely on `bin-wrap` will fail by default + and can be patched using `patchBinwrap` function defined in `packages/patch-binwrap.nix`. + */ + elmNodePackages = + let + nodePkgs = import ./packages/node-composition.nix { + inherit nodejs pkgs; + inherit (stdenv.hostPlatform) system; + }; + in with hsPkgs.elmPkgs; { + elm-test = patchBinwrap [elmi-to-json] nodePkgs.elm-test; + elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples; + elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; + + # elm-analyse@0.16.4 build is not working + elm-analyse = nodePkgs."elm-analyse-0.16.3"; + inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref; + }; + + patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; }; + +in hsPkgs.elmPkgs // elmNodePackages // { + lib = { inherit patchBinwrap; }; +} diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 7a6c0b041fc4..ce8d0223714e 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, tzdata, iana-etc, runCommand +{ stdenv, fetchurl, tzdata, iana-etc, runCommand , perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages, pkgsTargetTarget @@ -96,6 +96,12 @@ stdenv.mkDerivation rec { # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go + # Disable TestGcSys because it's flakey in our tests, but the failure is not + # reproducible by multiple people in other environments. + # See https://github.com/NixOS/nixpkgs/issues/68361#issuecomment-537849272 and following + # NOTE: Try re-enabling for releases newer than 1.12.9 + sed -i '/TestGcSys/areturn' src/runtime/gc_test.go + '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isAarch32 '' @@ -137,11 +143,6 @@ stdenv.mkDerivation rec { ./skip-nohup-tests.patch # breaks under load: https://github.com/golang/go/issues/25628 ./skip-test-extra-files-on-386.patch - (fetchpatch { # probably included in >= 1.12.10 - url = "https://github.com/golang/go/commit/aae0b5b0b.diff"; - name = "TestGcSys-too-much-memory.diff"; - sha256 = "1bl9d2pl6n99n9g65cq91sygmp1iva5rmrxbprwn4xd0ql36psa8"; - }) ]; postPatch = '' diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index a118e7ab73ba..0b46bd1f24de 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -4,13 +4,13 @@ , curl, git, unzip, gnutar, coreutils, sqlite }: let - name = "pakcs-2.1.1"; + name = "pakcs-2.1.2"; # Don't switch to development release without a reason, because its # source updates without version bump. Prefer current release instead. src = fetchurl { url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz"; - sha256 = "112v9ynqfbbm4x770mcfrai9v5bh7c3zn7jka80pv6v4y65r778c"; + sha256 = "0i0nprli3knc7zlp5qkqkpiq3ny36v52hnvgph376l3ajjds7wf6"; }; curry-frontend = (haskellPackages.override { @@ -43,9 +43,14 @@ in stdenv.mkDerivation { # Since we can't expand $out in `makeFlags` #makeFlags="$makeFlags PAKCSINSTALLDIR=$out/pakcs" - substituteInPlace currytools/cpm/src/CPM/Repository.curry \ - --replace "/bin/rm" "rm" - ''; + for file in currytools/cpm/src/CPM/Repository.curry \ + currytools/cpm/src/CPM/Repository/CacheDB.curry \ + scripts/compile-all-libs.sh \ + scripts/cleancurry.sh \ + examples/test.sh testsuite/test.sh lib/test.sh; do + substituteInPlace $file --replace "/bin/rm" "rm" + done + '' ; # cypm new: EXISTENCE ERROR: source_sink # "/tmp/nix-build-pakcs-2.0.2.drv-0/pakcs-2.0.2/currytools/cpm/templates/LICENSE" diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 9245e59553fe..cbcfd7efb405 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -2,12 +2,14 @@ , libarchive, db, pcre, libedit, libossp_uuid, libXpm , libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin , git, cacert, cmake, libyaml +, libjpeg, libX11, libXext, libXft, libXinerama , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] , extraPacks ? [] +, withGui ? false }: let - version = "8.1.4"; + version = "8.1.15"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -19,12 +21,13 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/SWI-Prolog/swipl-devel"; rev = "V${version}"; - sha256 = "0qxa6f5dypwczxajlf0l736adbjb17cbak3qsh5g04hpv2bxm6dh"; + sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq"; }; buildInputs = [ cacert git cmake gmp readline openssl libarchive libyaml db pcre libedit libossp_uuid zlib pkgconfig ] + ++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ] ++ extraLibraries ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; @@ -68,7 +71,7 @@ stdenv.mkDerivation { description = "A Prolog compiler and interpreter"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.meditans ]; }; } diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index c689cea1a827..defe52987aa0 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, which, coq }: let params = { - "8.10" = { - version = "master"; - rev = "bc7134deba1aacc7ecd2f5d1032bdf05b125c568"; - sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk"; + "8.10" = rec { + version = "1.1.0"; + rev = "v${version}"; + sha256 = "06jyw7n27ylg02jvlaa3hs13hg8qgx47yn4dxhg9as1xri9a2rvm"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 70cb7dcf3c56..4505c73c9f91 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1ackqjkwkfm3kazlyy4nwdjf6wwjlajql1hrznaki5138nw4gxs4"; + sha256 = "0v3wgx3qbillmnn3amnl568ls113y3qlyf3k7y5b9lmz22k93680"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -145,6 +145,8 @@ self: super: { then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit else super.halive; + barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit; + # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux hakyll = if pkgs.stdenv.isDarwin then dontCheck (overrideCabal super.hakyll (drv: { @@ -1200,7 +1202,7 @@ self: super: { hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; }; # https://github.com/sol/hpack/issues/366 - hpack = self.hpack_0_32_0; + hpack = self.hpack_0_33_0; # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 graphviz = dontCheck super.graphviz; @@ -1248,4 +1250,8 @@ self: super: { postFetch = "sed -i -e s,gtk.cabal-renamed,gtk.cabal, $out"; }); + # Version bounds for http-client are too strict: + # https://github.com/bitnomial/prometheus/issues/34 + prometheus = doJailbreak super.prometheus; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index e6568a56c7c6..292a703b13c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -77,10 +77,7 @@ self: super: { regex-posix = self.regex-posix_0_96_0_0; regex-tdfa = self.regex-tdfa_1_3_0; shelly = self.shelly_1_9_0; - string-qq = self.string-qq_0_0_4; tls = self.tls_1_5_1; - vector-th-unbox = self.vector-th-unbox_0_2_1_7; - X11 = self.X11_1_9_1; xmonad-contrib = self.xmonad-contrib_0_16; # These packages don't work and need patching and/or an update. @@ -88,10 +85,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; }); - socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; - sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; - }); polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; @@ -101,10 +94,6 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch"; sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8"; }); - asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch"; - sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5"; - }); vault = dontHaddock super.vault; monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8 @@ -114,12 +103,6 @@ self: super: { sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; }); - # https://github.com/sol/hpack/issues/371 - hpack = appendPatch super.hpack (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch"; - sha256 = "11ccl9f7vwbf5cpzknlyvrwgkzpajk4vq9jk9yb5f9la9ggwb244"; - }); - # Upstream ships a broken Setup.hs file. csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0031f3efde6e..1b20a0b5b208 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.7 + # LTS Haskell 14.8 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -65,7 +65,7 @@ default-package-overrides: - aeson-generic-compat ==0.0.1.3 - aeson-iproute ==0.2 - aeson-picker ==0.1.0.5 - - aeson-pretty ==0.8.7 + - aeson-pretty ==0.8.8 - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 @@ -73,7 +73,7 @@ default-package-overrides: - alarmclock ==0.7.0.2 - alerts ==0.1.2.0 - alex ==3.2.4 - - alg ==0.2.10.0 + - alg ==0.2.11.0 - algebraic-graphs ==0.4 - Allure ==0.9.5.0 - almost-fix ==0.0.2 @@ -100,15 +100,15 @@ default-package-overrides: - apportionment ==0.0.0.3 - approximate ==0.3.2 - app-settings ==0.2.0.12 - - arbor-lru-cache ==0.1.1.0 + - arbor-lru-cache ==0.1.1.1 - arithmoi ==0.9.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - asciidiagram ==1.3.3.3 - ascii-progress ==0.3.3.0 - - asif ==6.0.1 - - asn1-encoding ==0.9.5 - - asn1-parse ==0.9.4 + - asif ==6.0.3 + - asn1-encoding ==0.9.6 + - asn1-parse ==0.9.5 - asn1-types ==0.3.3 - assert-failure ==0.1.2.2 - assoc ==1 @@ -139,7 +139,7 @@ default-package-overrides: - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.5.2 + - avro ==0.4.5.3 - avwx ==0.3.0.2 - aws-cloudfront-signed-cookies ==0.2.0.1 - aws-lambda-haskell-runtime ==2.0.1 @@ -194,7 +194,7 @@ default-package-overrides: - bindings-GLFW ==3.2.1.1 - bindings-libzip ==1.0.1 - bindings-uname ==0.1 - - bins ==0.1.1.1 + - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bitcoin-block ==0.13.1 - bitcoin-script ==0.11.1 @@ -202,8 +202,8 @@ default-package-overrides: - bitcoin-types ==0.9.2 - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - - bits-extra ==0.0.1.3 - - bitvec ==1.0.0.1 + - bits-extra ==0.0.1.4 + - bitvec ==1.0.1.2 - bitx-bitcoin ==0.12.0.0 - blake2 ==0.3.0 - blas-carray ==0.1.0.1 @@ -213,8 +213,8 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - blaze-colonnade ==1.2.2.1 - - blaze-html ==0.9.1.1 - - blaze-markup ==0.8.2.2 + - blaze-html ==0.9.1.2 + - blaze-markup ==0.8.2.3 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 @@ -235,7 +235,7 @@ default-package-overrides: - bower-json ==1.0.0.1 - boxes ==0.1.5 - brick ==0.47.1 - - brittany ==0.12.0.0 + - brittany ==0.12.1.0 - bsb-http-chunked ==0.0.0.4 - bson ==0.3.2.8 - bson-lens ==0.1.1 @@ -264,8 +264,9 @@ default-package-overrides: - c2hs ==0.28.6 - Cabal ==2.4.1.0 - cabal2spec ==2.2.2.1 - - cabal-doctest ==1.0.7 + - cabal-doctest ==1.0.8 - cabal-file-th ==0.2.6 + - cabal-rpm ==1.0.1 - cache ==0.1.1.2 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 @@ -307,6 +308,7 @@ default-package-overrides: - checkers ==0.5.2 - checksum ==0.0 - chimera ==0.2.0.0 + - chiphunk ==0.1.2.0 - choice ==0.2.2 - chronologique ==0.3.1.1 - chronos ==1.0.7 @@ -365,7 +367,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.7.0.0 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.10 + - concurrent-output ==1.10.11 - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 @@ -412,7 +414,7 @@ default-package-overrides: - crackNum ==2.3 - crc32c ==0.0.0 - credential-store ==0.1.2 - - criterion ==1.5.6.0 + - criterion ==1.5.6.1 - criterion-measurement ==0.1.2.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -495,7 +497,7 @@ default-package-overrides: - dbcleaner ==0.1.3 - DBFunctor ==0.1.1.1 - dbus ==1.2.7 - - debian-build ==0.10.1.2 + - debian-build ==0.10.2.0 - debug ==0.1.1 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -504,7 +506,7 @@ default-package-overrides: - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - deferred-folds ==0.9.10.1 - - dejafu ==2.1.0.0 + - dejafu ==2.1.0.1 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 @@ -595,7 +597,7 @@ default-package-overrides: - elm-export ==0.6.0.1 - elm-street ==0.0.1 - emacs-module ==0.1.1 - - email-validate ==2.3.2.11 + - email-validate ==2.3.2.12 - emd ==0.1.5.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 @@ -623,14 +625,14 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.3.1 + - eventstore ==1.3.2 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - exceptions ==0.10.3 - - exception-transformers ==0.4.0.7 + - exception-transformers ==0.4.0.8 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 @@ -654,7 +656,7 @@ default-package-overrides: - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - fedora-dists ==1.0.1 - - feed ==1.2.0.0 + - feed ==1.2.0.1 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.1 @@ -674,7 +676,7 @@ default-package-overrides: - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 - first-class-families ==0.5.0.0 - - first-class-patterns ==0.3.2.4 + - first-class-patterns ==0.3.2.5 - fitspec ==0.4.7 - fixed ==0.3 - fixed-length ==0.2.1 @@ -688,7 +690,7 @@ default-package-overrides: - flexible-defaults ==0.0.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.18 + - flow ==1.0.19 - fmlist ==0.9.3 - fmt ==0.6.1.2 - fmt-for-rio ==1.0.0.0 @@ -696,12 +698,12 @@ default-package-overrides: - focus ==1.0.1.3 - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - - fold-debounce ==0.2.0.8 + - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.3 - foldl ==1.4.5 - - folds ==0.7.4 + - folds ==0.7.5 - follow-file ==0.0.3 - - FontyFruity ==0.5.3.4 + - FontyFruity ==0.5.3.5 - force-layout ==0.4.0.6 - foreign-store ==0.2 - forkable-monad ==0.2.0.3 @@ -711,7 +713,7 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.2 - freenect ==1.2.1 - - freer-simple ==1.2.1.0 + - freer-simple ==1.2.1.1 - freetype2 ==0.1.2 - free-vl ==0.1.4 - friendly-time ==0.4.1 @@ -773,10 +775,10 @@ default-package-overrides: - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.8.0.20190424 - ghc-lib-parser ==8.8.0.20190424 - - ghc-parser ==0.2.0.3 + - ghc-parser ==0.2.1.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.6 - - ghc-syntax-highlighter ==0.0.4.0 + - ghc-syntax-highlighter ==0.0.4.1 - ghc-tcplugins-extra ==0.3 - ghc-typelits-extra ==0.3.1 - ghc-typelits-knownnat ==0.6 @@ -808,10 +810,10 @@ default-package-overrides: - glazier ==1.0.0.0 - GLFW-b ==3.2.1.1 - Glob ==0.10.0 - - gloss ==1.13.0.1 + - gloss ==1.13.1.1 - gloss-algorithms ==1.13.0.1 - gloss-examples ==1.13.0.2 - - gloss-raster ==1.13.0.2 + - gloss-raster ==1.13.1.1 - gloss-rendering ==1.13.1.1 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.15 @@ -826,8 +828,8 @@ default-package-overrides: - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - graylog ==0.1.0.1 - - greskell ==0.2.3.0 - - greskell-core ==0.1.2.6 + - greskell ==0.2.3.1 + - greskell-core ==0.1.2.7 - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - groundhog ==0.10.0 @@ -873,7 +875,7 @@ default-package-overrides: - haskell-src-meta ==0.8.3 - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.0 - - haskoin-core ==0.9.0 + - haskoin-core ==0.9.1 - hasql ==1.4 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 @@ -884,7 +886,7 @@ default-package-overrides: - hbeanstalk ==0.2.4 - HCodecs ==0.5.1 - hdaemonize ==0.5.5 - - HDBC ==2.4.0.2 + - HDBC ==2.4.0.3 - HDBC-mysql ==0.7.1.0 - HDBC-session ==0.1.2.0 - heap ==1.0.4 @@ -912,9 +914,9 @@ default-package-overrides: - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 - hinotify ==0.4 - - hint ==0.9.0.1 + - hint ==0.9.0.2 - hjsmin ==0.2.0.2 - - hkgr ==0.2.2 + - hkgr ==0.2.4 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.8.0 - hmatrix ==0.20.0.0 @@ -998,7 +1000,7 @@ default-package-overrides: - htaglib ==1.2.0 - HTF ==0.13.2.5 - html ==1.0.1.2 - - html-conduit ==1.3.2 + - html-conduit ==1.3.2.1 - html-email-validate ==0.2.0.0 - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 @@ -1009,7 +1011,7 @@ default-package-overrides: - http-client ==0.6.4 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.7.1 + - http-conduit ==2.3.7.2 - http-date ==0.0.8 - http-directory ==0.1.5 - http-download ==0.1.0.0 @@ -1026,7 +1028,7 @@ default-package-overrides: - hvect ==0.4.0.0 - hvega ==0.3.0.1 - hw-balancedparens ==0.2.0.4 - - hw-bits ==0.7.0.6 + - hw-bits ==0.7.0.7 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 @@ -1035,17 +1037,17 @@ default-package-overrides: - hw-eliasfano ==0.1.1.0 - hw-excess ==0.2.2.0 - hw-fingertree ==0.1.1.0 - - hw-fingertree-strict ==0.1.1.1 + - hw-fingertree-strict ==0.1.1.2 - hw-hedgehog ==0.1.0.3 - hw-hspec-hedgehog ==0.1.0.8 - hw-int ==0.0.0.3 - hw-ip ==2.3.4.1 - hw-json ==1.0.0.2 - - hw-json-simd ==0.1.0.2 + - hw-json-simd ==0.1.0.3 - hw-mquery ==0.2.0.1 - hw-packed-vector ==0.0.0.3 - hw-parser ==0.1.0.1 - - hw-prim ==0.6.2.32 + - hw-prim ==0.6.2.35 - hw-rankselect ==0.13.0.0 - hw-rankselect-base ==0.3.2.1 - hw-simd ==0.1.1.4 @@ -1071,7 +1073,7 @@ default-package-overrides: - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 - - ihaskell ==0.10.0.0 + - ihaskell ==0.10.0.2 - ihs ==0.1.0.3 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 @@ -1081,7 +1083,7 @@ default-package-overrides: - incremental-parser ==0.3.2.2 - indentation-core ==0.0.0.2 - indentation-parsec ==0.0.0.2 - - indents ==0.5.0.0 + - indents ==0.5.0.1 - indexed ==0.1.3 - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 @@ -1125,10 +1127,10 @@ default-package-overrides: - iproute ==1.7.7 - IPv6Addr ==1.1.2 - ipynb ==0.1 - - ipython-kernel ==0.10.0.0 + - ipython-kernel ==0.10.1.0 - irc ==0.6.1.0 - - irc-client ==1.1.1.0 - - irc-conduit ==0.3.0.3 + - irc-client ==1.1.1.1 + - irc-conduit ==0.3.0.4 - irc-ctcp ==0.1.3.0 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 @@ -1151,7 +1153,7 @@ default-package-overrides: - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.5 - json-rpc-server ==0.2.6.0 - - JuicyPixels ==3.3.3.1 + - JuicyPixels ==3.3.4 - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 @@ -1182,7 +1184,7 @@ default-package-overrides: - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - - language-javascript ==0.6.0.13 + - language-javascript ==0.6.0.14 - language-puppet ==1.4.5 - lapack ==0.3.1 - lapack-carray ==0.0.3 @@ -1208,7 +1210,7 @@ default-package-overrides: - lens-family-core ==1.2.3 - lens-family-th ==0.5.0.2 - lens-misc ==0.0.2.0 - - lens-process ==0.3.0.0 + - lens-process ==0.3.0.1 - lens-properties ==4.11.1 - lens-regex ==0.1.1 - lens-regex-pcre ==0.3.1.0 @@ -1219,7 +1221,7 @@ default-package-overrides: - libffi ==0.1 - libgit ==0.3.1 - libgraph ==1.14 - - libmpd ==0.9.0.9 + - libmpd ==0.9.0.10 - liboath-hs ==0.0.1.1 - libraft ==0.5.0.0 - libyaml ==0.1.1.0 @@ -1235,7 +1237,7 @@ default-package-overrides: - List ==0.6.2 - ListLike ==4.6.2 - listsafe ==0.1.0.1 - - list-t ==1.0.3.1 + - list-t ==1.0.4 - ListTree ==0.2.3 - list-witnesses ==0.1.1.1 - llvm-hs ==8.0.0 @@ -1255,7 +1257,7 @@ default-package-overrides: - logging-facade-syslog ==1 - logict ==0.7.0.2 - loop ==0.3.0 - - loopbreaker ==0.1.1.0 + - loopbreaker ==0.1.1.1 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - lsp-test ==0.6.1.0 @@ -1269,18 +1271,18 @@ default-package-overrides: - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - magico ==0.0.2.1 - - mainland-pretty ==0.7 + - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.6 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.4.1.0 + - massiv ==0.4.2.0 - massiv-io ==0.1.7.0 - - massiv-test ==0.1.0 + - massiv-test ==0.1.1 - mathexpr ==0.3.0.0 - - math-functions ==0.3.2.1 + - math-functions ==0.3.3.0 - matplotlib ==0.7.4 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1310,7 +1312,7 @@ default-package-overrides: - microlens-ghc ==0.4.10 - microlens-mtl ==0.1.11.1 - microlens-platform ==0.3.11 - - microlens-process ==0.2.0.0 + - microlens-process ==0.2.0.1 - microlens-th ==0.4.2.3 - microspec ==0.2.1.3 - microstache ==1.0.1.1 @@ -1371,7 +1373,7 @@ default-package-overrides: - monoid-extras ==0.5 - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - - mono-traversable ==1.0.12.0 + - mono-traversable ==1.0.13.0 - mono-traversable-instances ==0.1.0.0 - mono-traversable-keys ==0.1.0 - more-containers ==0.2.1.2 @@ -1429,7 +1431,7 @@ default-package-overrides: - network-house ==0.1.0.2 - network-info ==0.2.0.10 - network-ip ==0.3.0.2 - - network-messagepack-rpc ==0.1.1.1 + - network-messagepack-rpc ==0.1.1.4 - network-multicast ==0.3.2 - network-simple ==0.4.5 - network-simple-tls ==0.3.2 @@ -1511,7 +1513,7 @@ default-package-overrides: - pandoc-csv2table ==1.0.7 - pandoc-markdown-ghci-filter ==0.1.0.0 - pandoc-pyplot ==2.1.5.1 - - pandoc-types ==1.17.6 + - pandoc-types ==1.17.6.1 - pantry ==0.1.1.2 - parallel ==3.2.2.0 - parallel-io ==0.3.3 @@ -1620,7 +1622,7 @@ default-package-overrides: - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 - - postgresql-typed ==0.6.0.1 + - postgresql-typed ==0.6.1.0 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.2 @@ -1678,7 +1680,7 @@ default-package-overrides: - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.6 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.10 + - pusher-http-haskell ==1.5.1.11 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.5 @@ -1730,8 +1732,8 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - reanimate ==0.1.5.0 - - reanimate-svg ==0.9.2.1 + - reanimate ==0.1.8.0 + - reanimate-svg ==0.9.3.0 - rebase ==1.3.1.1 - record-dot-preprocessor ==0.2 - record-hasfield ==1.0 @@ -1749,7 +1751,7 @@ default-package-overrides: - regex-compat ==0.95.1 - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.94.4 - - regex-pcre-builtin ==0.94.4.8.8.35 + - regex-pcre-builtin ==0.94.5.8.8.35 - regex-pcre-text ==0.94.0.1 - regex-posix ==0.95.2 - regex-tdfa ==1.2.3.2 @@ -1767,6 +1769,8 @@ default-package-overrides: - repa ==3.4.1.4 - repa-algorithms ==3.4.1.3 - repa-io ==3.4.1.1 + - replace-attoparsec ==1.0.2.0 + - replace-megaparsec ==1.1.4.0 - repline ==0.2.1.0 - req ==2.1.0 - req-conduit ==1.0.0 @@ -1777,7 +1781,7 @@ default-package-overrides: - resourcet ==1.2.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.8.0.1 + - retry ==0.8.0.2 - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 @@ -1825,7 +1829,7 @@ default-package-overrides: - scalpel-core ==0.6.0 - scanf ==0.1.0.0 - scanner ==0.3.1 - - scheduler ==1.4.2 + - scheduler ==1.4.2.1 - scientific ==0.3.6.2 - scotty ==0.11.5 - scrypt ==0.5.0 @@ -1872,13 +1876,14 @@ default-package-overrides: - servant-foreign ==0.15 - servant-http-streams ==0.16.0.1 - servant-js ==0.9.4 - - servant-JuicyPixels ==0.3.0.4 + - servant-JuicyPixels ==0.3.0.5 - servant-kotlin ==0.1.1.9 - servant-lucid ==0.9 - servant-machines ==0.15 - servant-mock ==0.8.5 - servant-multipart ==0.11.4 - servant-pipes ==0.15.1 + - servant-rawm ==0.3.2.0 - servant-ruby ==0.9.0.0 - servant-server ==0.16.2 - servant-static-th ==0.2.2.1 @@ -1895,7 +1900,7 @@ default-package-overrides: - ses-html ==0.4.0.0 - set-cover ==0.0.9 - setenv ==0.1.1.3 - - setlocale ==1.0.0.8 + - setlocale ==1.0.0.9 - sexp-grammar ==2.0.2 - sexpr-parser ==0.1.1.2 - SHA ==1.6.4.4 @@ -1904,20 +1909,20 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - - shellmet ==0.0.2.0 + - shellmet ==0.0.3.0 - shelltestrunner ==1.9 - shelly ==1.8.1 - shikensu ==0.3.11 - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.1.1.0 - - shower ==0.2.0.1 + - shower ==0.2.0.2 - show-prettyprint ==0.3.0.1 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5.1 - simple ==0.11.3 - - simple-cabal ==0.0.0.1 + - simple-cabal ==0.1.1 - simple-cmd ==0.2.0.1 - simple-cmd-args ==0.1.3 - simple-log ==0.9.12 @@ -1937,8 +1942,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.2 - skip-var ==0.1.1.0 - - skylighting ==0.8.2 - - skylighting-core ==0.8.2 + - skylighting ==0.8.2.1 + - skylighting-core ==0.8.2.1 - slack-web ==0.2.0.11 - smallcheck ==1.1.5 - smallcheck-series ==0.6.1 @@ -1950,7 +1955,7 @@ default-package-overrides: - soap ==0.2.3.6 - soap-tls ==0.1.1.4 - socket-activation ==0.1.0.2 - - socks ==0.6.0 + - socks ==0.6.1 - sop-core ==0.4.0.0 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 @@ -1997,7 +2002,7 @@ default-package-overrides: - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.40.0 - - streaming ==0.2.2.0 + - streaming ==0.2.3.0 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.1.6 - streaming-cassava ==0.1.0.1 @@ -2016,13 +2021,13 @@ default-package-overrides: - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - string-interpolate ==0.1.0.1 - - string-qq ==0.0.2 + - string-qq ==0.0.4 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.1.0 + - stripe-concepts ==1.0.2.0 - stripe-scotty ==1.0.0.0 - stripe-signature ==1.0.0.1 - - stripe-wreq ==1.0.0.0 + - stripe-wreq ==1.0.1.0 - strive ==5.0.8 - structs ==0.1.2 - structured-cli ==2.5.1.0 @@ -2038,7 +2043,7 @@ default-package-overrides: - svg-tree ==0.6.2.4 - swagger ==0.3.0 - swagger2 ==2.4 - - swish ==0.10.0.1 + - swish ==0.10.0.2 - syb ==0.7.1 - symbol ==0.2.4 - symengine ==0.1.2.0 @@ -2100,7 +2105,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.11.2.2 + - texmath ==0.11.3 - text-binary ==0.2.1.1 - text-builder ==0.6.5.1 - text-conversions ==0.3.0 @@ -2129,7 +2134,7 @@ default-package-overrides: - th-lift ==0.8.0.1 - th-lift-instances ==0.1.14 - th-nowq ==0.1.0.3 - - th-orphans ==0.13.8 + - th-orphans ==0.13.9 - th-printf ==0.6.0 - thread-hierarchy ==0.3.0.1 - thread-local-storage ==0.2 @@ -2140,7 +2145,7 @@ default-package-overrides: - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.0.0 + - th-test-utils ==1.0.1 - th-utilities ==0.2.3.0 - thyme ==0.3.5.5 - tile ==0.3.0.0 @@ -2160,7 +2165,7 @@ default-package-overrides: - tintin ==1.10.0 - tinylog ==0.15.0 - titlecase ==1.0.1 - - tldr ==0.4.0.1 + - tldr ==0.4.0.2 - tls ==1.4.1 - tls-debug ==0.4.5 - tls-session-manager ==0.0.3 @@ -2278,7 +2283,7 @@ default-package-overrides: - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1.1 - - validity ==0.9.0.1 + - validity ==0.9.0.2 - validity-aeson ==0.2.0.2 - validity-bytestring ==0.4.1.0 - validity-containers ==0.3.1.0 @@ -2296,14 +2301,14 @@ default-package-overrides: - vector-algorithms ==0.8.0.1 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - - vector-builder ==0.3.7.2 + - vector-builder ==0.3.8 - vector-bytes-instances ==0.1.1 - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-sized ==1.2.0.1 - vector-space ==0.16 - vector-split ==1.0.0.2 - - vector-th-unbox ==0.2.1.6 + - vector-th-unbox ==0.2.1.7 - verbosity ==0.3.0.0 - versions ==3.5.1.1 - ViennaRNAParser ==1.3.3 @@ -2356,13 +2361,13 @@ default-package-overrides: - wide-word ==0.1.0.9 - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.4 - - wild-bind-x11 ==0.2.0.7 + - wild-bind-x11 ==0.2.0.8 - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - winery ==1.1.2 + - winery ==1.1.3 - wire-streams ==0.1.1.0 - - witherable ==0.3.3 + - witherable ==0.3.4 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 @@ -2382,7 +2387,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - ws ==0.0.5 - wuss ==1.1.14 - - X11 ==1.9 + - X11 ==1.9.1 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 - x509 ==1.7.5 @@ -2416,7 +2421,7 @@ default-package-overrides: - xml-types ==0.3.6 - xmonad ==0.15 - xmonad-contrib ==0.15 - - xmonad-extras ==0.15.1 + - xmonad-extras ==0.15.2 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.1.2 @@ -2555,7 +2560,6 @@ package-maintainers: - logging-facade-syslog - nix-paths - pandoc - - postmaster - stack - streamproc - structured-haskell-mode @@ -2586,6 +2590,7 @@ unsupported-platforms: alsa-pcm: [ x86_64-darwin ] alsa-seq: [ x86_64-darwin ] AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ] + barbly: [ i686-linux, x86_64-linux ] bindings-directfb: [ x86_64-darwin ] d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ] DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2720,6 +2725,7 @@ broken-packages: - abcBridge - abcnotation - abeson + - abides - abnf - AbortT-monadstf - AbortT-mtl @@ -2802,6 +2808,7 @@ broken-packages: - aeson-decode - aeson-diff-generic - aeson-flowtyped + - aeson-gadt-th - aeson-injector - aeson-native - aeson-prefix @@ -2951,6 +2958,7 @@ broken-packages: - arbor-monad-metric - arbor-monad-metric-datadog - arbor-postgres + - archive-libarchive - archiver - archlinux - archlinux-web @@ -2964,6 +2972,7 @@ broken-packages: - arguedit - ariadne - arion + - arion-compose - arith-encode - armada - armor @@ -3111,7 +3120,6 @@ broken-packages: - Bang - bank-holiday-usa - banwords - - barbly - barchart - barcodes-code128 - barecheck @@ -3144,6 +3152,7 @@ broken-packages: - beam-postgres - beam-th - beamable + - bearriver - beautifHOL - beeminder-api - Befunge93 @@ -3415,6 +3424,7 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir + - cabal-flatpak - cabal-fmt - cabal-ghc-dynflags - cabal-ghci @@ -3566,6 +3576,7 @@ broken-packages: - Checked - checked - checkmate + - chell-quickcheck - chessIO - chevalier-common - chiasma @@ -3587,6 +3598,7 @@ broken-packages: - ChristmasTree - chromatin - chronograph + - chs-cabal - chu2 - chunks - chunky @@ -3787,6 +3799,7 @@ broken-packages: - confide - config-parser - config-select + - config-value-getopt - ConfigFileTH - Configger - configifier @@ -3873,6 +3886,7 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit + - cpkg - cplusplus-th - cprng-aes-effect - cpuperf @@ -4129,6 +4143,7 @@ broken-packages: - derive-topdown - derive-trie - derp-lib + - describe - descript-lang - deterministic-game-engine - detour-via-sci @@ -4261,6 +4276,7 @@ broken-packages: - docker - docker-build-cacher - dockercook + - docrecords - DocTest - doctest-discover-configurator - doctest-driver-gen @@ -4390,6 +4406,8 @@ broken-packages: - elliptic-curve - elm-websocket - elsa + - elynx-seq + - elynx-tree - emacs-keys - email - email-header @@ -4453,6 +4471,10 @@ broken-packages: - EsounD - espial - ess + - essence-of-live-coding + - essence-of-live-coding-gloss + - essence-of-live-coding-pulse + - essence-of-live-coding-quickcheck - estimators - EstProgress - estreps @@ -4474,6 +4496,7 @@ broken-packages: - euler-tour-tree - euphoria - eurofxref + - evdev - eve - eve-cli - event @@ -4639,6 +4662,7 @@ broken-packages: - findhttp - fingertree-psqueue - fingertree-tf + - finitary - finitary-derive - FiniteMap - firefly-example @@ -4671,6 +4695,7 @@ broken-packages: - flamethrower - flamingra - flat-maybe + - flatbuffers - flexible-time - flexiwrap - flexiwrap-smallcheck @@ -4747,6 +4772,7 @@ broken-packages: - franchise - Frank - freddy + - free-category - free-concurrent - free-game - free-http @@ -4844,6 +4870,7 @@ broken-packages: - gbu - gc-monitoring-wai - gcodehs + - gconf - gdax - gdiff-ig - gdiff-th @@ -4881,6 +4908,7 @@ broken-packages: - generic-tree - generic-xml - generic-xmlpickler + - generics-mrsop-gdiff - genericserialize - genesis - genesis-test @@ -4962,6 +4990,7 @@ broken-packages: - gi-handy - gi-notify - gi-poppler + - gi-secret - gi-wnck - giak - Gifcurry @@ -5007,6 +5036,7 @@ broken-packages: - gli - glicko - glider-nlp + - glirc - GLMatrix - glob-posix - global @@ -5145,6 +5175,7 @@ broken-packages: - gsl-random - gsl-random-fu - gstorable + - gstreamer - GTALib - gtfs - gtk-serialized-event @@ -5247,6 +5278,7 @@ broken-packages: - hakyll-shakespeare - hakyll-shortcode - hakyll-shortcut-links + - hakyll-typescript - halberd - halfs - halipeto @@ -6333,6 +6365,7 @@ broken-packages: - interpolatedstring-qq-mwotton - interruptible - interval + - IntFormats - intro-prelude - introduction - introduction-test @@ -6419,6 +6452,7 @@ broken-packages: - java-bridge-extras - java-character - java-reflect + - javascript-bridge - javascript-extras - Javasf - javasf @@ -6670,6 +6704,7 @@ broken-packages: - language-sh - language-spelling - language-sqlite + - language-sygus - language-thrift - language-typescript - language-vhdl @@ -6693,6 +6728,7 @@ broken-packages: - lazy-hash - lazy-hash-cache - lazy-io-streams + - lazy-priority-queue - lazyarray - lazyboy - lazyset @@ -6735,6 +6771,7 @@ broken-packages: - lhe - lhs2TeX-hl - lhslatex + - libarchive - LibClang - libconfig - libcspm @@ -6768,6 +6805,7 @@ broken-packages: - lifter - ligature - lightning-haskell + - lightstep-haskell - lighttpd-conf - lighttpd-conf-qq - lilypond @@ -7000,6 +7038,7 @@ broken-packages: - marmalade-upload - marquise - mars + - marshal-contt - marvin - marvin-interpolate - marxup @@ -7077,6 +7116,7 @@ broken-packages: - meta-par-accelerate - metadata - MetaHDBC + - metaheuristics - MetaObject - metaplug - metar @@ -7143,6 +7183,7 @@ broken-packages: - ml-w - mlist - mltool + - mm2 - mmtf - mmtl - mmtl-base @@ -7204,6 +7245,7 @@ broken-packages: - monadLib-compose - monadloc-pp - monadlog + - Monadoro - monadplus - monads-fd - MonadStack @@ -7622,6 +7664,7 @@ broken-packages: - ot - OTP - otp-authenticator + - overloaded - overloaded-records - overture - pack @@ -7921,10 +7964,14 @@ broken-packages: - pool-conduit - popenhs - poppler + - porcupine-core + - porcupine-http + - porcupine-s3 - portager - porte - PortFusion - ports + - poseidon - poseidon-postgis - posix-acl - posix-api @@ -7951,6 +7998,7 @@ broken-packages: - postie - postmark - postmark-streams + - postmaster - potato-tool - potoki - potoki-cereal @@ -8076,6 +8124,7 @@ broken-packages: - pure-io - pure-priority-queue - pure-priority-queue-tests + - purebred-email - purescript - purescript-iso - purescript-tsd-gen @@ -8188,7 +8237,6 @@ broken-packages: - range-space - rangemin - rank1dynamic - - rank2classes - Ranka - rapid-term - rasa @@ -8233,10 +8281,12 @@ broken-packages: - reactive-thread - reactor - read-io + - reader-soup - readline-statevar - readpyc - readshp - really-simple-xml-parser + - reanimate - reasonable-lens - record - record-aeson @@ -8268,6 +8318,7 @@ broken-packages: - reflex-animation - reflex-backend-wai - reflex-basic-host + - reflex-dom-retractable - reflex-dom-svg - reflex-gloss - reflex-gloss-scene @@ -8543,6 +8594,7 @@ broken-packages: - schedevr - schedule-planner - schedyield + - schemas - schematic - scholdoc - scholdoc-citeproc @@ -8594,6 +8646,7 @@ broken-packages: - seclib - second-transfer - secp256k1 + - secp256k1-legacy - secret-santa - secret-sharing - secrm @@ -8695,6 +8748,7 @@ broken-packages: - servant-zeppelin-server - servant-zeppelin-swagger - server-generic + - serversession-backend-acid-state - serversession-backend-redis - serversession-frontend-snap - serversession-frontend-yesod @@ -8751,6 +8805,8 @@ broken-packages: - shellish - shellmate - shellmate-extras + - shh + - shh-extras - shivers-cfg - shoap - shopify @@ -8841,6 +8897,7 @@ broken-packages: - slot-lambda - sloth - slug + - slynx - small-bytearray-builder - smallarray - smallcheck-laws @@ -9041,6 +9098,7 @@ broken-packages: - stable-memo - stable-tree - stack-bump + - stack-fix - stack-hpc-coveralls - stack-lib - stack-network @@ -9212,6 +9270,7 @@ broken-packages: - sym-plot - symantic-http-test - symantic-xml + - symbiote - symengine - symengine-hs - sync @@ -9467,6 +9526,7 @@ broken-packages: - tkhs - tkyprof - tls-extra + - tlynx - tmp-postgres - tn - to-haskell @@ -9966,6 +10026,7 @@ broken-packages: - webshow - websockets-rpc - websockets-simple + - websockets-simple-extra - webwire - weighted - weighted-regexp diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bcc7bb31386f..ffdd1134e3b2 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -97,7 +97,10 @@ self: super: builtins.intersectAttrs super { # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8 cachix = disableLibraryProfiling super.cachix; + # avoid compiling twice by providing executable as a separate output (with small closure size) niv = enableSeparateBinOutput super.niv; + ormolu = enableSeparateBinOutput super.ormolu; + ghcid = enableSeparateBinOutput super.ghcid; # Ensure the necessary frameworks for Darwin. OpenAL = if pkgs.stdenv.isDarwin @@ -109,7 +112,6 @@ self: super: builtins.intersectAttrs super { then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox else super.proteaaudio; - ghcid = enableSeparateBinOutput super.ghcid; hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6b573dbdbb45..1b95375eb85d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2968,8 +2968,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.6"; - sha256 = "17lw2mdzrn2f4w0byfdkyd7h7pcnjzv3n3giapcjg6bza5xjqfbd"; + version = "1.3.1.7"; + sha256 = "0ziiqfsvv1ypdra6kd0bhbsl852i0wqn43jkfii38yl879cdacan"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -5996,22 +5996,6 @@ self: { }) {}; "FontyFruity" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, filepath, text, vector, xml - }: - mkDerivation { - pname = "FontyFruity"; - version = "0.5.3.4"; - sha256 = "0gavpjv83vg5q2x254d3zi3kw5aprl6z8ifcn0vs6hymaj0qgls3"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq directory filepath text - vector xml - ]; - description = "A true type file format loader"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "FontyFruity_0_5_3_5" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , directory, filepath, text, vector, xml }: @@ -6025,7 +6009,6 @@ self: { ]; description = "A true type file format loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForSyDe" = callPackage @@ -7759,24 +7742,6 @@ self: { }) {}; "HDBC" = callPackage - ({ mkDerivation, base, bytestring, containers, convertible, mtl - , old-time, text, time, utf8-string - }: - mkDerivation { - pname = "HDBC"; - version = "2.4.0.2"; - sha256 = "0nnvfyivmw5pykbna953yb6z4al1ak5vsd308lpsyv2bczymf1v7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers convertible mtl old-time text time - utf8-string - ]; - description = "Haskell Database Connectivity"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HDBC_2_4_0_3" = callPackage ({ mkDerivation, base, bytestring, containers, convertible, mtl , old-time, text, time, utf8-string }: @@ -7792,7 +7757,6 @@ self: { ]; description = "Haskell Database Connectivity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HDBC-mysql" = callPackage @@ -11095,6 +11059,20 @@ self: { broken = true; }) {}; + "IntFormats" = callPackage + ({ mkDerivation, base, hspec, parsec, QuickCheck }: + mkDerivation { + pname = "IntFormats"; + version = "0.1.0.0"; + sha256 = "1w8frx6w29lxwq094vx7bk1pxi48m3qva3h2wxyl4f6w2k0l3hck"; + libraryHaskellDepends = [ base parsec QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Convert integers in various bases to and from strings"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "IntGraph" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -11453,22 +11431,6 @@ self: { }) {}; "JuicyPixels" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.3.3.1"; - sha256 = "1zwp78zk4ybaqg57njhww67x3bb75h1i3rdliz40q4p4050gn6mf"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels_3_3_4" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: @@ -11482,7 +11444,6 @@ self: { ]; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-blp" = callPackage @@ -13454,6 +13415,8 @@ self: { testHaskellDepends = [ ansi-terminal base doctest process time ]; description = "A minimalistic CLI Pomodoro timer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Monaris" = callPackage @@ -17571,8 +17534,8 @@ self: { pname = "SecureHash-SHA3"; version = "0.1.1.0"; sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz"; - revision = "1"; - editedCabalFile = "034vwq9cfqjj6hj2nf5g8n2p5gsxpdgp6gwgsmi40klracl5ps5s"; + revision = "2"; + editedCabalFile = "0rvalvvjadb0i0rh9z5lgw2hca4a9yw3cg2f6gcx7h30f5dp8x1j"; libraryHaskellDepends = [ base bytestring ]; description = "simple static linked SHA3 using private symbols and the ref impl"; license = stdenv.lib.licenses.bsd2; @@ -20603,24 +20566,6 @@ self: { }) {}; "X11" = callPackage - ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender, libXScrnSaver - }: - mkDerivation { - pname = "X11"; - version = "1.9"; - sha256 = "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh"; - libraryHaskellDepends = [ base data-default ]; - librarySystemDepends = [ - libX11 libXext libXinerama libXrandr libXrender libXScrnSaver - ]; - description = "A binding to the X11 graphics library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; - - "X11_1_9_1" = callPackage ({ mkDerivation, base, data-default, libX11, libXext, libXinerama , libXrandr, libXrender, libXScrnSaver }: @@ -20634,7 +20579,6 @@ self: { ]; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -21309,6 +21253,8 @@ self: { testHaskellDepends = [ base comonad tasty tasty-quickcheck ]; description = "Simple boolean tests to see if a value abides by certain properties"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "abnf" = callPackage @@ -23457,8 +23403,8 @@ self: { }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.1.1"; - sha256 = "18lkf75pw8lp03bj4b8vknj7ysvbhpix6zkzd86qaq0z3yh6s6jv"; + version = "0.2.1.2"; + sha256 = "1azms3ilfkqvyxxm2zjr55wali8vxx294lv924wn4ni5rqxhmjcq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23472,6 +23418,8 @@ self: { ]; description = "Derivation of Aeson instances for GADTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-generic-compat" = callPackage @@ -23671,27 +23619,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.7"; - sha256 = "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring scientific text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring cmdargs - ]; - description = "JSON pretty-printing library and command-line tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-pretty_0_8_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , cmdargs, scientific, text, unordered-containers, vector }: @@ -23710,7 +23637,6 @@ self: { ]; description = "JSON pretty-printing library and command-line tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-qq" = callPackage @@ -24762,17 +24688,6 @@ self: { }) {}; "alg" = callPackage - ({ mkDerivation, base, util }: - mkDerivation { - pname = "alg"; - version = "0.2.10.0"; - sha256 = "1zpr3knnj37fwi6h7mlxdlm88iy47srx1nkhgkix3f81ig9hlzd9"; - libraryHaskellDepends = [ base util ]; - description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alg_0_2_11_0" = callPackage ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; @@ -24781,7 +24696,6 @@ self: { libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -27476,8 +27390,8 @@ self: { }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "1.0.0.2"; - sha256 = "1k7l49h3zdqw3va70mr4rrmsyjpbzgbnr3bhj7yl24np77r6cs99"; + version = "1.1.0.0"; + sha256 = "0w5jqqc6m1cnhwdhyfb2k5kc9fzn499y2s9jkpsfqxpqynsivlwa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28830,8 +28744,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "7.4.3"; - sha256 = "0kzsj1zxic9c434s4jj86i2ydilhjz2rxa5826h581yq4g1mz6g8"; + version = "7.4.4"; + sha256 = "15pwsqa9slqrz0b74id040fc6mv15x2fjixxc5i289yf7asd06hb"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28851,8 +28765,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.4.3"; - sha256 = "0i1x7nds4j5rszfh6n8zhgfga3dpxbazmi7dysc0xh6yl9kfs1d4"; + version = "7.4.4"; + sha256 = "045nfhi0vp2vkh73ihflnaznk4jqqb800la1gdibv2i9wsjh0ghq"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28870,8 +28784,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.4.3"; - sha256 = "1k4vsfhd72lhkawww64vwz5iks310ixsrz29rhcj5vgfpc8ac0d4"; + version = "7.4.4"; + sha256 = "135cfx2af0srmwqarg6n28ir0mw7zz6lvbsf2n913ldx29sxfy7f"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28897,8 +28811,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.4.3"; - sha256 = "1ha2067dbi5qnfscbh93hy7w1z768134m23vy59mhp830swk21vz"; + version = "7.4.4"; + sha256 = "1i45gqb4x471j9r2dffj91glnyqmbq31p8h6x0yysqqdaz4pg88r"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28914,6 +28828,25 @@ self: { broken = true; }) {}; + "antiope-es" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core + , amazonka-elasticsearch, base, bytestring, hspec, hspec-discover + , json-stream, lens, thyme, unordered-containers, vector + }: + mkDerivation { + pname = "antiope-es"; + version = "7.4.4"; + sha256 = "1gqs3vgmzgxl28m5yqyd2asrm5gaclpk6kipyw28a6mqg07n4q5m"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-elasticsearch base bytestring + json-stream lens thyme unordered-containers vector + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + }) {}; + "antiope-messages" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog @@ -28922,8 +28855,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.4.3"; - sha256 = "1jbnlawj3dnz5sa035wik3padchh6wkrgbc3rgv9986kaqxswnf2"; + version = "7.4.4"; + sha256 = "1d8illnm016md52x7w1sv6iy1w2csmd5wr3qag7m35l7kcss2wpk"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28947,8 +28880,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.4.3"; - sha256 = "0365ianldf99jvhsip4lypvm6g1i0j5h0j3j7fbdr9z2sgn1jrjs"; + version = "7.4.4"; + sha256 = "0zf95m46ad1dm6kmcjcpm8rn839826f548bidgbpxhb5zn0hn2bj"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28972,8 +28905,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.4.3"; - sha256 = "0j8anrlilprik0n54fn0vx7jyh9yrfinkifvmjgdmsv3m372w3r8"; + version = "7.4.4"; + sha256 = "19bp9311zf88zqk34xxc82337adv3j65jc39hmx6y07bclzcm71r"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -29003,8 +28936,8 @@ self: { }: mkDerivation { pname = "antiope-shell"; - version = "7.4.3"; - sha256 = "07q3y1znyacwlrz1b51hamqzgbv3lks6kby93la024im4mhf4hd2"; + version = "7.4.4"; + sha256 = "0fyww095sny1aax3dmij352s40hlpcdjl0qmfijcbbjdpgs8dxdj"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages antiope-s3 attoparsec base bytestring exceptions @@ -29031,8 +28964,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "7.4.3"; - sha256 = "05zj4r32pvdj98zfbq21hvlm2xai2lky7l54y7cqwx2wr6wfa98k"; + version = "7.4.4"; + sha256 = "05k9wrwj18vp87zg2942lwrqzj0mq236jryx7bwh0y7k27znh5aq"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -29058,8 +28991,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.4.3"; - sha256 = "0f7k4kh8njibnapn1b5f9xxx505cq017ixc4k2yn8fd24g0dz9jw"; + version = "7.4.4"; + sha256 = "0a0lk22afk7ww32d2hqq419v2vd7wyxqsv2402z54pmg6xx0qhra"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -29083,8 +29016,8 @@ self: { }: mkDerivation { pname = "antiope-swf"; - version = "7.4.3"; - sha256 = "05a34lz4ih0vmmr6zfr5g6m7ai8yh8anqq38b2g6j9h22sy32iv7"; + version = "7.4.4"; + sha256 = "0b0wlbpn2bq1xwpb6j0knh4aa85a3rri1fhx5v3dqy5w4hy8vn0z"; libraryHaskellDepends = [ amazonka-swf base lens text ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; testToolDepends = [ hspec-discover ]; @@ -30356,22 +30289,6 @@ self: { }) {}; "arbor-lru-cache" = callPackage - ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec - , hw-hspec-hedgehog, lens, stm - }: - mkDerivation { - pname = "arbor-lru-cache"; - version = "0.1.1.0"; - sha256 = "0npyc9knih4qpxayz6wpsgw83rlv4bdw6d2jksrsh7rdxhidyiwg"; - libraryHaskellDepends = [ base containers generic-lens lens stm ]; - testHaskellDepends = [ - base containers generic-lens hedgehog hspec hw-hspec-hedgehog lens - stm - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "arbor-lru-cache_0_1_1_1" = callPackage ({ mkDerivation, base, containers, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, stm }: @@ -30386,7 +30303,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "LRU cache based on STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arbor-monad-counter" = callPackage @@ -30591,6 +30507,8 @@ self: { ]; description = "Common interface using libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archive-sig" = callPackage @@ -30923,6 +30841,8 @@ self: { ]; description = "Run docker-compose with help from Nix/NixOS"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arith-encode" = callPackage @@ -31648,46 +31568,6 @@ self: { }) {}; "asif" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, conduit - , conduit-combinators, conduit-extra, containers, cpu, directory - , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits - , hw-hspec-hedgehog, hw-ip, lens, network, old-locale - , optparse-applicative, profunctors, resourcet, temporary-resourcet - , text, thyme, transformers, vector - }: - mkDerivation { - pname = "asif"; - version = "6.0.1"; - sha256 = "1lbz2i0ijr23vsc3b064khz3kzj1jwikwxcmjlnzkqvgnbr70grw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions foldl generic-lens - hw-bits hw-ip lens network old-locale profunctors resourcet - temporary-resourcet text thyme transformers vector - ]; - executableHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu directory either exceptions foldl - generic-lens hw-bits hw-ip lens network old-locale - optparse-applicative profunctors resourcet temporary-resourcet text - thyme transformers vector - ]; - testHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions foldl generic-lens - hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip lens network - old-locale profunctors resourcet temporary-resourcet text thyme - transformers vector - ]; - description = "Library for creating and querying segmented feeds"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "asif_6_0_3" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec @@ -31807,25 +31687,6 @@ self: { }) {}; "asn1-encoding" = callPackage - ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl - , tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "asn1-encoding"; - version = "0.9.5"; - sha256 = "0adgbamyq0mj1l1hdq4zyyllay714bac1wl0rih3fv1z6vykp1hy"; - revision = "1"; - editedCabalFile = "0vsw8rd6fxd87rx3jyh3bb96sjd7ag0mrlylhkcmgaps2ma8sw5b"; - libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; - testHaskellDepends = [ - asn1-types base bytestring hourglass mtl tasty tasty-quickcheck - text - ]; - description = "ASN1 data reader and writer in RAW, BER and DER forms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asn1-encoding_0_9_6" = callPackage ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl , tasty, tasty-quickcheck }: @@ -31841,23 +31702,9 @@ self: { ]; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-parse" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: - mkDerivation { - pname = "asn1-parse"; - version = "0.9.4"; - sha256 = "025prsihk5g6rdv9xlfmj0zpa0wa3qjzj5i4ilzvg7f6f3sji8y6"; - libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring - ]; - description = "Simple monadic parser for ASN1 stream types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asn1-parse_0_9_5" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: mkDerivation { pname = "asn1-parse"; @@ -31868,7 +31715,6 @@ self: { ]; description = "Simple monadic parser for ASN1 stream types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-types" = callPackage @@ -32492,8 +32338,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.9.0"; - sha256 = "1wgfgdimfp2fnd630s8288dciip26ysl7p0lmvm321migm22idq9"; + version = "0.4.10.0"; + sha256 = "0nixj6cv367b6a2xa0pf37z6fcmrnwmngc27ps9qy85hc4nnl3cy"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -32793,8 +32639,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.30"; - sha256 = "19i3g3njmmhkhyx02q37r7n373n6h0yha6g5hrx0ix5nn8bp4k4w"; + version = "0.2.0.31"; + sha256 = "085087vkwzzy2qiv5iqicpr71zkfkvy9falicr3pbaj4dkwcd5mq"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup filepath ]; @@ -32813,15 +32659,15 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, cpphs , dependency, dhall, directory, file-embed, filemanip, filepath - , http-client, http-client-tls, lzma, microlens, mtl + , http-client, http-client-tls, language-ats, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats , shake-c, shake-ext, tar, temporary, text, unix, unix-compat , zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.2.6.0"; - sha256 = "1jxs3rfv9nrigwnshanc90dm3nzimr7zmfln1la5nv098prdkakr"; + version = "3.2.6.1"; + sha256 = "00l2v1vvfvpqq2yzx0lc3pnc8q72sdb71c3zdwrwx97x86kfifa1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32834,8 +32680,9 @@ self: { ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ - base bytestring cli-setup dependency directory microlens - optparse-applicative parallel-io shake shake-ats temporary text + base bytestring cli-setup dependency dhall directory language-ats + microlens optparse-applicative parallel-io shake shake-ats + temporary text ]; doHaddock = false; description = "A build tool for ATS"; @@ -32969,6 +32816,8 @@ self: { pname = "attoparsec"; version = "0.13.2.3"; sha256 = "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix"; + revision = "1"; + editedCabalFile = "164n392qrgyb8mg3xxaxym0ffvqyjr4ny4lfrr81y7hk3947yw9q"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -33943,40 +33792,6 @@ self: { }) {}; "avro" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, deepseq - , directory, extra, fail, gauge, hashable, hspec, hspec-discover - , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random - , raw-strings-qq, scientific, semigroups, tagged, template-haskell - , text, tf-random, transformers, unordered-containers, vector, zlib - }: - mkDerivation { - pname = "avro"; - version = "0.4.5.2"; - sha256 = "0cy2r8jrnyxwsxpd6mah4g56xh8n93f6gd613a4bwg8kqvykrpgq"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers data-binary-ieee754 deepseq fail hashable mtl scientific - semigroups tagged template-haskell text tf-random - unordered-containers vector zlib - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers directory extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged - text tf-random transformers unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random - raw-strings-qq template-haskell text transformers - unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_4_5_3" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, extra, fail, gauge, hashable, hspec, hspec-discover @@ -34008,7 +33823,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage @@ -35554,8 +35368,7 @@ self: { ]; description = "Create status bar menus for macOS from executables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + platforms = [ "x86_64-darwin" ]; }) {}; "barchart" = callPackage @@ -36935,6 +36748,8 @@ self: { ]; description = "A replacement of Yampa based on Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beautifHOL" = callPackage @@ -39303,24 +39118,6 @@ self: { }) {}; "bins" = callPackage - ({ mkDerivation, base, containers, finite-typelits - , ghc-typelits-knownnat, ghc-typelits-natnormalise, math-functions - , profunctors, reflection, tagged, vector-sized - }: - mkDerivation { - pname = "bins"; - version = "0.1.1.1"; - sha256 = "1v585ppm5g424jn2bkq7ydsdd6bds7gak53288vn4vclnw2rswr8"; - libraryHaskellDepends = [ - base containers finite-typelits ghc-typelits-knownnat - ghc-typelits-natnormalise math-functions profunctors reflection - tagged vector-sized - ]; - description = "Aggregate continuous values into discrete bins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bins_0_1_2_0" = callPackage ({ mkDerivation, base, containers, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, math-functions , profunctors, reflection, tagged, vector-sized @@ -39336,7 +39133,6 @@ self: { ]; description = "Aggregate continuous values into discrete bins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binsm" = callPackage @@ -40164,24 +39960,6 @@ self: { }) {}; "bits-extra" = callPackage - ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec - , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector - }: - mkDerivation { - pname = "bits-extra"; - version = "0.0.1.3"; - sha256 = "1vdgj5zz5q7y4n11bsn4v53x5yi0fckj13vbfyrgb454x6rhhav9"; - libraryHaskellDepends = [ base ghc-prim vector ]; - testHaskellDepends = [ - base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; - description = "Useful bitwise operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bits-extra_0_0_1_4" = callPackage ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector }: @@ -40197,7 +39975,6 @@ self: { benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; description = "Useful bitwise operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bits-extras" = callPackage @@ -40366,27 +40143,6 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, containers, gauge, ghc-prim, primitive - , quickcheck-classes, random, tasty, tasty-hunit, tasty-quickcheck - , vector - }: - mkDerivation { - pname = "bitvec"; - version = "1.0.0.1"; - sha256 = "1b3cf8f3a2xx4m80699p63id26dj61d7lgz38n5kv0vskq1zfcsp"; - revision = "1"; - editedCabalFile = "0q8hc4i62l43kpg8q3nqqzz03cdcv36ins2741sw3956sj92xfh4"; - libraryHaskellDepends = [ base ghc-prim primitive vector ]; - testHaskellDepends = [ - base primitive quickcheck-classes tasty tasty-hunit - tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ base containers gauge random vector ]; - description = "Space-efficient bit vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bitvec_1_0_1_2" = callPackage ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp , integer-gmp, primitive, quickcheck-classes, random, tasty , tasty-hunit, tasty-quickcheck, vector @@ -40408,7 +40164,6 @@ self: { ]; description = "Space-efficient bit vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "bitwise" = callPackage @@ -40913,27 +40668,6 @@ self: { }) {}; "blaze-html" = 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.9.1.1"; - sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa"; - 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 - ]; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-html_0_9_1_2" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -40952,7 +40686,6 @@ self: { ]; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-html-contrib" = callPackage @@ -41026,25 +40759,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.8.2.2"; - sha256 = "1qc2mn2zb2sdj3xvv73asibqnb11l7b5l30ff05qrfh7sy7wzw66"; - revision = "1"; - editedCabalFile = "0ivspcxz0b2r7kcas5hlw0fh92883r8ghwz9lck7nyqn6wn5i8zx"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_8_2_3" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -41059,7 +40773,6 @@ self: { ]; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -42277,8 +41990,8 @@ self: { pname = "boring"; version = "0.1.2"; sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr"; - revision = "2"; - editedCabalFile = "1qdgv5zanglhhx3hs4a7qlvfivsv82hnppj8lpyamfl4xw4x8vp1"; + revision = "3"; + editedCabalFile = "1d7xl2dxm4v33j1bd5450x1mh86x8kb24qjvad8nk98dmgf63ah2"; libraryHaskellDepends = [ adjunctions base base-compat constraints dec fin generics-sop singleton-bool streams tagged transformers transformers-compat vec @@ -42992,45 +42705,6 @@ self: { }) {}; "brittany" = callPackage - ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs - , containers, czipwith, data-tree-print, deepseq, directory, extra - , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec - , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty - , random, safe, semigroups, strict, syb, text, transformers - , uniplate, unsafe, yaml - }: - mkDerivation { - pname = "brittany"; - version = "0.12.0.0"; - sha256 = "058ffj00x374iaz75zzd9l0ab4crdsq2zjrq1r8lvcpp63fmsa7h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths monad-memo mtl multistate - neat-interpolation pretty random safe semigroups strict syb text - transformers uniplate unsafe yaml - ]; - executableHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths monad-memo mtl multistate - neat-interpolation pretty safe semigroups strict syb text - transformers uniplate unsafe yaml - ]; - testHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths hspec monad-memo mtl multistate - neat-interpolation parsec pretty safe semigroups strict syb text - transformers uniplate unsafe yaml - ]; - description = "Haskell source code formatter"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "brittany_0_12_1_0" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs , containers, czipwith, data-tree-print, deepseq, directory, extra , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec @@ -43067,7 +42741,6 @@ self: { ]; description = "Haskell source code formatter"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broadcast-chan" = callPackage @@ -44250,6 +43923,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-little_1_1_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp + , keys, mono-traversable, mono-traversable-keys, primitive + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text-show + }: + mkDerivation { + pname = "bv-little"; + version = "1.1.1"; + sha256 = "034riqlgkccyl5lvc593v3dyszvqy2vqikk80qm6lw30pkmbcdnr"; + libraryHaskellDepends = [ + base deepseq hashable integer-gmp keys mono-traversable + mono-traversable-keys primitive QuickCheck text-show + ]; + testHaskellDepends = [ + base deepseq hashable mono-traversable mono-traversable-keys + QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text-show + ]; + benchmarkHaskellDepends = [ + base criterion deepseq hashable mono-traversable QuickCheck + smallcheck + ]; + description = "Efficient little-endian bit vector library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils , pretty, QuickCheck, random @@ -45511,17 +45212,6 @@ self: { }) {}; "cabal-doctest" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "cabal-doctest"; - version = "1.0.7"; - sha256 = "1v5dlwsxd9kdll07x5apnf76j2g2pqfp138pacc64j6agrgyv00h"; - libraryHaskellDepends = [ base Cabal directory filepath ]; - description = "A Setup.hs helper for doctests running"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-doctest_1_0_8" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; @@ -45530,7 +45220,6 @@ self: { libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-file-th" = callPackage @@ -45566,6 +45255,8 @@ self: { ]; description = "Generate a FlatPak manifest from a Cabal package description"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-fmt" = callPackage @@ -47138,8 +46829,8 @@ self: { ({ mkDerivation, base, deepseq, hspec, HUnit }: mkDerivation { pname = "can-i-haz"; - version = "0.2.0.0"; - sha256 = "1sf42vxaqk10kxspib6lzdvs4hjmgyq61gbqp5l59vq7qxfz43ar"; + version = "0.2.0.1"; + sha256 = "0qpa6qkqih2hcl8xad33mvri1xw3q45sb2n8rhi27q03nfjx5zl5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq hspec HUnit ]; description = "Generic implementation of the Has and CoHas patterns"; @@ -49350,8 +49041,8 @@ self: { pname = "cgi"; version = "3001.4.0.0"; sha256 = "1d0nh5ymkqskkp4yn0gfz4mff8i0cxyw1wws8xxp6k1mg1ywa25k"; - revision = "1"; - editedCabalFile = "0q1s49hglw0zjcqsi7ba8nminywxgn6b83xds2lfp0r12q2h00xr"; + revision = "2"; + editedCabalFile = "1y0gh51qzdkmvla5r02vab8i9r90m4qqglb0iyy888yc4lw2v6jj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49362,6 +49053,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cgi_3001_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , multipart, network-uri, parsec, time, xhtml + }: + mkDerivation { + pname = "cgi"; + version = "3001.5.0.0"; + sha256 = "09wvp9vkqasns4flw9z46nhcy96r4qxjv6h47d5f90drz77pmm8a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl multipart network-uri + parsec time xhtml + ]; + description = "A library for writing CGI programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cgi-undecidable" = callPackage ({ mkDerivation, base, cgi, mtl }: mkDerivation { @@ -50052,6 +49762,8 @@ self: { libraryHaskellDepends = [ base chell QuickCheck random ]; description = "QuickCheck support for the Chell testing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chessIO" = callPackage @@ -50578,6 +50290,8 @@ self: { libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chs-deps" = callPackage @@ -53999,17 +53713,13 @@ self: { }) {}; "collada-types" = callPackage - ({ mkDerivation, base, containers, enumerable, OpenGL, tuple - , tuple-gen, vector - }: + ({ mkDerivation, base, containers, OpenGL, tuple, vector }: mkDerivation { pname = "collada-types"; - version = "0.3"; - sha256 = "0aw1y3ylcnpj3wwh6w8168a4mmkiayav6swyh2fq3vfjlds91xc8"; - libraryHaskellDepends = [ - base containers enumerable OpenGL tuple tuple-gen vector - ]; - description = "Data exchange between graphic applications"; + version = "0.4"; + sha256 = "1qs1bxxkjb6clszv8mahbmwdwbqpdr5hcxwn3nq5d6wc2xgb4y6r"; + libraryHaskellDepends = [ base containers OpenGL tuple vector ]; + description = "Data exchange between graphics applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -54333,6 +54043,8 @@ self: { pname = "colour-space"; version = "0.1.5.0"; sha256 = "13xmn8l11r06xna575sw6sdhp2rj25q8qd9ljbjpl37fr1qbc8xs"; + revision = "1"; + editedCabalFile = "0vz6yxwllvrcw6dbrpam8rbadzwzk3nab9skzigcnrkqi4y068wz"; libraryHaskellDepends = [ base call-stack colour constrained-categories JuicyPixels lens linear linearmap-category manifolds semigroups vector-space @@ -56150,22 +55862,6 @@ self: { }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.10.10"; - sha256 = "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22"; - 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; - }) {}; - - "concurrent-output_1_10_11" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -56179,7 +55875,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -57210,6 +56905,8 @@ self: { libraryHaskellDepends = [ base config-value text ]; description = "Interface between config-value and System.GetOpt"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "configifier" = callPackage @@ -59504,10 +59201,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.3.4"; - sha256 = "0q54dwhlp9x6k363n5p12722davfalxljxlbiskirky02kba9bdl"; - revision = "1"; - editedCabalFile = "0lsc0acz5h62qafg1nsz2gjdwpc3j5jmhgvbdwlv2jark9a045nw"; + version = "0.2.3.5"; + sha256 = "0n2sig9wqpfd182sxxsiadqi7hw6s88a531xhw49jv4hf43982rw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59524,6 +59219,8 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cplex-hs" = callPackage @@ -60412,43 +60109,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, binary-orphans, bytestring - , cassava, code-page, containers, criterion-measurement, deepseq - , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery - , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-compat, vector - , vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.6.0"; - sha256 = "1p8rw70k69bz33a8amn1ibdf6104hjphglyjlzsxa4w949d0ahp2"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary - binary-orphans bytestring cassava code-page containers - criterion-measurement deepseq directory exceptions filepath Glob - js-flot js-jquery microstache mtl mwc-random optparse-applicative - parsec statistics text time transformers transformers-compat vector - vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_6_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, binary-orphans, bytestring , cassava, code-page, containers, criterion-measurement, deepseq @@ -60483,7 +60143,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-compare" = callPackage @@ -60907,6 +60566,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma_0_1_1_6" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, HUnit + , optparse-applicative, QuickCheck, split, text + }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.1.1.6"; + sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers split text ]; + executableHaskellDepends = [ + ansi-terminal base containers optparse-applicative split text + ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "crypto-multihash" = callPackage ({ mkDerivation, base, base58-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck, string-conversions @@ -61062,8 +60741,8 @@ self: { }: mkDerivation { pname = "crypto-rng"; - version = "0.1.0.2"; - sha256 = "1h7ilx91jbnlmax0z74kvk6f3yr4f14pk15bi9qvhn8kj13i7qf1"; + version = "0.1.1.0"; + sha256 = "1h7pqps4f25sn28dhbs1jd58gl4ml9scc1s4dixbz8mvyv5aslkf"; libraryHaskellDepends = [ base bytestring crypto-api DRBG exceptions monad-control mtl transformers-base @@ -61798,8 +61477,8 @@ self: { }: mkDerivation { pname = "csv-conduit"; - version = "0.7.0.0"; - sha256 = "1rzshr0py23xi1cfgsghnhgy65hyhlxhlnb6qyfzfsqqshmy13s7"; + version = "0.7.1.0"; + sha256 = "01wmf2kzy483k3dbmcmf1mziwwrchdj7nxl63wakynsddh1zjv9v"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ghc-prim mmorph @@ -66324,8 +66003,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.10.1.2"; - sha256 = "0h8nxk9pir6ic65vh5y29jnlz7jrnq8inqg22h7nvlphk7qbblqw"; + version = "0.10.2.0"; + sha256 = "1yqswr5cvv2yzl15nylvnf2x7cshz482fgfi1nnm22vq71zszn2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66974,22 +66653,6 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; - version = "2.1.0.0"; - sha256 = "19jvcfkwavmvf08dwsch3izk9qzw8ldrghpvjgv2vh5dxr7wr9xq"; - libraryHaskellDepends = [ - base concurrency containers contravariant deepseq exceptions - leancheck profunctors random transformers - ]; - description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dejafu_2_1_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: @@ -67003,7 +66666,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -67821,14 +67483,16 @@ self: { }: mkDerivation { pname = "describe"; - version = "0.2.0.4"; - sha256 = "11mm4n9hw7spv8m26wxy6xiqa1kdx60s6jkhs8ndmqf8mas4iawh"; + version = "0.2.0.6"; + sha256 = "01g3wa8wzb7aary9mskgljak2cgn7wk0bycwil5g32510hpwvfbv"; libraryHaskellDepends = [ base bytestring cereal fixed-vector ]; testHaskellDepends = [ base bytestring cereal fixed-vector QuickCheck ]; description = "Combinators for describing binary data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "descrilo" = callPackage @@ -72231,6 +71895,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "docrecords" = callPackage + ({ mkDerivation, aeson, base, data-default, doctest, lens + , optparse-applicative, text, unordered-containers, vinyl, yaml + }: + mkDerivation { + pname = "docrecords"; + version = "0.1.0.0"; + sha256 = "1b8lavhm3iiz0w0b581yn88kaydwiimvj5j9sayx5gq04aa20jvj"; + libraryHaskellDepends = [ + aeson base data-default lens optparse-applicative text + unordered-containers vinyl yaml + ]; + testHaskellDepends = [ + aeson base data-default doctest lens optparse-applicative text + unordered-containers vinyl yaml + ]; + description = "Vinyl-based records with hierarchical field names, default values and documentation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "docstrings" = callPackage ({ mkDerivation, base, containers, heredoc, template-haskell }: mkDerivation { @@ -76668,6 +76354,8 @@ self: { ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "elynx-tools" = callPackage @@ -76714,6 +76402,8 @@ self: { ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emacs-keys" = callPackage @@ -76814,22 +76504,6 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2.11"; - sha256 = "051h1l6x4dpk2jg1bsxy32zswf8ridlix3k78k0h237gcassrfpb"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_12" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec , QuickCheck, template-haskell }: @@ -76843,7 +76517,6 @@ self: { testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -78668,6 +78341,8 @@ self: { ]; description = "General purpose live coding framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-gloss" = callPackage @@ -78683,6 +78358,8 @@ self: { ]; description = "General purpose live coding framework - Gloss backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-pulse" = callPackage @@ -78698,6 +78375,8 @@ self: { ]; description = "General purpose live coding framework - pulse backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-quickcheck" = callPackage @@ -78714,6 +78393,8 @@ self: { ]; description = "General purpose live coding framework - QuickCheck integration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "estimator" = callPackage @@ -79209,6 +78890,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to libevdev"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {evdev = null;}; "eve" = callPackage @@ -79489,18 +79172,18 @@ self: { ({ mkDerivation, aeson, array, attoparsec, base, blaze-html , bytestring, containers, file-embed, filepath, ghc-events , hashtables, hvega, mtl, optparse-applicative, semigroups, text - , time, vector + , time, trie-simple, vector }: mkDerivation { pname = "eventlog2html"; - version = "0.4.0"; - sha256 = "09gsxzqrbjksi5gnwf7b4d2ry0cj4gqzzbpbrb404lkd5v0z1sh1"; + version = "0.5.0"; + sha256 = "0f0ipqixbiy1niza0kv4bsx26hcjypwlpp4y2qrig7javzfa48nm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array attoparsec base blaze-html bytestring containers file-embed filepath ghc-events hashtables hvega mtl - optparse-applicative semigroups text time vector + optparse-applicative semigroups text time trie-simple vector ]; executableHaskellDepends = [ aeson base filepath text ]; description = "Visualise an eventlog"; @@ -79633,43 +79316,6 @@ self: { }) {}; "eventstore" = callPackage - ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring - , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, file-embed, hashable - , http-client, interpolate, lifted-async, lifted-base - , monad-control, monad-logger, mono-traversable, mtl, protobuf - , random, safe, safe-exceptions, semigroups, stm, stm-chans - , streaming, tasty, tasty-hspec, tasty-hunit, text, time - , transformers-base, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "eventstore"; - version = "1.3.1"; - sha256 = "1mpwd6bwyzzmg2mzbkllf2f05dsi17da5i3clvakjj9yv8dpxj3q"; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base - monad-control monad-logger mono-traversable mtl protobuf random - safe safe-exceptions semigroups stm stm-chans streaming text time - transformers-base unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger file-embed hashable - lifted-async lifted-base monad-control mono-traversable protobuf - safe safe-exceptions semigroups stm stm-chans streaming tasty - tasty-hspec tasty-hunit text time transformers-base - unordered-containers uuid vector - ]; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "eventstore_1_3_2" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, file-embed, hashable @@ -79926,27 +79572,6 @@ self: { }) {}; "exception-transformers" = callPackage - ({ mkDerivation, base, HUnit, stm, test-framework - , test-framework-hunit, transformers, transformers-compat - }: - mkDerivation { - pname = "exception-transformers"; - version = "0.4.0.7"; - sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj"; - revision = "1"; - editedCabalFile = "0sahi93f75acvmqagkjc1lcwx31crja6z9hyww9abj85x45pqa6f"; - libraryHaskellDepends = [ - base stm transformers transformers-compat - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit transformers - transformers-compat - ]; - description = "Type classes and monads for unchecked extensible exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "exception-transformers_0_4_0_8" = callPackage ({ mkDerivation, base, HUnit, stm, test-framework , test-framework-hunit, transformers, transformers-compat }: @@ -79963,7 +79588,6 @@ self: { ]; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exceptional" = callPackage @@ -81627,11 +81251,12 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.4.2"; - sha256 = "1jfdwhbw6g435p7waspg19viykqlqqqc7n8m75j34a8vwqyh5zpa"; - libraryHaskellDepends = [ base hgmp ]; + version = "0.6.4.3"; + sha256 = "08fwfk6k081gasfpvil9hhzcc85b6xlpflp2kqi9kwza3pfi3d0s"; + libraryHaskellDepends = [ base combinat hgmp ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; + doHaddock = false; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81788,27 +81413,26 @@ self: { }) {}; "fast-tags" = callPackage - ({ mkDerivation, alex, array, async, base, bytestring, containers - , cpphs, deepseq, directory, filepath, mtl, tasty, tasty-hunit - , text, utf8-string + ({ mkDerivation, alex, array, async, base, bytestring, Cabal + , containers, deepseq, directory, filepath, mtl, tasty, tasty-hunit + , text, transformers, vector, void }: mkDerivation { pname = "fast-tags"; - version = "1.5.0"; - sha256 = "0cchakbbs7sfjrsg6p45kv9bv1dsxp5mj6q3900v0hf8n7is3qqb"; + version = "2.0.0"; + sha256 = "0q2ijh1pdxzm57557vln195mmxs15wra9159vpsjvjda4gnd7bs6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base bytestring containers cpphs deepseq directory - filepath mtl text utf8-string + array base bytestring Cabal containers deepseq filepath mtl text + transformers vector void ]; libraryToolDepends = [ alex ]; executableHaskellDepends = [ - async base bytestring containers deepseq directory filepath text + async base deepseq directory filepath text ]; testHaskellDepends = [ - async base bytestring containers directory filepath tasty - tasty-hunit text + base bytestring tasty tasty-hunit text void ]; description = "Fast incremental vi and emacs tags"; license = stdenv.lib.licenses.bsd3; @@ -82648,30 +82272,6 @@ self: { }) {}; "feed" = callPackage - ({ mkDerivation, base, base-compat, bytestring, HUnit - , markdown-unlit, old-locale, old-time, safe, test-framework - , test-framework-hunit, text, time, time-locale-compat, utf8-string - , xml-conduit, xml-types - }: - mkDerivation { - pname = "feed"; - version = "1.2.0.0"; - sha256 = "0cakrlq1ra2gwyqmdhss4clkj0xxrwy3pc4xjzgqz4w3yd1czjg7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat bytestring old-locale old-time safe text time - time-locale-compat utf8-string xml-conduit xml-types - ]; - testHaskellDepends = [ - base base-compat HUnit old-time test-framework test-framework-hunit - text time xml-conduit xml-types - ]; - testToolDepends = [ markdown-unlit ]; - description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "feed_1_2_0_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, HUnit , markdown-unlit, old-locale, old-time, safe, test-framework , test-framework-hunit, text, time, time-locale-compat, utf8-string @@ -82693,7 +82293,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-cli" = callPackage @@ -84176,6 +83775,8 @@ self: { ]; description = "A better, more type-safe Enum"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "finitary-derive" = callPackage @@ -84338,17 +83939,6 @@ self: { }) {}; "first-class-patterns" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "first-class-patterns"; - version = "0.3.2.4"; - sha256 = "1dc24hgmxyhg7jrij3f3x46ra96y5fw047828f8ahxvj14ljix1v"; - libraryHaskellDepends = [ base transformers ]; - description = "First class patterns and pattern matching, using type families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "first-class-patterns_0_3_2_5" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "first-class-patterns"; @@ -84357,7 +83947,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "First class patterns and pattern matching, using type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "firstify" = callPackage @@ -85157,6 +84746,8 @@ self: { ]; description = "Haskell implementation of the FlatBuffers protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flay" = callPackage @@ -85475,18 +85066,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; - version = "1.0.18"; - sha256 = "1cyac1la7pg7hkpdd2lhk4clh6g1zd2n0f479xvgn14ibs6ki3ph"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_19" = callPackage ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; @@ -85496,7 +85075,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -86113,22 +85691,6 @@ self: { }) {}; "fold-debounce" = callPackage - ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay - , time - }: - mkDerivation { - pname = "fold-debounce"; - version = "0.2.0.8"; - sha256 = "1j7v11nq2q7p50z27lbmprwqrhvcf9qa5zy2hql68zsi53q3wszw"; - libraryHaskellDepends = [ - base data-default-class stm stm-delay time - ]; - testHaskellDepends = [ base hspec stm time ]; - description = "Fold multiple events that happen in a given period of time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fold-debounce_0_2_0_9" = callPackage ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay , time }: @@ -86142,7 +85704,6 @@ self: { testHaskellDepends = [ base hspec stm time ]; description = "Fold multiple events that happen in a given period of time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fold-debounce-conduit" = callPackage @@ -86308,31 +85869,6 @@ self: { }) {}; "folds" = callPackage - ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal - , cabal-doctest, comonad, constraints, contravariant, data-reify - , deepseq, directory, distributive, doctest, filepath, lens, mtl - , pointed, profunctors, reflection, semigroupoids, semigroups - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "folds"; - version = "0.7.4"; - sha256 = "0wj5fd3icj05w3lziv4rmqahsh42kzckxybjacyvwb45kiy6yvjw"; - configureFlags = [ "-f-test-hlint" ]; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base bifunctors comonad constraints contravariant - data-reify distributive lens mtl pointed profunctors reflection - semigroupoids transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring deepseq directory doctest filepath mtl semigroups - ]; - description = "Beautiful Folding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "folds_0_7_5" = callPackage ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal , cabal-doctest, comonad, constraints, contravariant, data-reify , deepseq, directory, distributive, doctest, filepath, lens, mtl @@ -86355,7 +85891,6 @@ self: { ]; description = "Beautiful Folding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "folds-common" = callPackage @@ -87527,6 +87062,8 @@ self: { libraryHaskellDepends = [ base free-algebras ]; description = "Free category"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-concurrent" = callPackage @@ -87918,31 +87455,6 @@ self: { }) {}; "freer-simple" = callPackage - ({ mkDerivation, base, criterion, extensible-effects, free, mtl - , natural-transformation, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, transformers-base - }: - mkDerivation { - pname = "freer-simple"; - version = "1.2.1.0"; - sha256 = "199cg3y4wx1kh2mrdzf7qswi0jnx9nbgj0a6z75y7ql639lqya5c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base natural-transformation template-haskell transformers-base - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion extensible-effects free mtl - ]; - description = "Implementation of a friendly effect system for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "freer-simple_1_2_1_1" = callPackage ({ mkDerivation, base, criterion, extensible-effects, free, mtl , natural-transformation, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, template-haskell, transformers-base @@ -87965,7 +87477,6 @@ self: { ]; description = "Implementation of a friendly effect system for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freer-simple-catching" = callPackage @@ -88716,17 +88227,17 @@ self: { "ftp-client" = callPackage ({ mkDerivation, attoparsec, base, bytestring, connection - , containers, exceptions, network, transformers + , containers, exceptions, network, tasty, tasty-hspec, transformers }: mkDerivation { pname = "ftp-client"; - version = "0.5.1.2"; - sha256 = "0sgabysbwmavnl0asxr5xwgx5py7zpqjaair69867cnrqq3jwf4q"; + version = "0.5.1.3"; + sha256 = "1alk8l8i5izdy5rk5qnig4wn0wd08pgnaixqq874mxwxhpak4c3f"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring tasty tasty-hspec ]; description = "Transfer files with FTP and FTPS"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -89308,15 +88819,16 @@ self: { , containers, contravariant, cryptonite, data-default, directory , exceptions, filepath, ghc-prim, Glob, hashable, hedis, hinotify , hostname, integer-gmp, katip, lens, lifted-async, memory - , monad-control, mtl, optparse-applicative, path, path-io, pretty - , process, random, safe-exceptions, scientific, sqlite-simple, stm - , store, tasty, tasty-hunit, template-haskell, temporary, text - , time, transformers, unix, unordered-containers, vector, yaml + , monad-control, mtl, network, optparse-applicative, path, path-io + , pretty, process, random, safe-exceptions, scientific + , sqlite-simple, stm, store, tar, tasty, tasty-hunit + , template-haskell, temporary, text, time, transformers, unix + , unordered-containers, vector, yaml }: mkDerivation { pname = "funflow"; - version = "1.4.0"; - sha256 = "1pd690y41bf6lrk6bzl730hvpaaazya927nslwp8ii5rcn6wjx7f"; + version = "1.5.0"; + sha256 = "0mvv78jjiq3bglqpynl90155mwm7k8m7qv127cxi31n0xmzpw4ky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89325,11 +88837,11 @@ self: { ghc-prim Glob hashable hedis hinotify hostname integer-gmp katip lens lifted-async memory monad-control mtl path path-io pretty process random safe-exceptions scientific sqlite-simple stm store - template-haskell text time transformers unix unordered-containers - vector yaml + tar template-haskell text time transformers unix + unordered-containers vector yaml ]; executableHaskellDepends = [ - base bytestring clock hedis optparse-applicative path + base bytestring clock hedis network optparse-applicative path safe-exceptions text unix ]; testHaskellDepends = [ @@ -90298,6 +89810,8 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.gnome2) GConf;}; "gd" = callPackage @@ -91334,6 +90848,8 @@ self: { libraryHaskellDepends = [ base generics-mrsop ]; description = "Reimplementation of the `gdiff` algorithm for `generics-mrsop`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generics-sop" = callPackage @@ -93181,18 +92697,6 @@ self: { }) {}; "ghc-parser" = callPackage - ({ mkDerivation, base, cpphs, ghc, happy }: - mkDerivation { - pname = "ghc-parser"; - version = "0.2.0.3"; - sha256 = "0j0injpah571chhgm2gzrim7908l859mgppvxp966bwla3i7j1aj"; - libraryHaskellDepends = [ base ghc ]; - libraryToolDepends = [ cpphs happy ]; - description = "Haskell source parser from GHC"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ghc-parser_0_2_1_0" = callPackage ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; @@ -93202,7 +92706,6 @@ self: { libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-paths" = callPackage @@ -93448,20 +92951,6 @@ self: { }) {}; "ghc-syntax-highlighter" = callPackage - ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: - mkDerivation { - pname = "ghc-syntax-highlighter"; - version = "0.0.4.0"; - sha256 = "1kw1h7n4ydn1klzll24nwwg405j23wry9hg8g96vba51vah0wc47"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ghc text ]; - testHaskellDepends = [ base hspec text ]; - testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using lexer of GHC itself"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-syntax-highlighter_0_0_4_1" = callPackage ({ mkDerivation, base, ghc, ghc-boot, hspec, hspec-discover, text }: mkDerivation { @@ -93474,7 +92963,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using lexer of GHC itself"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -93579,17 +93067,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-knownnat_0_7" = callPackage + "ghc-typelits-knownnat_0_7_1" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck , template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7"; - sha256 = "00f8m3kmp572r8jr246m8r6lwzxmiqj4hml06w09l9n3lzvjwv7b"; - revision = "1"; - editedCabalFile = "1jgwa66dbhqsav7764cfcmzs3p0f3csbdjbrnbilhv1bpqyhz8sm"; + version = "0.7.1"; + sha256 = "00pfkb6iw4isfmp0jmcqsqyb84xf6b4xnljn3bmax2x8ci9vpm0c"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -93962,10 +93448,8 @@ self: { }: mkDerivation { pname = "ghcjs-base-stub"; - version = "0.2.0.0"; - sha256 = "05k59a6jg1a5s8zvqfah5rvm5kg34sqpv2zx4chczihx3n9prfv7"; - revision = "1"; - editedCabalFile = "0hvmgwyhv28d39was8bm52anwqh6x4mbd1mzzqxazlm0d0l8bpwp"; + version = "0.3.0.2"; + sha256 = "1v5kw7aqrjpi33annd12lp14q97i2yxjlr65cjjznqldyryjdbkm"; libraryHaskellDepends = [ aeson attoparsec base containers deepseq ghc-prim primitive scientific text transformers unordered-containers vector @@ -95116,6 +94600,8 @@ self: { libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -95440,8 +94926,8 @@ self: { }: mkDerivation { pname = "giphy-api"; - version = "0.6.0.1"; - sha256 = "0146813vcnjgb8clyczlz8g6ngm9l702gib60f2m6rf2bc0bbpwd"; + version = "0.7.0.0"; + sha256 = "140d3k9c1jz6byvars1d1h66gwy1045nxnj0xqxn5kdq60gfp5a1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95536,14 +95022,15 @@ self: { , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare , socks, split, stm, stm-chans, tagsoup, tasty, tasty-hunit , tasty-quickcheck, tasty-rerun, template-haskell, text, time - , torrent, transformers, unix, unix-compat, unordered-containers - , utf8-string, uuid, vector, wai, wai-extra, warp, warp-tls, wget - , which, yesod, yesod-core, yesod-form, yesod-static + , torrent, transformers, unix, unix-compat, unliftio-core + , unordered-containers, utf8-string, uuid, vector, wai, wai-extra + , warp, warp-tls, wget, which, yesod, yesod-core, yesod-form + , yesod-static }: mkDerivation { pname = "git-annex"; - version = "7.20190912"; - sha256 = "1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv"; + version = "7.20191009"; + sha256 = "10ycvjl9b3aa81zdz239ngjbbambfjrzds1a23wdlbjkn12nsg4g"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -95569,8 +95056,8 @@ self: { SafeSemaphore sandi securemem shakespeare socks split stm stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time torrent transformers unix unix-compat - unordered-containers utf8-string uuid vector wai wai-extra warp - warp-tls yesod yesod-core yesod-form yesod-static + unliftio-core unordered-containers utf8-string uuid vector wai + wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -97066,6 +96553,8 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gll" = callPackage @@ -97211,23 +96700,6 @@ self: { }) {}; "gloss" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , gloss-rendering, GLUT, OpenGL - }: - mkDerivation { - pname = "gloss"; - version = "1.13.0.1"; - sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q"; - revision = "1"; - editedCabalFile = "1nyg324icnlky647zq4c21sqxv2bgnwnzgh2hz5d5ys6ba69j59h"; - libraryHaskellDepends = [ - base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL - ]; - description = "Painless 2D vector graphics, animations and simulations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss_1_13_1_1" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim , gloss-rendering, GLUT, OpenGL }: @@ -97240,7 +96712,6 @@ self: { ]; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-accelerate" = callPackage @@ -97372,21 +96843,6 @@ self: { }) {}; "gloss-raster" = callPackage - ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering - , repa - }: - mkDerivation { - pname = "gloss-raster"; - version = "1.13.0.2"; - sha256 = "1k4l19c1fn1s14phq2qml5ibsli3jmkk6748k9y96lbrgj5nfp49"; - libraryHaskellDepends = [ - base containers ghc-prim gloss gloss-rendering repa - ]; - description = "Parallel rendering of raster images"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-raster_1_13_1_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering , repa }: @@ -97399,7 +96855,6 @@ self: { ]; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-raster-accelerate" = callPackage @@ -101140,8 +100595,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.4.0.1"; - sha256 = "049xz8gscqxn5k5vy34zc97w4in4scv89jvd71kxf24yvxblzayz"; + version = "0.4.1"; + sha256 = "1hnn3k78hl7kd6dxv45l5lljva1jzv9akpa7jgr22a3mjccf65sr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102112,27 +101567,6 @@ self: { }) {}; "greskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , exceptions, greskell-core, hint, hspec, semigroups, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; - version = "0.2.3.0"; - sha256 = "0q15cifn34p0biwwrmkhhgzps2k7d0i8mdb2vazbbf7bshqs2ld8"; - libraryHaskellDepends = [ - aeson base exceptions greskell-core semigroups text transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell_0_2_3_1" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , exceptions, greskell-core, hint, hspec, semigroups, text , transformers, unordered-containers, vector @@ -102151,31 +101585,9 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; - version = "0.1.2.6"; - sha256 = "0p68kwcwccmqn58dx1vyy4k1sc9zk2n2l8hiligik6zpbv4vmkdz"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_2_7" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific , semigroups, text, unordered-containers, uuid, vector @@ -102194,7 +101606,6 @@ self: { ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-websocket" = callPackage @@ -102962,6 +102373,8 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -105146,8 +104559,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.6"; - sha256 = "1fi3f90jd7s10iw1lcqhy8vfv27794sfsp7bjlb9rgab7jqf3wqv"; + version = "0.6.1"; + sha256 = "1r4n23da767gkcg1s8sjk359kaz9y8sr1pxpdm1lfb7v43rymf5m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -106283,6 +105696,8 @@ self: { testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hal" = callPackage @@ -107574,8 +106989,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.5.3"; - sha256 = "05ki6j3cc9pfqaf7qbr2g4z4kdn4zjrqd3n0n02n9297bcvcschp"; + version = "7.5.4"; + sha256 = "0i7csvmwv7n68gkwqzi985p2mjdgzipjnlj873sdiknhx9pfmq70"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -111695,8 +111110,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.9.0"; - sha256 = "1kwk3ycb4hjybsj43fg5khg2i5rgfrlwcmp7hknyzgzyshmwj1bx"; + version = "0.9.1"; + sha256 = "1jpq7dz6gfpgvjgrss4cwgrjmicw9yyfrsfnfq980cjw7h0inc41"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite entropy hashable memory mtl murmur3 network @@ -111712,7 +111127,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_9_1" = callPackage + "haskoin-core_0_9_2" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, entropy, hashable, hspec , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck @@ -111721,8 +111136,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.9.1"; - sha256 = "1jpq7dz6gfpgvjgrss4cwgrjmicw9yyfrsfnfq980cjw7h0inc41"; + version = "0.9.2"; + sha256 = "18iscx2pzc80p1d6b3lrm5hvv877lsk7ay4iyknd091v8dw9lgm9"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite entropy hashable memory mtl murmur3 network @@ -111773,8 +111188,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.11"; - sha256 = "041qqn35c2iy4axfdl58x7fr4asn7wclra0095hh4zc37m9f9ihn"; + version = "0.9.13"; + sha256 = "15z6qnaj5lk6kd151nl6ddjza0ngpgx8j29ayd5pcwr59r40hl95"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -111852,8 +111267,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.18.0"; - sha256 = "1ncq1k2l1v3a56d3fs2nx7b94iafyyngi4v4i4y9vf9z6f3lzm91"; + version = "0.18.4"; + sha256 = "1ga42lqi2yly18cyqivgpq9amz1fxfibsmr1vh79d6q6l8i8iwgl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113604,8 +113019,8 @@ self: { pname = "haxr"; version = "3000.11.3"; sha256 = "1ab422ngg63w91a71j17swzzdxk0y2053fijml0illarcrd77cnj"; - revision = "2"; - editedCabalFile = "1spv34kjfnpk0j8wap73qwkkqzshb2lvwrg7c3rfpy712ndbsl2h"; + revision = "3"; + editedCabalFile = "1jycnkzcxk6ny3ql5mv438xwmcifxprsrsaxqnbmslm6m43d6yxf"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -117587,8 +117002,8 @@ self: { }: mkDerivation { pname = "hierarchical-clustering-diagrams"; - version = "0.3.2"; - sha256 = "06ncyzhql74ni746a9hzma1v0grw99vas4xglmyvgd6yhdwl08sr"; + version = "0.4"; + sha256 = "0msb10qbqppwk3vspjz2w714srawbzgfsgml4ylhvyzrylpp6awr"; libraryHaskellDepends = [ base diagrams-lib hierarchical-clustering ]; @@ -118267,27 +117682,6 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, containers, directory, exceptions - , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit - , mtl, random, temporary, unix - }: - mkDerivation { - pname = "hint"; - version = "0.9.0.1"; - sha256 = "15cnam704p7ynk70lqz3nvy91src5bd9amfdknvkfzpi5yf2825b"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix - ]; - testHaskellDepends = [ - base containers directory exceptions extensible-exceptions filepath - HUnit unix - ]; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hint_0_9_0_2" = callPackage ({ mkDerivation, base, containers, directory, exceptions , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit , mtl, random, temporary, unix @@ -118306,7 +117700,6 @@ self: { ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hint-server" = callPackage @@ -118859,6 +118252,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hjsmin_0_2_0_3" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , language-javascript, optparse-applicative, process, text, unix + }: + mkDerivation { + pname = "hjsmin"; + version = "0.2.0.3"; + sha256 = "0ag5r8qq305rgddr5ggl9c543ahjhy4026yjvjc5wfdxl4syyzvv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring language-javascript text + ]; + executableHaskellDepends = [ + base bytestring language-javascript optparse-applicative text + ]; + testHaskellDepends = [ + base directory extra filepath process unix + ]; + description = "Haskell implementation of a javascript minifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjson" = callPackage ({ mkDerivation, base, containers, parsec }: mkDerivation { @@ -119046,23 +118463,6 @@ self: { }) {}; "hkgr" = callPackage - ({ mkDerivation, base, directory, filepath, simple-cabal - , simple-cmd, simple-cmd-args - }: - mkDerivation { - pname = "hkgr"; - version = "0.2.2"; - sha256 = "1wz2yy3fiwy4601p0ir24dvv7yzfrqf99z07m8whc6gr2ypsnfjc"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath simple-cabal simple-cmd simple-cmd-args - ]; - description = "Simple Hackage release workflow for package maintainers"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "hkgr_0_2_4" = callPackage ({ mkDerivation, base, directory, filepath, simple-cabal , simple-cmd, simple-cmd-args }: @@ -119077,7 +118477,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hkt" = callPackage @@ -121191,6 +120590,19 @@ self: { broken = true; }) {}; + "homotuple" = callPackage + ({ mkDerivation, base, OneTuple, Only, single-tuple }: + mkDerivation { + pname = "homotuple"; + version = "0.1.0.0"; + sha256 = "0m72srmxqp8834ir08b5n9jk20yimmn5vwqyhpdxiyq4akbmb1w1"; + revision = "2"; + editedCabalFile = "0kn941gr9j6li1lnynx3fd652kvcbm1j4y8jd9qd6ynrcqd2hpia"; + libraryHaskellDepends = [ base OneTuple Only single-tuple ]; + description = "Homotuple, all whose elements are the same type"; + license = stdenv.lib.licenses.asl20; + }) {}; + "homplexity" = callPackage ({ mkDerivation, base, containers, cpphs, deepseq, directory , filepath, happy, haskell-src-exts, hflags, pqueue @@ -122353,7 +121765,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_32_0" = callPackage + "hpack_0_33_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -122363,8 +121775,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.32.0"; - sha256 = "11qfqyhcwihmx1z9pg5fhza1ww8wapr04wzyx8sknwpxs3hacm4z"; + version = "0.33.0"; + sha256 = "1w49rjcviy4vyj1b45ifpva4bgwc0xd305si148rkxa65378ranj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125154,7 +124566,7 @@ self: { broken = true; }) {}; - "hsdev_0_3_3_4" = callPackage + "hsdev_0_3_3_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec , base, bytestring, Cabal, containers, cpphs, data-default, deepseq , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc @@ -125168,8 +124580,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.4"; - sha256 = "1hj2krdq4ybs1vcy9gw6p56sznzi7wrhkaaya4560kjyijvvfdml"; + version = "0.3.3.5"; + sha256 = "0zfamx0mqr6vjfm4cnpi7wm6g7lcanjaj2ljja6symxwhly7sx3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125717,18 +125129,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hslogger_1_3_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, network - , network-bsd, old-locale, time, unix + "hslogger_1_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, HUnit + , network, network-bsd, old-locale, time, unix }: mkDerivation { pname = "hslogger"; - version = "1.3.0.0"; - sha256 = "1gnnqyd5hr59agqjcbim3kys5zarwsj7b1kfdbhy5qmjjwnpyzs8"; - revision = "1"; - editedCabalFile = "0hvlixqc7vr66qq96flnh3l2p7a6pfmzxf9sn8f243yvsq867yah"; + version = "1.3.1.0"; + sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; libraryHaskellDepends = [ - base bytestring containers network network-bsd old-locale time unix + base bytestring containers deepseq network network-bsd old-locale + time unix ]; testHaskellDepends = [ base HUnit ]; description = "Versatile logging framework"; @@ -126305,6 +125716,8 @@ self: { pname = "hspec-core"; version = "2.7.1"; sha256 = "08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c"; + revision = "1"; + editedCabalFile = "0aw68sgz2p63y0vg07c1jx2pr8lmhp5c1ck60dlipyxsa00455i6"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -128105,26 +127518,6 @@ self: { }) {}; "html-conduit" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, conduit - , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text - , transformers, xml-conduit, xml-types - }: - mkDerivation { - pname = "html-conduit"; - version = "1.3.2"; - sha256 = "0l5hc7bf57p5jiqh3wvnqapc27ibnlv00zm6szc0nqbvknzvvz85"; - libraryHaskellDepends = [ - attoparsec base bytestring conduit conduit-extra containers - resourcet text transformers xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring containers deepseq hspec HUnit text xml-conduit - ]; - description = "Parse HTML documents using xml-conduit datatypes"; - license = stdenv.lib.licenses.mit; - }) {}; - - "html-conduit_1_3_2_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text , transformers, xml-conduit, xml-types @@ -128142,7 +127535,6 @@ self: { ]; description = "Parse HTML documents using xml-conduit datatypes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-email-validate" = callPackage @@ -128913,10 +128305,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.3.7.1"; - sha256 = "1xnjbwvil1an5crffcwapdqyinbvvss25rcdra05isqixcs26h39"; - revision = "1"; - editedCabalFile = "0mmlaxnpxpgm4kzxid3xlwwqd53djx8n9a07nhvk5awyql1h9yj5"; + version = "2.3.7.2"; + sha256 = "16w77zm1pacs2qgz8sr0g935jjd3gmkhrw0gm9pijalaqbliffn9"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra http-client http-client-tls http-types mtl resourcet transformers unliftio-core @@ -128933,6 +128323,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_7_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.7.3"; + sha256 = "00rshi1y0h8y4rvsnnad0bppxgpvp40sk7lw1kxmdwy8pi8xrvbs"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -130524,8 +129943,8 @@ self: { ({ mkDerivation, aeson, base, hedgehog, hspec, text }: mkDerivation { pname = "hw-aeson"; - version = "0.1.0.1"; - sha256 = "0ymjsadvwmbxc1lk913z31vcr50i88dx29i3g0x8zvm6vj6m96g0"; + version = "0.1.0.2"; + sha256 = "11i0w0w5mi9k94p14c4pi1lsgwbr2cnnyhl7fbmxc7lqwr2a7k3s"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base hedgehog hspec ]; description = "Convenience functions for Aeson"; @@ -130557,7 +129976,7 @@ self: { broken = true; }) {}; - "hw-balancedparens_0_3_0_1" = callPackage + "hw-balancedparens_0_3_0_2" = callPackage ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec , hspec-discover, hw-bits, hw-excess, hw-fingertree , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers @@ -130565,8 +129984,8 @@ self: { }: mkDerivation { pname = "hw-balancedparens"; - version = "0.3.0.1"; - sha256 = "1lndl9f1bvdj79979bp8bnff6y7qskvx6fdjfkwnnaf9sxxsi5jl"; + version = "0.3.0.2"; + sha256 = "1x961b5jq5hal5k3dc98xpldpsillxf4vkbc4m7yw05bmas0smia"; libraryHaskellDepends = [ base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim hw-rankselect-base vector @@ -130589,16 +130008,14 @@ self: { "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim - , hw-string-parse, QuickCheck, safe, vector + , hw-string-parse, QuickCheck, vector }: mkDerivation { pname = "hw-bits"; - version = "0.7.0.6"; - sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm"; - revision = "2"; - editedCabalFile = "1lp2kbmdc5lq7xqi2ix7jccw1gmjxl1q01bflj8fzr2f713m9yrr"; + version = "0.7.0.7"; + sha256 = "11j43d8fxi3s6mfhnx2kcj03gpxj7gxmi00vbbnxnwby66vvbbib"; libraryHaskellDepends = [ - base bytestring hw-int hw-prim hw-string-parse safe vector + base bytestring hw-int hw-prim hw-string-parse vector ]; testHaskellDepends = [ base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck @@ -130612,21 +130029,20 @@ self: { broken = true; }) {}; - "hw-bits_0_7_0_7" = callPackage + "hw-bits_0_7_0_8" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim - , hw-string-parse, QuickCheck, vector + , hw-string-parse, vector }: mkDerivation { pname = "hw-bits"; - version = "0.7.0.7"; - sha256 = "11j43d8fxi3s6mfhnx2kcj03gpxj7gxmi00vbbnxnwby66vvbbib"; + version = "0.7.0.8"; + sha256 = "1yrck20adphrqai9nq8qxyi3l5y7gx9gjvr4vgdzg39mnl6057s4"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse vector ]; testHaskellDepends = [ - base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck - vector + base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion vector ]; @@ -130680,6 +130096,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hw-conduit_0_2_0_6" = callPackage + ({ mkDerivation, array, base, bytestring, conduit + , conduit-combinators, criterion, hspec, hspec-discover, mmap, time + , transformers, unliftio-core, vector, word8 + }: + mkDerivation { + pname = "hw-conduit"; + version = "0.2.0.6"; + sha256 = "0z90nslvvd5lkzkivklln3kbpgpwn4l6b45bdn7nhn9qa50ii1rc"; + libraryHaskellDepends = [ + array base bytestring conduit conduit-combinators time transformers + unliftio-core word8 + ]; + testHaskellDepends = [ base bytestring conduit hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mmap vector + ]; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-conduit-merges" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , mtl, QuickCheck @@ -130750,6 +130189,45 @@ self: { broken = true; }) {}; + "hw-dsv_0_3_6" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion + , deepseq, directory, generic-lens, ghc-prim, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim + , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap + , optparse-applicative, resourcet, text, vector, weigh + }: + mkDerivation { + pname = "hw-dsv"; + version = "0.3.6"; + sha256 = "0gjpx6yvx25g239imqqg8dbx7jwhamqcz435cikl0dvrid25asy5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim + hw-rankselect hw-rankselect-base hw-simd vector + ]; + executableHaskellDepends = [ + base bits-extra bytestring deepseq generic-lens ghc-prim hedgehog + hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd lens + optparse-applicative resourcet vector + ]; + testHaskellDepends = [ + base bits-extra bytestring cassava deepseq directory ghc-prim + hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base hw-simd text vector weigh + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava criterion deepseq directory + ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd + mmap vector + ]; + description = "Unbelievably fast streaming DSV file parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-dump" = callPackage ({ mkDerivation, base, bits-extra, bytestring, criterion , generic-lens, hedgehog, hspec, hspec-discover, hw-bits @@ -130758,8 +130236,8 @@ self: { }: mkDerivation { pname = "hw-dump"; - version = "0.1.0.0"; - sha256 = "1srbn2xkaa8ab1x00hasanj829h5pypa8dan37zcmdhdqvpc6k25"; + version = "0.1.0.1"; + sha256 = "0iswbvvviaj1j34zvm04nzpjicwyzs5imc4rc8vkwmx41nlypxdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130821,6 +130299,43 @@ self: { broken = true; }) {}; + "hw-eliasfano_0_1_1_1" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , generic-lens, hedgehog, hspec, hspec-discover, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim + , hw-rankselect, hw-rankselect-base, lens, mmap + , optparse-applicative, resourcet, temporary-resourcet, vector + }: + mkDerivation { + pname = "hw-eliasfano"; + version = "0.1.1.1"; + sha256 = "0fmbcddw13m49xvw8gnpjh246mw4k9h3hr94k956bi1vdvywyqv7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect + hw-rankselect-base temporary-resourcet vector + ]; + executableHaskellDepends = [ + base binary bytestring generic-lens hw-bits hw-packed-vector + hw-prim hw-rankselect hw-rankselect-base lens optparse-applicative + resourcet temporary-resourcet vector + ]; + testHaskellDepends = [ + base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int + hw-packed-vector hw-prim hw-rankselect hw-rankselect-base vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector + ]; + description = "Elias-Fano"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-excess" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim @@ -130849,6 +130364,32 @@ self: { broken = true; }) {}; + "hw-excess_0_2_2_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.2.1"; + sha256 = "1n4qgnwf61gdwai163sqkc4lzhni65f94r5hcmq0im502596iy9b"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe vector + ]; + testHaskellDepends = [ + base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-prim vector + ]; + description = "Excess"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-fingertree" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, hw-prim @@ -130866,25 +130407,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-fingertree-strict" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit - , hw-hspec-hedgehog, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + "hw-fingertree_0_1_1_1" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, hw-prim }: mkDerivation { - pname = "hw-fingertree-strict"; + pname = "hw-fingertree"; version = "0.1.1.1"; - sha256 = "0s0jz6lynxiaz2h8hr78j05vhswrl6vwhmvdra9a46c3yg7vf9qi"; - libraryHaskellDepends = [ base deepseq ]; + sha256 = "01ghnnnbbrdy9s84rcw37v3yvlrw5awgdmcrzh0xd5dxpw557psf"; + libraryHaskellDepends = [ base deepseq hw-prim ]; testHaskellDepends = [ - base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 + base deepseq hedgehog hspec hw-hspec-hedgehog ]; - description = "Generic strict finger-tree structure"; + testToolDepends = [ hspec-discover ]; + description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-fingertree-strict_0_1_1_2" = callPackage + "hw-fingertree-strict" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover , HUnit, hw-hspec-hedgehog, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -130901,6 +130442,25 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic strict finger-tree structure"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-fingertree-strict_0_1_1_3" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover + , HUnit, hw-hspec-hedgehog, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree-strict"; + version = "0.1.1.3"; + sha256 = "1fy492nl10a7p9a0b0jrqj1yiar8wir2g3qms2mmd814brbfkm80"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + testToolDepends = [ hspec-discover ]; + description = "Generic strict finger-tree structure"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -130918,6 +130478,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hedgehog_0_1_0_4" = callPackage + ({ mkDerivation, base, hedgehog, vector }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.0.4"; + sha256 = "0aps3h6ajrkl9nbrf66rxigya17jf7d0fs5yn7bbzfwqknik12n8"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base ]; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hspec-hedgehog" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, hspec-discover , HUnit, transformers @@ -130937,6 +130510,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hspec-hedgehog_0_1_0_9" = callPackage + ({ mkDerivation, base, call-stack, hedgehog, hspec, hspec-discover + , HUnit, transformers + }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.0.9"; + sha256 = "1rfcz7fq7gp8xxlax8l1vfr88h9sh50ghs1iihy9jqv135d1dbky"; + libraryHaskellDepends = [ + base call-stack hedgehog hspec HUnit transformers + ]; + testHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; + testToolDepends = [ hspec-discover ]; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -130948,6 +130539,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-int_0_0_0_4" = callPackage + ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog + , hw-hspec-hedgehog + }: + mkDerivation { + pname = "hw-int"; + version = "0.0.0.4"; + sha256 = "0im0fk23v6gh6hwfr35swai5fnvkpw0rrssc3s0ac978c899a8iz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog hspec hw-hedgehog hw-hspec-hedgehog + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional facilities for Integers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-ip" = callPackage ({ mkDerivation, appar, base, binary, bytestring, containers , generic-lens, hedgehog, hspec, hspec-discover, hw-bits @@ -130979,6 +130588,35 @@ self: { broken = true; }) {}; + "hw-ip_2_3_4_2" = callPackage + ({ mkDerivation, appar, base, binary, bytestring, containers + , generic-lens, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text + }: + mkDerivation { + pname = "hw-ip"; + version = "2.3.4.2"; + sha256 = "020pwy89hx4jcmq5vwd0gs4vbb2llkvvzaqk72s06w51hqrfpxb9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + appar base containers generic-lens hw-bits iproute text + ]; + executableHaskellDepends = [ + appar base binary bytestring generic-lens lens optparse-applicative + text + ]; + testHaskellDepends = [ + appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens @@ -131020,7 +130658,7 @@ self: { broken = true; }) {}; - "hw-json_1_3_1_0" = callPackage + "hw-json_1_3_1_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits @@ -131032,10 +130670,8 @@ self: { }: mkDerivation { pname = "hw-json"; - version = "1.3.1.0"; - sha256 = "0y5gxr4db381lndjr666l6vl022z9pnp5ypsmrwxcx53hv7glzwn"; - revision = "1"; - editedCabalFile = "1aw2sg7vchf9jd01dkvcbw33n6l5hgi4kyhjk4syr6cnyxysf187"; + version = "1.3.1.1"; + sha256 = "0w0k8zkswpvawp3ni3av8ak18a8wj509dll0v3cq7i4lljv51b5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131092,10 +130728,8 @@ self: { }: mkDerivation { pname = "hw-json-simd"; - version = "0.1.0.2"; - sha256 = "13i41ppi3ncisfyl3jvpgf4cbx86gyy0maq1xm0jipplkr78844w"; - revision = "1"; - editedCabalFile = "1vbq16ik20yvipvlpf9jrdsv33ynm152rr7c67lcdv8nf4gg4mhq"; + version = "0.1.0.3"; + sha256 = "0cgi7q0cx3zx56wq9l115vbhwc6yjbdrmiyz6z8zcnlhgq6cfgjl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -131108,14 +130742,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json-simd_0_1_0_3" = callPackage + "hw-json-simd_0_1_0_4" = callPackage ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens , optparse-applicative, vector }: mkDerivation { pname = "hw-json-simd"; - version = "0.1.0.3"; - sha256 = "0cgi7q0cx3zx56wq9l115vbhwc6yjbdrmiyz6z8zcnlhgq6cfgjl"; + version = "0.1.0.4"; + sha256 = "1qpk7vzya28y56qlb2fmx3ic39n9x2z8dh932rn0fp2d8n4dw8sa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -131138,10 +130772,8 @@ self: { }: mkDerivation { pname = "hw-json-simple-cursor"; - version = "0.1.0.1"; - sha256 = "0asvkzz0dgcc5cjrn3wqhn3svxi13wfzxi0ggc8mzzmfci07jigy"; - revision = "1"; - editedCabalFile = "1cpmvmncn3w60lacx21yg9snrmaghn9icgb67g2lfviya6a5qgs8"; + version = "0.1.0.2"; + sha256 = "1yknymn8flni5bkfifaxmkv6b6r530ljvm6vx9m3kqwzikly9lpn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131176,10 +130808,8 @@ self: { }: mkDerivation { pname = "hw-json-standard-cursor"; - version = "0.2.1.1"; - sha256 = "0z0lxzciyw6b49w1s88yx9lcqgk0fjmh1zv7qs3jnn9sk0bqldh5"; - revision = "1"; - editedCabalFile = "15x23pa4im7ll4ipaykqavmh8frpnlmg8617g67c987f66lpyprr"; + version = "0.2.1.2"; + sha256 = "1lfbzfbpzn06gyv35s0sbc14n7ccwfqci7yikq78a7iwypkb9nff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131302,6 +130932,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-mquery_0_2_0_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, lens, semigroups + }: + mkDerivation { + pname = "hw-mquery"; + version = "0.2.0.2"; + sha256 = "1vcxyin3cyc0pkhbfjyjm4r44yxk17gny5jhfg6hdlgivp150yij"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base dlist lens semigroups + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base dlist hedgehog hspec hw-hspec-hedgehog lens + ]; + testToolDepends = [ hspec-discover ]; + description = "Monadic query DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-packed-vector" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , hedgehog, hspec, hspec-discover, hw-bits, hw-hedgehog @@ -131389,8 +131042,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.32"; - sha256 = "0q65kivpxciqvknnradmpkaplrkfbckqv3xajk8h2dgas8r1m40l"; + version = "0.6.2.35"; + sha256 = "0fm1bmk2da0bsvpf8qvyyapwwc8vlybhibs5n53v067faf38dxqf"; libraryHaskellDepends = [ base bytestring ghc-prim mmap semigroups transformers unliftio-core vector @@ -131407,15 +131060,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_6_2_35" = callPackage + "hw-prim_0_6_2_36" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.35"; - sha256 = "0fm1bmk2da0bsvpf8qvyyapwwc8vlybhibs5n53v067faf38dxqf"; + version = "0.6.2.36"; + sha256 = "0anbwaz0hlskrlhp7nmzxzv7mgrs063d7qxhcv4iq9d46j90p031"; libraryHaskellDepends = [ base bytestring ghc-prim mmap semigroups transformers unliftio-core vector @@ -131493,7 +131146,7 @@ self: { broken = true; }) {}; - "hw-rankselect_0_13_3_0" = callPackage + "hw-rankselect_0_13_3_1" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, generic-lens, hedgehog, hspec, hspec-discover , hw-balancedparens, hw-bits, hw-fingertree, hw-hedgehog @@ -131502,8 +131155,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.13.3.0"; - sha256 = "1v0ia935y21zvzk81xiikidsbryadkjd117f8hkxnla0zic729yr"; + version = "0.13.3.1"; + sha256 = "05bhc8i6k59zv90r00c6vy4vx99dpc4dh85dinwklh8yqnfwf5ks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131557,6 +131210,32 @@ self: { broken = true; }) {}; + "hw-rankselect-base_0_3_2_2" = callPackage + ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec + , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int + , hw-prim, hw-string-parse, QuickCheck, vector + }: + mkDerivation { + pname = "hw-rankselect-base"; + version = "0.3.2.2"; + sha256 = "0wykyw452wdfzb99fr604vq3ifv689gqmix9g25mmypiwfp0jcq1"; + libraryHaskellDepends = [ + base bits-extra hw-bits hw-int hw-prim hw-string-parse vector + ]; + testHaskellDepends = [ + base bits-extra hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim QuickCheck vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra criterion hw-bits hw-prim vector + ]; + description = "Rank-select base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-simd" = callPackage ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava , containers, criterion, deepseq, directory, hedgehog, hspec @@ -131591,6 +131270,38 @@ self: { broken = true; }) {}; + "hw-simd_0_1_1_5" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava + , containers, criterion, deepseq, directory, hedgehog, hspec + , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim + , hw-rankselect, hw-rankselect-base, lens, mmap, text, vector + }: + mkDerivation { + pname = "hw-simd"; + version = "0.1.1.5"; + sha256 = "0nhy3hi7gxbbjwh6rj4459nzbmlij2cjdg2zvdjgx3z3j5algqyb"; + libraryHaskellDepends = [ + base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect + hw-rankselect-base vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bits-extra bytestring deepseq directory hedgehog hspec hw-bits + hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base lens text vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava containers criterion deepseq + directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap + vector + ]; + description = "SIMD library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-streams" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits @@ -131623,6 +131334,36 @@ self: { broken = true; }) {}; + "hw-streams_0_0_0_11" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, hw-prim, mmap, primitive, QuickCheck + , semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-streams"; + version = "0.0.0.11"; + sha256 = "17cr818k1zpzs1f46nwlm7p01mwfwf9ndqnp0f0607lfacm7hs9y"; + libraryHaskellDepends = [ + base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups + transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions ghc-prim hedgehog hspec + hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck + semigroups transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive + semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -131665,8 +131406,8 @@ self: { }: mkDerivation { pname = "hw-uri"; - version = "0.1.1.9"; - sha256 = "0l6ihhl79z1l361c4xh13qmbw8h2hnf85ncha7hivqafb585m1yr"; + version = "0.1.1.10"; + sha256 = "0bdxjlpqaqx70k2az686500adz3hj1zvgjsx5h582yvmdgnk83a8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133893,44 +133634,6 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , cmdargs, containers, directory, filepath, ghc, ghc-boot - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, hspec-contrib, http-client, http-client-tls, HUnit - , ipython-kernel, mtl, parsec, process, random, raw-strings-qq - , setenv, shelly, split, stm, strict, system-argv0, text, time - , transformers, unix, unordered-containers, utf8-string, uuid - , vector - }: - mkDerivation { - pname = "ihaskell"; - version = "0.10.0.0"; - sha256 = "0fmz0l2mpl6qwh4c00ppryxs2nfacmi1n3k21645v62vyhk0favp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring cereal cmdargs containers - directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline - haskell-src-exts hlint http-client http-client-tls ipython-kernel - mtl parsec process random shelly split stm strict system-argv0 text - time transformers unix unordered-containers utf8-string uuid vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory ghc ipython-kernel - process strict text transformers unix unordered-containers - ]; - testHaskellDepends = [ - base directory ghc ghc-paths here hspec hspec-contrib HUnit - raw-strings-qq setenv shelly text transformers - ]; - description = "A Haskell backend kernel for the IPython project"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "ihaskell_0_10_0_2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , cmdargs, containers, directory, filepath, ghc, ghc-boot , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint @@ -135097,6 +134800,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_3_3" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.3.3"; + sha256 = "1y5qzbn1627v893s6nlm5prc507pwybf2f9b7icpjgcj1q046p6i"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -135214,20 +134937,6 @@ self: { }) {}; "indents" = callPackage - ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: - mkDerivation { - pname = "indents"; - version = "0.5.0.0"; - sha256 = "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n"; - libraryHaskellDepends = [ base mtl parsec ]; - testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; - description = "indentation sensitive parser-combinators for parsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "indents_0_5_0_1" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: mkDerivation { pname = "indents"; @@ -135338,6 +135047,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-profunctors" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "indexed-profunctors"; + version = "0.1"; + sha256 = "0rdvj62rapkkj5zv5jyx2ynfwn2iszx1w2q08j9ik17zklqv9pri"; + libraryHaskellDepends = [ base ]; + description = "Utilities for indexed profunctors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -136830,6 +136550,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "intmap-graph" = callPackage + ({ mkDerivation, base, containers, text, vector, word8 }: + mkDerivation { + pname = "intmap-graph"; + version = "1.0"; + sha256 = "066js08brg2prmnvqchmpp42i7sd0jn7lxpzsalnvzivi49nkbx4"; + libraryHaskellDepends = [ base containers text vector word8 ]; + description = "A graph library that allows to explore edges after their type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath @@ -137700,28 +137431,6 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text - , containers, cryptonite, directory, filepath, memory, mtl, process - , temporary, text, transformers, unordered-containers, uuid - , zeromq4-haskell - }: - mkDerivation { - pname = "ipython-kernel"; - version = "0.10.0.0"; - sha256 = "1dqvii2h0vc32ladxmrzli5ch5m3is41bgalas34fh0gcc00p7qa"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring cereal cereal-text containers cryptonite - directory filepath memory mtl process temporary text transformers - unordered-containers uuid zeromq4-haskell - ]; - description = "A library for creating kernels for IPython frontends"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ipython-kernel_0_10_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, process , temporary, text, transformers, unordered-containers, uuid @@ -137741,7 +137450,6 @@ self: { ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -137773,26 +137481,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-chans - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "1.1.1.0"; - sha256 = "1f2lqg37ig3f23066c4179vcym6p3ylmxsywqhmb0n078kix6kfb"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-chans text time tls transformers x509 - x509-store x509-validation - ]; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_1_1_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -137810,7 +137498,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -137825,24 +137512,6 @@ self: { }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text - , time, tls, transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.3.0.3"; - sha256 = "1wbgczkiwnbpcwwcpsv9zf8n7nisv0iv2kivpjrxnhin2j4c48y1"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls profunctors text time tls transformers - x509-validation - ]; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_3_0_4" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation @@ -137858,7 +137527,6 @@ self: { ]; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -139551,6 +139219,8 @@ self: { testHaskellDepends = [ aeson base scotty stm text time wai-extra ]; description = "Remote Monad for JavaScript on the browser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "javascript-extras" = callPackage @@ -140436,6 +140106,8 @@ self: { pname = "json-api-lib"; version = "0.1.1.1"; sha256 = "096n08y80rkjn090w9pybwbfbwamfdig451nbgd48x0nrk6c091n"; + revision = "1"; + editedCabalFile = "1imz33mc4216qznvqdnh1j3wlifxnim4mhbl7d5zpinri4y0v2yd"; libraryHaskellDepends = [ aeson base containers data-default lens lens-aeson text unordered-containers uri-encode @@ -145226,8 +144898,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.3.0"; - sha256 = "0x7sxg30y2cx6wgq51ysycqqcl2cxqi0fi8g69a6fbw22ndpj4b4"; + version = "1.7.4.1"; + sha256 = "17vvkkq84lcnjc9cdzcx3y2d94kjr34jf91h10h57zdfg93g851b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -145783,8 +145455,8 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.6.0.13"; - sha256 = "0dzvbnzkrxg9v78x2g7mhhr76viyxcgjyqpksaw7l0p1x7brjsck"; + version = "0.6.0.14"; + sha256 = "1j4f9jg98kwr1jiwk9y7akdgpc63dpwzcp53888adayxn5h6mqf1"; libraryHaskellDepends = [ array base blaze-builder bytestring containers mtl text utf8-string ]; @@ -145797,15 +145469,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-javascript_0_6_0_14" = callPackage + "language-javascript_0_7_0_0" = callPackage ({ mkDerivation, alex, array, base, blaze-builder, bytestring , Cabal, containers, happy, hspec, mtl, QuickCheck, text , utf8-light, utf8-string }: mkDerivation { pname = "language-javascript"; - version = "0.6.0.14"; - sha256 = "1j4f9jg98kwr1jiwk9y7akdgpc63dpwzcp53888adayxn5h6mqf1"; + version = "0.7.0.0"; + sha256 = "15bpqpkjf2y3fk8wff9zlnkpsjc63bnbvhlkxrs9alj0bikq17nk"; libraryHaskellDepends = [ array base blaze-builder bytestring containers mtl text utf8-string ]; @@ -146345,6 +146017,20 @@ self: { broken = true; }) {}; + "language-sygus" = callPackage + ({ mkDerivation, array, base, deepseq, tasty, tasty-hunit, text }: + mkDerivation { + pname = "language-sygus"; + version = "0.1.1.1"; + sha256 = "18cfqqhm233irgs2m94j5gw87g55zdf4xx52mb7dmn4ijk5gzpl5"; + libraryHaskellDepends = [ array base text ]; + testHaskellDepends = [ base deepseq tasty tasty-hunit text ]; + description = "A parser and printer for the SyGuS 2.0 language."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "language-thrift" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, hspec , hspec-discover, megaparsec, QuickCheck, scientific, semigroups @@ -147018,14 +146704,16 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Lazy-Spined Monadic Priority Queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazy-search" = callPackage ({ mkDerivation, base, size-based }: mkDerivation { pname = "lazy-search"; - version = "0.1.1.0"; - sha256 = "1ifw35f5jpcbjn3jzfm78177aqdn8n7lr1554k92yvm0x526q66w"; + version = "0.1.2.0"; + sha256 = "026pim7hw5fvc514acfj8idkficid6jqmr5jmmz5zpj30wm8z5g8"; libraryHaskellDepends = [ base size-based ]; description = "Finds values satisfying a lazy predicate"; license = stdenv.lib.licenses.bsd3; @@ -148036,25 +147724,6 @@ self: { }) {}; "lens-process" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath - , lens, process, tasty, tasty-hunit - }: - mkDerivation { - pname = "lens-process"; - version = "0.3.0.0"; - sha256 = "1bp2mw38qvlq98596pn1illb6c1l8prd6qrzrg0g6xin98sqigb0"; - revision = "2"; - editedCabalFile = "1smhrlj7i2nsvf5x50svafydfmmy706n69xffzp6ij75s13fa37c"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base filepath lens process ]; - testHaskellDepends = [ - base doctest filepath lens process tasty tasty-hunit - ]; - description = "Optics for system processes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-process_0_3_0_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath , lens, process, tasty, tasty-hunit }: @@ -148069,7 +147738,6 @@ self: { ]; description = "Optics for system processes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-properties" = callPackage @@ -148678,8 +148346,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.0.0.1"; - sha256 = "173h1id6fdii7g850xifji70fz4i4xqhzaxh8727q8ld0q57lfjx"; + version = "2.0.0.2"; + sha256 = "126cq8sg2siirxkg1718n86xhlqxa1a96339dm1mw9r68ckj2jd0"; setupHaskellDepends = [ base chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -148693,6 +148361,8 @@ self: { ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libarchive;}; "libarchive-conduit" = callPackage @@ -148996,8 +148666,8 @@ self: { ({ mkDerivation, base, bytestring, data-default, modbus, vector }: mkDerivation { pname = "libmodbus"; - version = "1.1.0"; - sha256 = "0fhx0cda803sad7489dp09lrxhwwsbldssjq4jkaprnqjvhj32al"; + version = "1.1.1"; + sha256 = "192jgmih2fqv4kid8r9cy59914g94826rkcjr2a8339p0d3ddh8j"; libraryHaskellDepends = [ base bytestring data-default vector ]; librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; @@ -149041,29 +148711,6 @@ self: { }) {}; "libmpd" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, filepath, hspec, mtl, network, old-locale - , QuickCheck, text, time, unix, utf8-string - }: - mkDerivation { - pname = "libmpd"; - version = "0.9.0.9"; - sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv"; - revision = "1"; - editedCabalFile = "16pzbmhyzlpxy2djmxrs0wrv8mad3ahb040lx5kmf57say3qxgdl"; - libraryHaskellDepends = [ - attoparsec base bytestring containers data-default-class filepath - mtl network old-locale text time utf8-string - ]; - testHaskellDepends = [ - attoparsec base bytestring containers data-default-class filepath - hspec mtl network old-locale QuickCheck text time unix utf8-string - ]; - description = "An MPD client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "libmpd_0_9_0_10" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, filepath, hspec, mtl, network, old-locale , QuickCheck, safe-exceptions, text, time, unix, utf8-string @@ -149083,7 +148730,6 @@ self: { ]; description = "An MPD client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libnix" = callPackage @@ -149906,6 +149552,29 @@ self: { broken = true; }) {}; + "lightstep-haskell" = callPackage + ({ mkDerivation, async, base, chronos, containers, exceptions + , http2-client, http2-client-grpc, lens, mtl, proto-lens + , proto-lens-runtime, stm, text, transformers, unordered-containers + }: + mkDerivation { + pname = "lightstep-haskell"; + version = "0.1.0"; + sha256 = "1ssdhipbnilkqsax4ax2fw8nd2zkh6npk0hay6y2bf5vdgyrcf9g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base chronos containers exceptions http2-client + http2-client-grpc lens mtl proto-lens proto-lens-runtime stm text + transformers unordered-containers + ]; + executableHaskellDepends = [ async base http2-client text ]; + description = "LightStep OpenTracing client library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "lighttpd-conf" = callPackage ({ mkDerivation, alex, array, base, bytestring, happy, packedstring , pretty, template-haskell @@ -150390,8 +150059,8 @@ self: { pname = "linearmap-category"; version = "0.3.5.0"; sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf"; - revision = "3"; - editedCabalFile = "0b4m77csdsi5wgvbclza2arps5s0xgg0iibiy8kwax55ml04kkvp"; + revision = "4"; + editedCabalFile = "0bn66b6klifv5dqklczbrar54zkjcd1v5h6p0hlh6vc3plq2351q"; libraryHaskellDepends = [ base call-stack constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups @@ -151232,22 +150901,6 @@ self: { }) {}; "list-t" = callPackage - ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control - , mtl, mtl-prelude, transformers, transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "1.0.3.1"; - sha256 = "0h6bwljy0cqm1fsq151glglnvczjcvbphxiw7c83ps2zy9whg4y9"; - libraryHaskellDepends = [ - base mmorph monad-control mtl transformers transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - description = "ListT done right"; - license = stdenv.lib.licenses.mit; - }) {}; - - "list-t_1_0_4" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, mmorph , monad-control, mtl, mtl-prelude, transformers, transformers-base }: @@ -151261,7 +150914,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t-attoparsec" = callPackage @@ -151393,6 +151045,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "list-tuple" = callPackage + ({ mkDerivation, base, Cabal, deepseq, directory, hspec, OneTuple + , Only, should-not-typecheck, single-tuple, text + }: + mkDerivation { + pname = "list-tuple"; + version = "0.1.1.0"; + sha256 = "11mmadb62rarsywn8nd642pxx91yavj7mv739wdwvr723p57i6i3"; + revision = "1"; + editedCabalFile = "1909sk4mzlagskjvccj8rlw5vnxrxcx211406bngyp9lmpnmhdyy"; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ base OneTuple Only single-tuple ]; + testHaskellDepends = [ + base deepseq hspec Only should-not-typecheck single-tuple text + ]; + description = "List-like operations for tuples"; + license = stdenv.lib.licenses.asl20; + }) {}; + "list-witnesses" = callPackage ({ mkDerivation, base, decidable, microlens, profunctors , singletons, vinyl @@ -153511,23 +153182,6 @@ self: { }) {}; "loopbreaker" = callPackage - ({ mkDerivation, base, containers, ghc, hspec, hspec-discover - , inspection-testing, syb - }: - mkDerivation { - pname = "loopbreaker"; - version = "0.1.1.0"; - sha256 = "1hyw750r0kwyj5hb424dcxh2m11p7k694dfhgd2vadnqn80g0w5s"; - libraryHaskellDepends = [ base containers ghc syb ]; - testHaskellDepends = [ - base containers ghc hspec inspection-testing syb - ]; - testToolDepends = [ hspec-discover ]; - description = "inline self-recursive definitions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "loopbreaker_0_1_1_1" = callPackage ({ mkDerivation, base, containers, ghc, hspec, hspec-discover , inspection-testing, syb }: @@ -153542,7 +153196,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "inline self-recursive definitions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "looper" = callPackage @@ -154575,8 +154228,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "0.2.0.2"; - sha256 = "1x0kd54klcai4lc2pv6dhq4pwfsf3s6mkdqhx7dfci84099pbksr"; + version = "0.3.0.0"; + sha256 = "1gav8x226703k7jsjbw4g6y74xh2id5adlnqb7hpwv314d45v76a"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring directory hspec ]; @@ -155433,21 +155086,6 @@ self: { }) {}; "mainland-pretty" = callPackage - ({ mkDerivation, base, containers, srcloc, text, transformers }: - mkDerivation { - pname = "mainland-pretty"; - version = "0.7"; - sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi"; - revision = "1"; - editedCabalFile = "1apyqnbcsbjfkqc1d6mk74pxl12130r6ijwhj555gddls9g0qdf3"; - libraryHaskellDepends = [ - base containers srcloc text transformers - ]; - description = "Pretty printing designed for printing source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mainland-pretty_0_7_0_1" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { pname = "mainland-pretty"; @@ -155458,7 +155096,6 @@ self: { ]; description = "Pretty printing designed for printing source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "majordomo" = callPackage @@ -156683,6 +156320,8 @@ self: { ]; description = "A ContT-based wrapper for Haskell-to-C marshalling functions"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "marvin" = callPackage @@ -156789,29 +156428,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest - , data-default-class, deepseq, doctest, exceptions - , mersenne-random-pure64, primitive, QuickCheck, random, scheduler - , splitmix, template-haskell, unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.4.1.0"; - sha256 = "0h6rr5fx3kj5qs30zyfzmmvqnwn43fl4smjfd7qx4fhp48bq89nw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_4_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -156832,7 +156448,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -156872,27 +156487,6 @@ self: { }) {}; "massiv-test" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec - , massiv, primitive, QuickCheck, scheduler, unliftio, vector - }: - mkDerivation { - pname = "massiv-test"; - version = "0.1.0"; - sha256 = "08rs0j773c3jxnj6akh8gaywfz2g10w1ddmcqpkci5bqqjmqqf85"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions hspec massiv - primitive QuickCheck scheduler unliftio vector - ]; - testHaskellDepends = [ - base bytestring containers data-default deepseq genvalidity-hspec - hspec massiv QuickCheck scheduler vector - ]; - description = "Library that contains generators, properties and tests for Massiv Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv-test_0_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec , massiv, primitive, QuickCheck, scheduler, unliftio, vector @@ -156911,7 +156505,6 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "master-plan" = callPackage @@ -157019,27 +156612,6 @@ self: { }) {inherit (pkgs) pcre;}; "math-functions" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit - , primitive, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.3.2.1"; - sha256 = "1d1zgc9y3pgahpkn2vgzc2vh412z54i03gw98s95jpqclvl7fyck"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base data-default-class deepseq erf HUnit primitive QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - vector vector-th-unbox - ]; - description = "Collection of tools for numeric computations"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_3_0" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, primitive , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector , vector-th-unbox @@ -157057,7 +156629,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "math-grads" = callPackage @@ -157257,6 +156828,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matplotlib_0_7_5" = callPackage + ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq + , directory, filepath, process, random, raw-strings-qq, split + , tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , temporary + }: + mkDerivation { + pname = "matplotlib"; + version = "0.7.5"; + sha256 = "0iyjr6j5jp7lqrk9rqqvxz3rx8221hwz56p82zqkj3aarrvy21cs"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq filepath process split + temporary + ]; + testHaskellDepends = [ + ad base bytestring directory process random raw-strings-qq split + tasty tasty-expected-failure tasty-golden tasty-hunit temporary + ]; + description = "Bindings to Matplotlib; a Python plotting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "matrices" = callPackage ({ mkDerivation, base, criterion, deepseq, primitive, tasty , tasty-hunit, tasty-quickcheck, vector @@ -159104,6 +158698,8 @@ self: { libraryHaskellDepends = [ arrows base random Stream ]; description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metamorphic" = callPackage @@ -159658,23 +159254,6 @@ self: { }) {}; "microlens-process" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath - , microlens, process - }: - mkDerivation { - pname = "microlens-process"; - version = "0.2.0.0"; - sha256 = "05bkm3nhiv2mprds9xlmmnzll91hn76navb9h9kc9nl5rnq4nwrn"; - revision = "4"; - editedCabalFile = "00dhcr2czcx986a4lijmlbrxk2wm059mmbh63qs48wb6z4rrsg7y"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base filepath microlens process ]; - testHaskellDepends = [ base doctest microlens process ]; - description = "Micro-optics for the process library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-process_0_2_0_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath , microlens, process }: @@ -159689,7 +159268,6 @@ self: { testHaskellDepends = [ base doctest microlens process ]; description = "Micro-optics for the process library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-th" = callPackage @@ -160349,8 +159927,8 @@ self: { }: mkDerivation { pname = "mini-egison"; - version = "0.1.4"; - sha256 = "16lv1hvd8dqi5z8pb9j2hmi5h8ivf2c01wscswrlmdqwck1cx74a"; + version = "0.1.5"; + sha256 = "19g5743q2h0vr9r7m854pi60r6z7f8cqr3l3fqi4b308jb492ngq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161204,6 +160782,8 @@ self: { libraryHaskellDepends = [ base vector ]; description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmap" = callPackage @@ -162272,6 +161852,8 @@ self: { pname = "monad-logger"; version = "0.3.30"; sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7"; + revision = "1"; + editedCabalFile = "0gm3gqbxkj8447js4a672snz0ir78syk890nqdmjb18hsjqy5p6a"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -163442,29 +163024,6 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, gauge - , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split - , text, transformers, unordered-containers, vector - , vector-algorithms - }: - mkDerivation { - pname = "mono-traversable"; - version = "1.0.12.0"; - sha256 = "1h586myaayxg73lc1fx18axlq2bw761fypyy7mii1h0h75d8fyry"; - libraryHaskellDepends = [ - base bytestring containers hashable split text transformers - unordered-containers vector vector-algorithms - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ base gauge mwc-random vector ]; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mono-traversable_1_0_13_0" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, gauge , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split , text, transformers, unordered-containers, vector @@ -163485,7 +163044,6 @@ self: { benchmarkHaskellDepends = [ base gauge mwc-random vector ]; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-traversable-instances" = callPackage @@ -163639,6 +163197,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, primes, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.0"; + sha256 = "1n7hd6whfr4gspads1frml4mbjmshyf9h42f57icz4ps3h1dzd1r"; + libraryHaskellDepends = [ + base bytestring containers primes text vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -164045,33 +163623,33 @@ self: { "morpheus-graphql" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, filepath - , lens, megaparsec, mtl, optparse-applicative, scientific, scotty - , tasty, tasty-hunit, template-haskell, text, transformers + , megaparsec, mtl, optparse-applicative, scientific, scotty, tasty + , tasty-hunit, template-haskell, text, transformers , unordered-containers, uuid, vector, wai, wai-websockets, warp , websockets }: mkDerivation { pname = "morpheus-graphql"; - version = "0.3.1"; - sha256 = "05c1g3bxqd47im1kyx414aaxn4zf7k59wxcdgw7xdr6qf32g3wmw"; + version = "0.4.0"; + sha256 = "182bl79lwlm8amsdf7vwhzlqz9r6ybnf6mnhxs0a74981dz5j88r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers lens megaparsec mtl scientific + aeson base bytestring containers megaparsec mtl scientific template-haskell text transformers unordered-containers uuid vector websockets ]; executableHaskellDepends = [ - aeson base bytestring containers filepath lens megaparsec mtl + aeson base bytestring containers filepath megaparsec mtl optparse-applicative scientific scotty template-haskell text transformers unordered-containers uuid vector wai wai-websockets warp websockets ]; testHaskellDepends = [ - aeson base bytestring containers lens megaparsec mtl scientific - tasty tasty-hunit template-haskell text transformers - unordered-containers uuid vector websockets + aeson base bytestring containers megaparsec mtl scientific tasty + tasty-hunit template-haskell text transformers unordered-containers + uuid vector websockets ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.bsd3; @@ -165554,11 +165132,25 @@ self: { pname = "multipart"; version = "0.1.3"; sha256 = "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z"; + revision = "1"; + editedCabalFile = "037ngpayaisc1jgcxyixy7lx42p2mz950k6wb0pl6dkc951hl88c"; libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "HTTP multipart split out of the cgi package"; license = stdenv.lib.licenses.bsd3; }) {}; + "multipart_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, parsec, stringsearch }: + mkDerivation { + pname = "multipart"; + version = "0.2.0"; + sha256 = "1rw668hxj04zpkfwhjqbd0ph0wy9k2khsrbsni9sxi2px49vnmym"; + libraryHaskellDepends = [ base bytestring parsec stringsearch ]; + description = "Parsers for the HTTP multipart format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "multipart-names" = callPackage ({ mkDerivation, base, case-insensitive, HUnit, lens, parsec , test-framework, test-framework-hunit @@ -168417,30 +168009,32 @@ self: { "net-mqtt" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary - , bytestring, conduit, conduit-extra, containers, HUnit - , network-conduit-tls, network-uri, QuickCheck, stm, tasty - , tasty-hunit, tasty-quickcheck, text + , bytestring, conduit, conduit-extra, containers, deepseq, HUnit + , network-conduit-tls, network-uri, optparse-applicative + , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck, text + , websockets, wuss }: mkDerivation { pname = "net-mqtt"; - version = "0.5.1.0"; - sha256 = "0wqrzp39d9c04j1lqsk8kn727bymcq8jk12v330l527lm5g76adj"; + version = "0.6.0.0"; + sha256 = "1b27jxqs8wbknn3bsv1wcl93qzz9i46g1x449iz40ca3r3bylwcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra containers network-conduit-tls network-uri QuickCheck - stm text + conduit-extra containers deepseq network-conduit-tls network-uri + QuickCheck stm text websockets wuss ]; executableHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra containers network-conduit-tls network-uri QuickCheck - stm text + conduit-extra containers deepseq network-conduit-tls network-uri + optparse-applicative QuickCheck stm text websockets wuss ]; testHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra containers HUnit network-conduit-tls network-uri - QuickCheck stm tasty tasty-hunit tasty-quickcheck text + conduit-extra containers deepseq HUnit network-conduit-tls + network-uri QuickCheck stm tasty tasty-hunit tasty-quickcheck text + websockets wuss ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; @@ -168456,8 +168050,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.3.2.1"; - sha256 = "012mpn1m6jdpqvfr7bz65v7cjf9acg7xxd5yf8z4cyv9y8sl1rzb"; + version = "0.3.3.0"; + sha256 = "0az14yg32psxkb5fm86g1gi7wd8cfq1lbn34852m6814qvk05m36"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger safe-exceptions scientific @@ -168479,8 +168073,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.1.0.2"; - sha256 = "0p2smq2drxdl7iia3layifmipqbg3sn76dpczwj04gjs9vwjyj2z"; + version = "0.2.0.0"; + sha256 = "0ls8j8l6nv74big5almkgmkzd9h5kdfiq4q06m86rfmbfq0cvhyk"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -168543,8 +168137,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.1.1"; - sha256 = "1hq7lv583h61wv56qhfrq55q1x6xsk53bbd6may80m3dh88ny23m"; + version = "0.1.2.0"; + sha256 = "11qbfvxwsba4dlwgrx81yncww2ic1iafp2zg5l5rvk8cnb2z5g2n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168553,7 +168147,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hspec ip net-spider net-spider-rpl optparse-applicative + base hspec ip net-spider net-spider-cli net-spider-rpl + optparse-applicative ]; description = "CLI executable of NetSpider.RPL."; license = stdenv.lib.licenses.bsd3; @@ -169533,22 +169128,6 @@ self: { }) {}; "network-messagepack-rpc" = callPackage - ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions - , text, unordered-containers - }: - mkDerivation { - pname = "network-messagepack-rpc"; - version = "0.1.1.1"; - sha256 = "1cmll84ida19f53cdvwi8nqym6bax8f0g40nq1a1gkh6mljby5a4"; - libraryHaskellDepends = [ - base bytestring data-msgpack safe-exceptions text - unordered-containers - ]; - description = "MessagePack RPC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-messagepack-rpc_0_1_1_4" = callPackage ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions , text, unordered-containers }: @@ -169562,7 +169141,6 @@ self: { ]; description = "MessagePack RPC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-messagepack-rpc-websocket" = callPackage @@ -175978,6 +175556,34 @@ self: { broken = true; }) {}; + "ormolu" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc, ghc-boot-th, ghc-paths, gitrev, hspec + , hspec-discover, mtl, optparse-applicative, path, path-io, syb + , text + }: + mkDerivation { + pname = "ormolu"; + version = "0.0.1.0"; + sha256 = "1p4m9hiavirnhf941fb5pdnrlrknr5rhcvznhqywianvvw6qcm30"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc ghc-boot-th + ghc-paths mtl syb text + ]; + executableHaskellDepends = [ + base ghc gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "os-release" = callPackage ({ mkDerivation, base, containers, hlint, hspec, parsec, process , regex-compat, temporary, transformers @@ -176262,6 +175868,8 @@ self: { pname = "overloaded"; version = "0.1.2"; sha256 = "0m2ddb48vsl0x0hz6pq8wabl1s6vl7s66rz7z9v2i6d809zl83kw"; + revision = "1"; + editedCabalFile = "08w1f1g0vq0q8v93fdhb8w7a2xmq6mbyh8c3s5y5sli1bynsgbzb"; libraryHaskellDepends = [ base bytestring containers fin ghc optics-core record-hasfield sop-core split syb symbols text time vec @@ -176274,6 +175882,8 @@ self: { doHaddock = false; description = "Overloaded pragmas as a plugin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "overloaded-records" = callPackage @@ -177348,29 +176958,6 @@ self: { }) {}; "pandoc-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.17.6"; - sha256 = "1c4yf284wd2zbskhrqk0lhqkdyry40db087cdy86b5ywr0yy1li7"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim QuickCheck syb - transformers - ]; - testHaskellDepends = [ - aeson base bytestring containers HUnit QuickCheck string-qq syb - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-types_1_17_6_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -177391,7 +176978,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -177633,6 +177219,59 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pantry_0_2_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans + , base64-bytestring, bytestring, Cabal, conduit, conduit-extra + , containers, contravariant, cryptonite, cryptonite-conduit + , deepseq, digest, directory, exceptions, filelock, filepath + , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog + , hpack, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, integer-gmp, memory, mono-traversable + , mtl, network, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , safe, syb, tar-conduit, template-haskell, text, text-metrics + , th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unix-compat, unliftio + , unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.2.0.0"; + sha256 = "1qp236maks70ah72wmv36fh3xc3di9c6sc2jd1k3f7ha5hcv9n4c"; + libraryHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory filelock + filepath generic-deriving ghc-prim hackage-security hashable hpack + http-client http-client-tls http-conduit http-download http-types + integer-gmp memory mono-traversable mtl network network-uri path + path-io persistent persistent-sqlite persistent-template primitive + resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit + template-haskell text text-metrics th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory exceptions + filelock filepath generic-deriving ghc-prim hackage-security + hashable hedgehog hpack hspec http-client http-client-tls + http-conduit http-download http-types integer-gmp memory + mono-traversable mtl network network-uri path path-io persistent + persistent-sqlite persistent-template primitive QuickCheck + raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb + tar-conduit template-haskell text text-metrics th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unix-compat unliftio unordered-containers vector yaml + zip-archive + ]; + description = "Content addressable Haskell package management"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -179335,21 +178974,26 @@ self: { ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base64-bytestring, bytestring, colour, containers, directory , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , process, skylighting, terminal-size, text, time - , unordered-containers, yaml + , process, QuickCheck, skylighting, tasty, tasty-hunit + , tasty-quickcheck, terminal-size, text, time, unordered-containers + , yaml }: mkDerivation { pname = "patat"; - version = "0.8.3.0"; - sha256 = "1dldaqa1qbwdia6rcf0sb6bnqldcpgrimd3yx00idyjy0msl0xh6"; - isLibrary = false; + version = "0.8.4.0"; + sha256 = "0yq3y5qbc4mr0vmy26v6rf7h6jc2hlgf7kgdp0i69ill0xlkdasx"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base64-bytestring bytestring colour containers directory filepath mtl network network-uri optparse-applicative pandoc process skylighting terminal-size text time unordered-containers yaml ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory QuickCheck tasty tasty-hunit tasty-quickcheck + ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -179478,22 +179122,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_5_0" = callPackage + "path-io_1_6_0" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.5.0"; - sha256 = "16zgi2a7g3mc9rslshjm86q4c3rr9vrd8qcjw753ndpar05j41bf"; - revision = "1"; - editedCabalFile = "127x8jhx2illj2r5x8f2g4yfl1idfngxmzphfr45abdf024n3pm8"; + version = "1.6.0"; + sha256 = "0hcdxxwkhdhm59p6x74k1fsgsrqfa100c83cslm1h9ln0anj1r3k"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat ]; testHaskellDepends = [ - base directory exceptions hspec path transformers unix-compat + base directory exceptions filepath hspec path transformers + unix-compat ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; @@ -181470,20 +181113,19 @@ self: { "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers - , convertible, HDBC, HDBC-odbc, monad-control, monad-logger - , persistent, persistent-template, resourcet, text, time - , transformers + , convertible, HDBC, HDBC-odbc, monad-logger, persistent + , persistent-template, resourcet, text, time, transformers }: mkDerivation { pname = "persistent-odbc"; - version = "0.2.0.1"; - sha256 = "0rvcjl9p7pj0hrf0ghhj96ib2knhxnfi9nhc7cppn7gnja1x8ldp"; + version = "0.2.1.0"; + sha256 = "058nmmqnl1pz7cyvfnbgid3kqbfl95g9xqgxs00z5fbkz5kwg5rl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring conduit containers convertible HDBC HDBC-odbc - monad-control monad-logger persistent persistent-template resourcet - text time transformers + monad-logger persistent persistent-template resourcet text time + transformers ]; description = "Backend for the persistent library using ODBC"; license = stdenv.lib.licenses.mit; @@ -182513,8 +182155,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, phonenumber, protobuf }: mkDerivation { pname = "phone-numbers"; - version = "0.1.1"; - sha256 = "09b5qp7c059wah6wddn71hk6ciijj07qylxh3xcff0qyvjqd18ya"; + version = "0.2.0"; + sha256 = "130nl3qxhcldxy44pxznh02r3fqqnv9jb8w8si7vrn6cd4v5rpfi"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ phonenumber protobuf ]; libraryToolDepends = [ c2hs ]; @@ -186526,6 +186168,112 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "porcupine-core" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, binary + , binary-orphans, bytestring, cassava, clock, conduit, containers + , contravariant, data-default, deepseq, directory, docrecords + , filepath, foldl, formatting, funflow, hashable, katip, lens + , monad-control, mtl, optparse-applicative, path, profunctors + , reader-soup, resourcet, safe-exceptions, store, streaming + , streaming-bytestring, streaming-conduit, streaming-utils + , template-haskell, temporary, text, transformers + , transformers-base, unix, unliftio-core, unordered-containers, url + , vector, vinyl, yaml, zlib + }: + mkDerivation { + pname = "porcupine-core"; + version = "0.1.0.1"; + sha256 = "1mf43vkisrjp8jx7w208v4wb9s7i1130x6c7dlxq5m1hfywl8d3m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base binary binary-orphans bytestring + cassava clock conduit containers contravariant data-default deepseq + directory docrecords filepath foldl formatting funflow hashable + katip lens monad-control mtl optparse-applicative path profunctors + reader-soup resourcet safe-exceptions store streaming + streaming-bytestring streaming-conduit streaming-utils + template-haskell temporary text transformers transformers-base unix + unliftio-core unordered-containers url vector vinyl yaml zlib + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base binary binary-orphans bytestring + cassava clock conduit containers contravariant data-default deepseq + directory docrecords filepath foldl formatting funflow hashable + katip lens monad-control mtl optparse-applicative path profunctors + reader-soup resourcet safe-exceptions store streaming + streaming-bytestring streaming-conduit streaming-utils + template-haskell temporary text transformers transformers-base unix + unliftio-core unordered-containers url vector vinyl yaml zlib + ]; + description = "Express portable, composable and reusable data tasks and pipelines"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "porcupine-http" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , docrecords, http-client, http-conduit, hvega, mime-types + , porcupine-core, reader-soup, resourcet, safe-exceptions + , streaming, streaming-bytestring, streaming-conduit, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "porcupine-http"; + version = "0.1.0.0"; + sha256 = "1vjz32pcjqxcwnfpq99v589l003q5cjn767mhfn5j2lb9lg52gms"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers http-client http-conduit + mime-types porcupine-core reader-soup resourcet safe-exceptions + streaming streaming-bytestring streaming-conduit text transformers + ]; + executableHaskellDepends = [ + aeson base bytestring conduit containers docrecords http-client + http-conduit hvega mime-types porcupine-core reader-soup resourcet + safe-exceptions streaming streaming-bytestring streaming-conduit + text transformers unordered-containers + ]; + description = "A location accessor for porcupine to connect to HTTP sources/sinks"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "porcupine-s3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base + , bytestring, conduit, conduit-extra, directory, docrecords + , filepath, katip, lens, monad-control, mtl, porcupine-core + , reader-soup, resourcet, retry, safe-exceptions, streaming + , streaming-bytestring, text, unordered-containers + }: + mkDerivation { + pname = "porcupine-s3"; + version = "0.1.0.0"; + sha256 = "1ydfkca4pys8h3il702ndc5kayh30r9bxbiz7hxsgjgcl4dlp5z9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base bytestring conduit + conduit-extra directory filepath katip lens monad-control mtl + porcupine-core reader-soup resourcet retry safe-exceptions + streaming streaming-bytestring text + ]; + executableHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 base bytestring conduit + conduit-extra directory docrecords filepath katip lens + monad-control mtl porcupine-core reader-soup resourcet retry + safe-exceptions streaming streaming-bytestring text + unordered-containers + ]; + description = "A location accessor for porcupine to connect to AWS S3 sources/sinks"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "port-utils" = callPackage ({ mkDerivation, async, base, hspec, network, stm, transformers }: mkDerivation { @@ -186669,6 +186417,8 @@ self: { ]; description = "Simple extensible library to run SQL file against PostgreSQL database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "poseidon-postgis" = callPackage @@ -187532,36 +187282,6 @@ self: { }) {}; "postgresql-typed" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , containers, convertible, criterion, cryptonite, data-default - , haskell-src-meta, HDBC, HUnit, memory, network, old-locale - , postgresql-binary, QuickCheck, scientific, template-haskell, text - , time, tls, utf8-string, uuid, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "postgresql-typed"; - version = "0.6.0.1"; - sha256 = "1kdapjx3mz7g6a35g21xql0wswrgnmp6x0hm2zpis3wp4ig503kk"; - libraryHaskellDepends = [ - aeson array attoparsec base binary bytestring containers cryptonite - data-default haskell-src-meta HDBC memory network old-locale - postgresql-binary scientific template-haskell text time tls - utf8-string uuid x509 x509-store x509-validation - ]; - testHaskellDepends = [ - base bytestring containers convertible HDBC HUnit network - QuickCheck time tls - ]; - benchmarkHaskellDepends = [ - base bytestring criterion network time tls - ]; - description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "postgresql-typed_0_6_1_0" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, convertible, criterion, cryptonite, data-default , haskell-src-meta, HDBC, HUnit, memory, network, old-locale @@ -187771,7 +187491,8 @@ self: { ]; description = "Postmaster ESMTP Server"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potato-tool" = callPackage @@ -188173,8 +187894,8 @@ self: { pname = "pragmatic-show"; version = "0.1.2.0"; sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7"; - revision = "1"; - editedCabalFile = "17rs7ms62aisnk5wsdp67v3cgv5ph734iswv7137ibv339dlkl82"; + revision = "2"; + editedCabalFile = "197mbpl6542amy9hmramkhrb57s3wycsc1g2c5vhyfnnpbcrh1pc"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space @@ -188298,12 +188019,12 @@ self: { }) {}; "predicate-transformers" = callPackage - ({ mkDerivation, adjunctions, base, lens }: + ({ mkDerivation, adjunctions, base, lens, mtl }: mkDerivation { pname = "predicate-transformers"; - version = "0.1.0.0"; - sha256 = "05ksvy1wnkvsmrybfj615aaw49if3gv2zf9f7sad75lyi6cyxm0x"; - libraryHaskellDepends = [ adjunctions base lens ]; + version = "0.3.0.0"; + sha256 = "1wdbizrg6wx1yl5f8h305k2a4vp6lpbxxdh3d761z9xr6fq9b5qj"; + libraryHaskellDepends = [ adjunctions base lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -189906,6 +189627,8 @@ self: { pname = "process"; version = "1.6.6.0"; sha256 = "140as37rfad7hy1lg03n19dzfbcdaahv64aydl6frv06qvdlc49w"; + revision = "1"; + editedCabalFile = "0y3v5ly6fg42ngv41d28ny4x06ddqkivxx16whsfss06k15x3vz5"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -191556,6 +191279,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_2_4" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text + , transformers, transformers-compat + }: + mkDerivation { + pname = "protolude"; + version = "0.2.4"; + sha256 = "0vkrj1fxbndkmsja9d80k4q5c48gwdbjlnzx3iag02dlj05j34hi"; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat stm text transformers transformers-compat + ]; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -192384,6 +192125,8 @@ self: { ]; description = "types and parser for email messages (including MIME)"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "purescript" = callPackage @@ -192406,6 +192149,8 @@ self: { pname = "purescript"; version = "0.13.3"; sha256 = "05cz0ilxawrcn4hm6mbd0qpkbfp0g8mcqvcscl4ghagjljgimaqv"; + revision = "1"; + editedCabalFile = "0hw0q0jjan9y7x27p7gfig8frnb41gnwh5yv90sx2cy5v9l9ixwc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192726,30 +192471,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "1.5.1.10"; - sha256 = "0nif5b7slyr7ppm1igm06k1zjf0sninyrf0n8qkaw2kwhxgdsam2"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_1_5_1_11" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-types, memory , QuickCheck, scientific, text, time, transformers @@ -192771,7 +192492,6 @@ self: { ]; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -195794,8 +195514,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rapid" = callPackage @@ -197120,6 +196838,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "reader-soup" = callPackage + ({ mkDerivation, base, katip, lens, mmorph, monad-control, mtl + , resourcet, safe-exceptions, transformers, transformers-base + , unliftio-core, vinyl + }: + mkDerivation { + pname = "reader-soup"; + version = "0.1.0.1"; + sha256 = "0pqfgfv7ahmcclx29b2rs8n5da4qhbhp5fxmwqm2xycpw3hqpx9v"; + libraryHaskellDepends = [ + base katip lens mmorph monad-control mtl resourcet safe-exceptions + transformers transformers-base unliftio-core vinyl + ]; + description = "Vinyl-based reader-like monad composition"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "readline" = callPackage ({ mkDerivation, base, ncurses, process, readline }: mkDerivation { @@ -197230,32 +196967,6 @@ self: { }) {}; "reanimate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , cubicbezier, diagrams, diagrams-contrib, diagrams-core - , diagrams-lib, diagrams-svg, directory, filepath, fsnotify - , hashable, JuicyPixels, lens, linear, matrices, matrix, mtl - , open-browser, palette, parallel, process, reanimate-svg - , svg-builder, text, time, websockets, xml - }: - mkDerivation { - pname = "reanimate"; - version = "0.1.5.0"; - sha256 = "1jh9inlx92qn3klzi9385nfvphrwmmdbbs2gql019bdwmyhd815x"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers cubicbezier diagrams - diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory - filepath fsnotify hashable JuicyPixels lens linear matrices matrix - mtl open-browser palette parallel process reanimate-svg svg-builder - text time websockets xml - ]; - description = "Animation library based on SVGs"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "reanimate_0_1_8_0" = callPackage ({ mkDerivation, ansi-wl-pprint, attoparsec, base , base64-bytestring, bytestring, cassava, chiphunk, colour , containers, cubicbezier, diagrams, diagrams-contrib @@ -197286,6 +196997,41 @@ self: { description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reanimate_0_1_9_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base + , base64-bytestring, bytestring, cassava, chiphunk, colour + , containers, cubicbezier, diagrams, diagrams-contrib + , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath + , fsnotify, hashable, here, JuicyPixels, lens, linear, matrix, mtl + , open-browser, optparse-applicative, palette, parallel, process + , QuickCheck, random-shuffle, reanimate-svg, svg-builder, tasty + , tasty-golden, tasty-hunit, temporary, text, time, vector + , websockets, xml + }: + mkDerivation { + pname = "reanimate"; + version = "0.1.9.0"; + sha256 = "0rmlyrk24n2267mm22mxiipcd7m5j9mgk5n69pscigqnyl1xm7y6"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava + chiphunk colour containers cubicbezier diagrams diagrams-contrib + diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify + hashable here JuicyPixels lens linear matrix mtl open-browser + optparse-applicative palette parallel process random-shuffle + reanimate-svg svg-builder temporary text time vector websockets xml + ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring directory filepath process + QuickCheck tasty tasty-golden tasty-hunit + ]; + description = "Animation library based on SVGs"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reanimate-svg" = callPackage @@ -197295,8 +197041,8 @@ self: { }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.2.1"; - sha256 = "018jkgiry2yaq7nl8sks4ahjdx5pjgdj99gc6k4l3rfmd1zxvsng"; + version = "0.9.3.0"; + sha256 = "1wwk2bd802nznwb9nlc7pq16krldw3dzj89fjd1v00plg9b5i3i4"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -197308,15 +197054,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_9_3_0" = callPackage + "reanimate-svg_0_9_3_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, hspec , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text , transformers, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.3.0"; - sha256 = "1wwk2bd802nznwb9nlc7pq16krldw3dzj89fjd1v00plg9b5i3i4"; + version = "0.9.3.1"; + sha256 = "1bxfhfdr7p98aj12krxrzcmvxbl8b20flbvqydja8pcwh6jgd744"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -198460,6 +198206,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-retractable" = callPackage + ({ mkDerivation, base, containers, jsaddle, mtl, reflex, reflex-dom + }: + mkDerivation { + pname = "reflex-dom-retractable"; + version = "0.1.0.0"; + sha256 = "0qdr3xrpg5dhfsbz6b2883jkhvc7nckmn05gyc844xn0fjlrlbda"; + revision = "1"; + editedCabalFile = "1idkwal502xg7qb8hwk5yg3mqy62h5xjmyciv2xs3x3axcckllcv"; + libraryHaskellDepends = [ + base containers jsaddle mtl reflex reflex-dom + ]; + description = "Routing and retractable back button for reflex-dom"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-dom-svg" = callPackage ({ mkDerivation, base, containers, lens, reflex, reflex-dom-core , safe, text @@ -199082,10 +198846,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers, regex-base }: mkDerivation { pname = "regex-pcre-builtin"; - version = "0.94.4.8.8.35"; - sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b"; - revision = "1"; - editedCabalFile = "0r29q3fwlji0vxypk0pywrqgrqz84ryd0n5zmk44bgy2k534mk6c"; + version = "0.94.5.8.8.35"; + sha256 = "1s755qdg1mxrf125sh83bsc5kjkrj8fkq8wf6dg1jan86c7p7gl4"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -201856,8 +201618,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.8.0.1"; - sha256 = "0x63grjv0r96gv8ksh6r6aja6fvnwr06bypigvkskzhjjbk3fhcx"; + version = "0.8.0.2"; + sha256 = "1i98a5pp37fcny28wfp002bc16m9jf793jicbp83ffwlk0g123v5"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -201869,15 +201631,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "retry_0_8_0_2" = callPackage + "retry_0_8_1_0" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers }: mkDerivation { pname = "retry"; - version = "0.8.0.2"; - sha256 = "1i98a5pp37fcny28wfp002bc16m9jf793jicbp83ffwlk0g123v5"; + version = "0.8.1.0"; + sha256 = "02k03r86amg1vbrsvb644342ym13d9jwkzki9sk93pdg5l8j35dj"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -203582,16 +203344,15 @@ self: { "ron" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , containers, criterion, deepseq, hashable, integer-gmp, mtl - , scientific, template-haskell, text, time, transformers - , unordered-containers + , scientific, template-haskell, text, time, unordered-containers }: mkDerivation { pname = "ron"; - version = "0.9"; - sha256 = "0brjqb6lrcs711g5aqw3d5nidikmvjyyps8hcifzwpjanq0l8cvg"; + version = "0.10"; + sha256 = "1qw1kyrd3z5fag4a9w2nibcc3m68cr75jplp2pvwvkcmbl23alar"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable - integer-gmp mtl scientific template-haskell text time transformers + integer-gmp mtl scientific template-haskell text time unordered-containers ]; benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ]; @@ -203605,10 +203366,8 @@ self: { }: mkDerivation { pname = "ron-rdt"; - version = "0.9.1"; - sha256 = "1kx858d3pyj2dlpznd9n0aw6yhkq4ac9789kkan9yi8mf0vdbn3i"; - revision = "1"; - editedCabalFile = "0csy0sv9rg27ab2jpdpqnsvvs7jdq950vxf8x9in6ld2fjfrknj9"; + version = "0.10"; + sha256 = "1dsplv4g0nflkns1yyx6lqf83qnc5y1bycgfydwa9hn1kliqf73c"; libraryHaskellDepends = [ base containers Diff hashable integer-gmp mtl ron text time transformers unordered-containers @@ -203636,16 +203395,16 @@ self: { "ron-storage" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , integer-gmp, mtl, network-info, ron, ron-rdt, stm, text + , fsnotify, integer-gmp, mtl, network-info, ron, ron-rdt, stm, text , tf-random, transformers }: mkDerivation { pname = "ron-storage"; - version = "0.10.1"; - sha256 = "1wck9d188kinfzmz7ff8vw39ff5garfy6nw0cwkr4k3qdvcajj1r"; + version = "0.11"; + sha256 = "1c8spi1bpjxkv8lj1rkqfs8ra4yg7x6shjyawpdz4wna11cdpydx"; libraryHaskellDepends = [ - base bytestring containers directory filepath integer-gmp mtl - network-info ron ron-rdt stm text tf-random transformers + base bytestring containers directory filepath fsnotify integer-gmp + mtl network-info ron ron-rdt stm text tf-random transformers ]; description = "RON Storage"; license = stdenv.lib.licenses.bsd3; @@ -204231,6 +203990,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rpmbuild-order_0_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , fgl, filepath, optparse-applicative, process, simple-cmd-args + }: + mkDerivation { + pname = "rpmbuild-order"; + version = "0.3"; + sha256 = "1w5c1nd1w75bk39payczbh4kwn5rizpv9dzgdwssa8d9f0na10lr"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal containers directory fgl filepath + optparse-applicative process simple-cmd-args + ]; + description = "Order RPM packages by dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rsagl" = callPackage ({ mkDerivation, array, arrows, base, containers , data-memocombinators, deepseq, mtl, old-time, OpenGL, OpenGLRaw @@ -206769,32 +206547,6 @@ self: { }) {}; "scheduler" = callPackage - ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest - , criterion, deepseq, doctest, exceptions, fib, genvalidity-hspec - , hspec, monad-par, mwc-random, parallel, primitive, QuickCheck - , streamly, template-haskell, unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "scheduler"; - version = "1.4.2"; - sha256 = "0px7k4lq758s8303fx690pzzigqi26m45wxpapj9pgl4kar45jzc"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - atomic-primops base deepseq exceptions primitive unliftio-core - ]; - testHaskellDepends = [ - base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck - template-haskell unliftio vector - ]; - benchmarkHaskellDepends = [ - async base criterion deepseq fib monad-par parallel streamly - unliftio - ]; - description = "Work stealing scheduler"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scheduler_1_4_2_1" = callPackage ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly @@ -206817,7 +206569,6 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedyield" = callPackage @@ -206853,8 +206604,8 @@ self: { }: mkDerivation { pname = "schemas"; - version = "0.2.0.1"; - sha256 = "19dqs2px9gj17lrav6syypn86pqk0yai29vn7z7a1gydmgvbzpw6"; + version = "0.2.0.2"; + sha256 = "0fpxjcs23kv3vq3mmg3f682n8yxb0666vflmvn9rnf9vc5afsz0x"; libraryHaskellDepends = [ aeson base bifunctors bytestring free generics-sop hashable lens lens-aeson profunctors scientific text transformers @@ -206866,6 +206617,8 @@ self: { ]; description = "schema guided serialization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schematic" = callPackage @@ -208391,6 +208144,8 @@ self: { ]; description = "fork of secp256k1"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "secret-santa" = callPackage @@ -209281,8 +209036,8 @@ self: { }: mkDerivation { pname = "seonbi"; - version = "0.1.0"; - sha256 = "0305ba46x7fz86m1b991672rq1viqchib9gns5aysp0bldggqqcf"; + version = "0.1.1"; + sha256 = "1jsikmlr647c51zmd471wnff6wzxybmp7bvidvyx5fkzb3nlhrqb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -209830,28 +209585,6 @@ self: { }) {}; "servant-JuicyPixels" = callPackage - ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant - , servant-server, wai, warp - }: - mkDerivation { - pname = "servant-JuicyPixels"; - version = "0.3.0.4"; - sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv"; - revision = "1"; - editedCabalFile = "185ym0ac6gx7f98pd92ykc1ib305lswzjzvykly4ij9vk85jn0ax"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring http-media JuicyPixels servant - ]; - executableHaskellDepends = [ - base JuicyPixels servant servant-server wai warp - ]; - description = "Servant support for JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-JuicyPixels_0_3_0_5" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp }: @@ -209869,7 +209602,6 @@ self: { ]; description = "Servant support for JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-aeson-specs" = callPackage @@ -212009,6 +211741,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_3_4_3_23_11" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.3.4.3.23.11"; + sha256 = "0ryr6h74vz6q6q0c9aixb7kwhq1vn95m3m0799cvc0xkfvm0ljha"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger-ui-core" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, http-media , servant, servant-blaze, servant-server, swagger2, text @@ -212065,6 +211814,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui-redoc_0_3_3_1_22_3" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui-redoc"; + version = "0.3.3.1.22.3"; + sha256 = "0bzkrh1hf29vfa1r1sgifb9j2zcg6i43fal4abbx4lcqvf155pzv"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + description = "Servant swagger ui: ReDoc theme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-tracing" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing , containers, hashable, http-api-data, http-client, HUnit @@ -212351,6 +212117,8 @@ self: { ]; description = "Storage backend for serversession using acid-state"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serversession-backend-persistent" = callPackage @@ -212709,17 +212477,17 @@ self: { "setdown" = callPackage ({ mkDerivation, alex, array, base, bytestring, cmdargs, containers - , directory, filepath, happy, mtl, split, text, uuid + , directory, filepath, happy, mtl, split, table-layout, text, uuid }: mkDerivation { pname = "setdown"; - version = "0.1.0.4"; - sha256 = "19sj928n2jg9y1s6g1pf2qn58a8likg3v9910vfl1ylvi8agh38y"; + version = "0.1.1.0"; + sha256 = "01kb0bw6f0rzs76r5mifmizx22az3w0kjkfsxmhcjfnxkhwiv5z7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bytestring cmdargs containers directory filepath mtl - split text uuid + split table-layout text uuid ]; executableToolDepends = [ alex happy ]; description = "Treating files as sets to perform rapid set manipulation"; @@ -212760,17 +212528,6 @@ self: { }) {}; "setlocale" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "setlocale"; - version = "1.0.0.8"; - sha256 = "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd"; - libraryHaskellDepends = [ base ]; - description = "Haskell bindings to setlocale"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "setlocale_1_0_0_9" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "setlocale"; @@ -212781,7 +212538,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setoid" = callPackage @@ -213645,6 +213401,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_22" = 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.22"; + sha256 = "1mc1a0vv070gcawwcx6vzpj6gpfh1qnlqrndiyfic3p500y656vh"; + 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 + ]; + 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-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -214108,22 +213890,6 @@ self: { }) {}; "shellmet" = callPackage - ({ mkDerivation, base, markdown-unlit, process, text }: - mkDerivation { - pname = "shellmet"; - version = "0.0.2.0"; - sha256 = "04ylwpwzd2g3604xyqr4g8zd9dp13hrb8kajajrymv6hafm85m3i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base process text ]; - executableHaskellDepends = [ base text ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base ]; - description = "Out of the shell solution for scripting in Haskell"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "shellmet_0_0_3_0" = callPackage ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text }: mkDerivation { @@ -214138,7 +213904,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Out of the shell solution for scripting in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shellout" = callPackage @@ -214308,6 +214073,8 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shh-extras" = callPackage @@ -214320,6 +214087,8 @@ self: { testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shift" = callPackage @@ -214614,29 +214383,6 @@ self: { }) {}; "shower" = callPackage - ({ mkDerivation, aeson, base, containers, directory, filepath - , megaparsec, pretty, process, QuickCheck, tasty, tasty-golden - , tasty-quickcheck, temporary, text, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "shower"; - version = "0.2.0.1"; - sha256 = "13qxddl6v3kcfgyr5q281hrr4xkflnc3nafbs3jq0w5k6njn7djb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base megaparsec pretty ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson base containers directory filepath process QuickCheck tasty - tasty-golden tasty-quickcheck temporary text unordered-containers - utf8-string vector - ]; - description = "Clean up the formatting of 'show' output"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shower_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, containers, directory, filepath , megaparsec, pretty, process, QuickCheck, tasty, tasty-golden , tasty-quickcheck, temporary, text, unordered-containers @@ -214657,7 +214403,6 @@ self: { ]; description = "Clean up the formatting of 'show' output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shpider" = callPackage @@ -215143,17 +214888,6 @@ self: { }) {}; "simple-cabal" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "simple-cabal"; - version = "0.0.0.1"; - sha256 = "17v22v9sb8z2jbr76vv577hxcvypfkpmji2k8yzwd2kxjssxpjrn"; - libraryHaskellDepends = [ base Cabal directory filepath ]; - description = "Cabal file wrapper library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cabal_0_1_1" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "simple-cabal"; @@ -215162,7 +214896,6 @@ self: { libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Cabal file wrapper library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd" = callPackage @@ -216161,6 +215894,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.xorg) libXft;}; + "single-tuple" = callPackage + ({ mkDerivation, base, hspec, OneTuple, Only }: + mkDerivation { + pname = "single-tuple"; + version = "0.1.0.0"; + sha256 = "1sxpbnn1846c3pyq3gm8vx82br8w8dqxvigfr6s160jjlqj7f03b"; + revision = "2"; + editedCabalFile = "06xpski7mxbgmdy2mc4xd6a1y0mfdyskwjhlih4nzxgj7n8v9hfi"; + libraryHaskellDepends = [ base OneTuple Only ]; + testHaskellDepends = [ base hspec OneTuple Only ]; + description = "a class for single tuple implementations"; + license = stdenv.lib.licenses.asl20; + }) {}; + "singleton-bool" = callPackage ({ mkDerivation, base, dec }: mkDerivation { @@ -216798,23 +216545,17 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, directory, filepath, hxt - , mtl, regex-pcre-builtin, safe, skylighting-core, text - , utf8-string + ({ mkDerivation, base, binary, bytestring, containers + , skylighting-core }: mkDerivation { pname = "skylighting"; - version = "0.8.2"; - sha256 = "0a81hd4f0xlc8as5lh454gkbyxndaxyj7lblkfk92j173nyx69cz"; + version = "0.8.2.1"; + sha256 = "1xls8ycad77m55ax4hp55k60h3pi5sm3m32hycbc8baixbgfx5xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl regex-pcre-builtin safe skylighting-core text - utf8-string + base binary bytestring containers skylighting-core ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; @@ -216843,20 +216584,20 @@ self: { , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, transformers, utf8-string + , regex-base, regex-pcre-builtin, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string }: mkDerivation { pname = "skylighting-core"; - version = "0.8.2"; - sha256 = "1nd11170r7xwv0hy21bx9nz7173ijbqkh7r8504ixjkwckgr2zs0"; + version = "0.8.2.1"; + sha256 = "0hdchivb4af9w7v5v7lrwfwawd3kcwmpzk69m1vkkm3pis8lcr1s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base base64-bytestring binary blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl regex-pcre-builtin safe text transformers - utf8-string + filepath hxt mtl regex-base regex-pcre-builtin safe text + transformers utf8-string ]; testHaskellDepends = [ aeson base bytestring containers Diff directory filepath HUnit @@ -217378,6 +217119,8 @@ self: { ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "small-bytearray-builder" = callPackage @@ -219983,21 +219726,6 @@ self: { }) {}; "socks" = callPackage - ({ mkDerivation, base, basement, bytestring, cereal, network }: - mkDerivation { - pname = "socks"; - version = "0.6.0"; - sha256 = "10bkf2gw5l48j6g1i2slndcg4nzdqj8syrnbj21gjz6sms3zlqlp"; - revision = "1"; - editedCabalFile = "0a7p6gfcmxgrs3rx62qm7fi5hvn90r64px7wbqva4h6scrmywn50"; - libraryHaskellDepends = [ - base basement bytestring cereal network - ]; - description = "Socks proxy (ver 5)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "socks_0_6_1" = callPackage ({ mkDerivation, base, basement, bytestring, cereal, network }: mkDerivation { pname = "socks"; @@ -220008,7 +219736,6 @@ self: { ]; description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sodium" = callPackage @@ -222708,6 +222435,8 @@ self: { executableHaskellDepends = [ base options text turtle ]; description = "Console program used to fix Stack build errors automatically"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-hpc-coveralls" = callPackage @@ -224874,6 +224603,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storable-enum" = callPackage + ({ mkDerivation, base, prelude-compat }: + mkDerivation { + pname = "storable-enum"; + version = "0.0"; + sha256 = "01nllxm3fx9f1cxay80bwvmpawrwipk7d2c6xb1q5fr3iwnqqaa2"; + libraryHaskellDepends = [ base prelude-compat ]; + description = "Wrapper that makes any Enum type Storable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "storable-record" = callPackage ({ mkDerivation, base, semigroups, transformers, utility-ht }: mkDerivation { @@ -225112,15 +224852,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_42_0" = callPackage + "stratosphere_0_43_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.42.0"; - sha256 = "1520dhfad9j1aa9sjxq56v6hivbfnm2vi19hjn7y0m6a80q2wawp"; + version = "0.43.0"; + sha256 = "1clx506qbzjm1paqmyw0fzldd2wg8p7jnfp6awqgzilririnvk9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225333,24 +225073,6 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl - , semigroups, transformers, transformers-base - }: - mkDerivation { - pname = "streaming"; - version = "0.2.2.0"; - sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss"; - revision = "2"; - editedCabalFile = "0cfxibcf0lkzbbyxl96dpnmacxv39ljwrlr3935bxykihr83j9xf"; - libraryHaskellDepends = [ - base containers ghc-prim mmorph mtl semigroups transformers - transformers-base - ]; - description = "an elementary streaming prelude and general stream type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming_0_2_3_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl , transformers, transformers-base }: @@ -225363,7 +225085,6 @@ self: { ]; description = "an elementary streaming prelude and general stream type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-attoparsec" = callPackage @@ -226334,21 +226055,6 @@ self: { }) {}; "string-qq" = callPackage - ({ mkDerivation, base, Cabal, process, template-haskell }: - mkDerivation { - pname = "string-qq"; - version = "0.0.2"; - sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; - revision = "1"; - editedCabalFile = "1flc6mr1nnv8mx69cy1ilwk5gxsidcns82vjdg8dcs8z5axg95kp"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ base template-haskell ]; - description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "string-qq_0_0_4" = callPackage ({ mkDerivation, base, HUnit, template-haskell, text }: mkDerivation { pname = "string-qq"; @@ -226358,7 +226064,6 @@ self: { testHaskellDepends = [ base HUnit text ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-quote" = callPackage @@ -226588,17 +226293,6 @@ self: { }) {}; "stripe-concepts" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "stripe-concepts"; - version = "1.0.1.0"; - sha256 = "1bpxsi9dpazxjh3m5lbkvm7aszylmhvkpazw8hdgpdnkv3gryjv5"; - libraryHaskellDepends = [ base bytestring text ]; - description = "Types for the Stripe API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stripe-concepts_1_0_2_0" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; @@ -226607,7 +226301,6 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-core" = callPackage @@ -226737,22 +226430,6 @@ self: { }) {}; "stripe-wreq" = callPackage - ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts - , text, unordered-containers, wreq - }: - mkDerivation { - pname = "stripe-wreq"; - version = "1.0.0.0"; - sha256 = "1cm9fvkpanxydbbrk9s1yj3bkxd7wcschi40a4dhmh8h3wr89y8s"; - libraryHaskellDepends = [ - aeson base bytestring lens stripe-concepts text - unordered-containers wreq - ]; - description = "Use the Stripe API via Wreq"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stripe-wreq_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts , text, unordered-containers, wreq }: @@ -226766,7 +226443,6 @@ self: { ]; description = "Use the Stripe API via Wreq"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strips" = callPackage @@ -227123,8 +226799,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.2.2"; - sha256 = "1zs624xqp6j8vrl6pfv18dm8vz8hvz25grri65ximxhcizgwhnax"; + version = "0.9.3.0"; + sha256 = "1r3wh8fxazhwlx4hzzczq1r1hd7h9638ldb9b1iwszbpy90i6z5h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228526,31 +228202,6 @@ self: { }) {}; "swish" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, old-locale, polyparse - , semigroups, test-framework, test-framework-hunit, text, time - }: - mkDerivation { - pname = "swish"; - version = "0.10.0.1"; - sha256 = "1ikqqyra9r79vw2s969kyqh1vgijcr33y7irriylsp51n7pspagk"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - old-locale polyparse text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups - test-framework test-framework-hunit text time - ]; - description = "A semantic web toolkit"; - license = stdenv.lib.licenses.lgpl21; - }) {}; - - "swish_0_10_0_2" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable , HUnit, intern, mtl, network-uri, old-locale, polyparse , semigroups, test-framework, test-framework-hunit, text, time @@ -228573,7 +228224,6 @@ self: { ]; description = "A semantic web toolkit"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sws" = callPackage @@ -229001,6 +228651,8 @@ self: { ]; description = "Data serialization, communication, and operation verification implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "symbol" = callPackage @@ -229987,12 +229639,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "systemd_2_1_0" = callPackage + "systemd_2_2_0" = callPackage ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "2.1.0"; - sha256 = "1m6z5f3zaxxn9jcbd02b16rzgbifzwlwvpbw8v16qh5q8sy074dc"; + version = "2.2.0"; + sha256 = "18z0wc71k3wwxfighwk4y03aprf5sd94vadzbyjysrac2np1qz20"; libraryHaskellDepends = [ base bytestring network transformers unix ]; @@ -233327,10 +232979,9 @@ self: { , directory, distributive, doctest, dyre, filepath, focuslist , genvalidity-containers, genvalidity-hspec, gi-gdk, gi-gio , gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base - , hedgehog, inline-c, lens, libpcre2, mono-traversable - , pretty-simple, QuickCheck, singletons, tasty, tasty-hedgehog - , tasty-hspec, template-haskell, text, vte_291, xml-conduit - , xml-html-qq + , hedgehog, inline-c, lens, mono-traversable, pcre2, pretty-simple + , QuickCheck, singletons, tasty, tasty-hedgehog, tasty-hspec + , template-haskell, text, vte_291, xml-conduit, xml-html-qq }: mkDerivation { pname = "termonad"; @@ -233347,7 +232998,7 @@ self: { mono-traversable pretty-simple QuickCheck singletons text xml-conduit xml-html-qq ]; - libraryPkgconfigDepends = [ gtk3 libpcre2 vte_291 ]; + libraryPkgconfigDepends = [ gtk3 pcre2 vte_291 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest genvalidity-containers genvalidity-hspec hedgehog lens @@ -233355,7 +233006,8 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gtk3; libpcre2 = null; vte_291 = pkgs.vte;}; + }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; + vte_291 = pkgs.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -234087,28 +233739,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.11.2.2"; - sha256 = "11qhp37ghz70bbpapzafd1ksvzqrd1p0fi7fjlyfs10i02pj8kpy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "texmath_0_11_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -234128,7 +233758,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -235594,25 +235223,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover - , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.8"; - sha256 = "0f5rf8jr9g5pgnqv7i60ygmnycjq1qbfvccjpagc1xy4gbgjng41"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ - base bytestring ghc-prim hspec template-haskell th-lift - ]; - testToolDepends = [ hspec-discover ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_9" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many }: @@ -235629,7 +235239,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-pprint" = callPackage @@ -235736,24 +235345,6 @@ self: { }) {}; "th-test-utils" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "th-test-utils"; - version = "1.0.0"; - sha256 = "1kpkf6h0vr06z7iphkcjva9x28mfjg967hrih4im527g9vw5mdq6"; - revision = "2"; - editedCabalFile = "1m2fh0js7cyqr8g0yn0222jjc62bib4lvb1lq570p0c4zd508dpn"; - libraryHaskellDepends = [ base template-haskell transformers ]; - testHaskellDepends = [ - base tasty tasty-hunit template-haskell transformers - ]; - description = "Utility functions for testing Template Haskell code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-test-utils_1_0_1" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, template-haskell , transformers }: @@ -235767,7 +235358,6 @@ self: { ]; description = "Utility functions for testing Template Haskell code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-to-exp" = callPackage @@ -238080,8 +237670,8 @@ self: { }: mkDerivation { pname = "tldr"; - version = "0.4.0.1"; - sha256 = "0nc581y9jjzwd8l88g48c72mla7k6q1w102akl7gl5jsk9ljamd3"; + version = "0.4.0.2"; + sha256 = "1zy9yyg7bxiyz1prkvrscggsb9p0f8y0nqxxxzlgzvnh2nmqf8f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238096,15 +237686,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tldr_0_5_0" = callPackage + "tldr_0_5_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory , filepath, optparse-applicative, semigroups, tasty, tasty-golden , text, typed-process }: mkDerivation { pname = "tldr"; - version = "0.5.0"; - sha256 = "1rjnvc62nwiyp95fpx1b75prbr3bg27zfgilmf5kylj82l9xf8q3"; + version = "0.5.1"; + sha256 = "1b0q5gjk3567jd7ysz7l24r4wni8yjmzr1snmadf199873gs0821"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238280,6 +237870,8 @@ self: { ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tmapchan" = callPackage @@ -238805,6 +238397,38 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tomland_1_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , hashable, hedgehog, hspec-megaparsec, markdown-unlit, megaparsec + , mtl, parser-combinators, tasty, tasty-discover, tasty-hedgehog + , tasty-hspec, tasty-silver, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "tomland"; + version = "1.2.0.0"; + sha256 = "1kwrp12x2gyb3syijrd2jbx7sd13p78aq2nspnfff453ki17z8zf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec mtl + parser-combinators text time transformers unordered-containers + ]; + executableHaskellDepends = [ + base containers hashable text time unordered-containers + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + base bytestring containers directory hashable hedgehog + hspec-megaparsec megaparsec tasty tasty-hedgehog tasty-hspec + tasty-silver text time unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "Bidirectional TOML serialization"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -239321,6 +238945,8 @@ self: { pname = "toysolver"; version = "0.6.0"; sha256 = "0hd3rwbv8k62qnw9spwx6gl0j4syivvrigjcdgc53llbqzdjr0v1"; + revision = "1"; + editedCabalFile = "0grqs68qr3jpy2hibl5vlnz981hk0hnd5wacglnxxswqikdbpn06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240496,8 +240122,8 @@ self: { }: mkDerivation { pname = "tree-sitter"; - version = "0.4.0.0"; - sha256 = "0iqyqj2wavm4qrnmls4nwcnr0y8lgxsj42jbm22riwfh3wlg4dnf"; + version = "0.5.0.0"; + sha256 = "0gf2mcrrib4id0374hs9mf24g09d4rz7nrrgf92ls7b8279xvjkd"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects semantic-source split template-haskell text unordered-containers @@ -240543,8 +240169,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-java"; - version = "0.3.0.0"; - sha256 = "0cxndrwzs1yfc2sgscxvckjd2hwaxqi4llpnfcdk0mb0la21xczg"; + version = "0.4.0.0"; + sha256 = "0v8mw4slp6rgyw2h3qpqkjqs13kg8dcigq7014dh77h804plk0w7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; @@ -240555,12 +240181,13 @@ self: { }) {}; "tree-sitter-json" = callPackage - ({ mkDerivation, base, template-haskell, tree-sitter }: + ({ mkDerivation, base, template-haskell, text, tree-sitter }: mkDerivation { pname = "tree-sitter-json"; - version = "0.2.0.1"; - sha256 = "107ymwb1fyff8b5qvvrg7rm32xnvzfh6mz2mr1nq3yjdqp6rz3n9"; - libraryHaskellDepends = [ base template-haskell tree-sitter ]; + version = "0.3.0.0"; + sha256 = "09489gikbmddw28ckgf6mg526j43386sdilvb7gzs5x9kc86sd4q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base template-haskell text tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for JSON"; license = stdenv.lib.licenses.bsd3; @@ -240588,8 +240215,8 @@ self: { }: mkDerivation { pname = "tree-sitter-python"; - version = "0.5.0.0"; - sha256 = "1ikl7r2lmcynb4ahbmzjlq04s0ydnv8jixwgcihywnfn410w82sx"; + version = "0.6.0.0"; + sha256 = "041qrxdkn19x9h0vcjb0jvc6d0mp6ysdak7i4yqqww683npxjkp1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base directory filepath semantic-source template-haskell @@ -246525,6 +246152,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_3_2_2" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, blaze-builder + , bytestring, containers, criterion, deepseq, deepseq-generics + , hedgehog, HUnit, network-uri, safe, semigroups, tasty + , tasty-hedgehog, tasty-hunit, template-haskell, th-lift-instances + , transformers + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.3.2.2"; + sha256 = "0spzv3mwlpxiamd7347sxwcy2xri16ak1y7p1v4fisnvq4jprm67"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers + template-haskell th-lift-instances + ]; + testHaskellDepends = [ + attoparsec base base-compat blaze-builder bytestring containers + hedgehog HUnit safe semigroups tasty tasty-hedgehog tasty-hunit + transformers + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq deepseq-generics + network-uri + ]; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-bytestring-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { @@ -247978,18 +247634,6 @@ self: { }) {}; "validity" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "validity"; - version = "0.9.0.1"; - sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity_0_9_0_2" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; @@ -247999,7 +247643,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -248612,6 +248255,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vec_0_2" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq + , distributive, fin, hashable, inspection-testing, lens + , semigroupoids, tagged, transformers, vector + }: + mkDerivation { + pname = "vec"; + version = "0.2"; + sha256 = "0jh3na9nvljvshzij3hca8g2gpbsrp253fqnqzpq4p8bkv8zkfj1"; + libraryHaskellDepends = [ + adjunctions base base-compat deepseq distributive fin hashable lens + semigroupoids transformers + ]; + testHaskellDepends = [ + base base-compat fin inspection-testing tagged + ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + description = "Vec: length-indexed (sized) list"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vect" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -248758,24 +248423,6 @@ self: { }) {}; "vector-builder" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck - , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, vector - }: - mkDerivation { - pname = "vector-builder"; - version = "0.3.7.2"; - sha256 = "04dri31fqcwlhprvw9vl6qsgj8f7q4ms0rc2bfqcaqj1a2kr3cdf"; - libraryHaskellDepends = [ base base-prelude semigroups vector ]; - testHaskellDepends = [ - attoparsec QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - description = "Vector builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vector-builder_0_3_8" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit , tasty-quickcheck, vector @@ -248791,7 +248438,6 @@ self: { ]; description = "Vector builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-bytes-instances" = callPackage @@ -249173,20 +248819,6 @@ self: { }) {}; "vector-th-unbox" = callPackage - ({ mkDerivation, base, data-default, template-haskell, vector }: - mkDerivation { - pname = "vector-th-unbox"; - version = "0.2.1.6"; - sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy"; - revision = "1"; - editedCabalFile = "1bpxdliw7jmks1rkmb8hbr7hng3niz1pfc6n3s8ndj1acrksmfmv"; - libraryHaskellDepends = [ base template-haskell vector ]; - testHaskellDepends = [ base data-default vector ]; - description = "Deriver for Data.Vector.Unboxed using Template Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-th-unbox_0_2_1_7" = callPackage ({ mkDerivation, base, data-default, template-haskell, vector }: mkDerivation { pname = "vector-th-unbox"; @@ -249196,7 +248828,6 @@ self: { testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vectortiles" = callPackage @@ -250897,6 +250528,8 @@ self: { pname = "wai-extra"; version = "3.0.28"; sha256 = "0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7"; + revision = "1"; + editedCabalFile = "0kb3fpiyq6kp7vm16cf8j4225q74ssfq9ilfdms7prn1c6brb19g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -253992,6 +253625,18 @@ self: { broken = true; }) {}; + "websockets-simple-extra" = callPackage + ({ mkDerivation, base, mtl, websockets-simple }: + mkDerivation { + pname = "websockets-simple-extra"; + version = "0.0.0"; + sha256 = "1ckni1imxh4k1nxivvj9p1mffzvdmyjc20nas8b90dkkxblgnk1j"; + libraryHaskellDepends = [ base mtl websockets-simple ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "websockets-snap" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, io-streams , mtl, snap-core, snap-server, websockets @@ -254555,25 +254200,6 @@ self: { }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; - version = "0.2.0.7"; - sha256 = "00lpx5lqahd5wx3f2rp0glhi9m5k0miys39fpq7p57iwvdzjhgxa"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_8" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: @@ -254590,7 +254216,6 @@ self: { ]; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -254665,43 +254290,6 @@ self: { }) {}; "winery" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cereal - , containers, cpu, deepseq, directory, fast-builder, gauge - , hashable, HUnit, megaparsec, mtl, prettyprinter - , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances - , scientific, semigroups, serialise, store, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "winery"; - version = "1.1.2"; - sha256 = "1hxs3pyv0icqmnmnjadr86d55jdi689hgcjgx3lq7skxs3hp0qf1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers cpu fast-builder hashable HUnit - megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck - scientific semigroups text time transformers unordered-containers - vector - ]; - executableHaskellDepends = [ - aeson base bytestring megaparsec prettyprinter - prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - base bytestring containers fast-builder QuickCheck - quickcheck-instances scientific text time unordered-containers - vector - ]; - benchmarkHaskellDepends = [ - aeson base binary bytestring cereal deepseq directory gauge - serialise store text - ]; - description = "A compact, well-typed seralisation format for Haskell values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "winery_1_1_3" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal , containers, cpu, deepseq, directory, fast-builder, gauge , hashable, HUnit, megaparsec, mtl, prettyprinter @@ -254736,7 +254324,6 @@ self: { ]; description = "A compact, well-typed seralisation format for Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "winio" = callPackage @@ -254873,25 +254460,6 @@ self: { }) {}; "witherable" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable, lens - , monoidal-containers, transformers, transformers-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "witherable"; - version = "0.3.3"; - sha256 = "0pp2p2zhdjv3kq8dywcj9hcdaf0i37vihaxcxbs889iiw2cgy9hj"; - revision = "1"; - editedCabalFile = "1v10h2biv5k9amahw77755k60wgqp0d36d1rb2vy8qjh07gnnanr"; - libraryHaskellDepends = [ - base base-orphans containers hashable lens monoidal-containers - transformers transformers-compat unordered-containers vector - ]; - description = "filterable traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "witherable_0_3_4" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable, lens , monoidal-containers, transformers, transformers-compat , unordered-containers, vector @@ -254906,7 +254474,6 @@ self: { ]; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witness" = callPackage @@ -257749,6 +257316,8 @@ self: { pname = "xml-lens"; version = "0.2"; sha256 = "1jvi8xcsvwzvh44karnsp9br6bfn59s5vhizwycg4fi7ljhm8fm3"; + revision = "1"; + editedCabalFile = "0agp2gpzzgrpy831cj47r8fi91r0s68a7bl8fqvbb1ya7jfadfll"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -258232,8 +257801,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.30"; - sha256 = "1msyl3gy8cybdkx24k6ykcxjf95b5zid8b6vdwqmsamw1yrb3sgr"; + version = "0.31"; + sha256 = "1sbxva4zaj060bigmxivpn4zlz0q1qbq2np8gljdqkjvysjzpbka"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -258426,25 +257995,6 @@ self: { }) {}; "xmonad-extras" = callPackage - ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint - , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib - }: - mkDerivation { - pname = "xmonad-extras"; - version = "0.15.1"; - sha256 = "1x61s81rnmh26i8bwd7jlpsa5jn7fsas2fsibg46bsszs5ln225q"; - configureFlags = [ - "-f-with_hlist" "-fwith_parsec" "-fwith_split" - ]; - libraryHaskellDepends = [ - alsa-mixer base bytestring containers hint libmpd mtl network - regex-posix X11 xmonad xmonad-contrib - ]; - description = "Third party extensions for xmonad with wacky dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xmonad-extras_0_15_2" = callPackage ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib }: @@ -258461,7 +258011,6 @@ self: { ]; description = "Third party extensions for xmonad with wacky dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-screenshot" = callPackage @@ -262131,6 +261680,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_7" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie, hspec + , hspec-core, html-conduit, http-types, HUnit, memory, network + , pretty-show, semigroups, text, time, transformers, unliftio, wai + , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.7"; + sha256 = "1x7fmp1q3zn15av6rhdddnilkb54xmkpb6pkfzfpjm3vff27i7jj"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit memory network pretty-show semigroups text time + transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index cd9a101d3c5d..ba477e06e2f1 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -133,7 +133,7 @@ let installPhase = '' export HOME="$TMP" mkdir -p "$out" - cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; }; diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix index b9b2400b78b9..2d9fec02e106 100644 --- a/pkgs/development/interpreters/elixir/1.9.nix +++ b/pkgs/development/interpreters/elixir/1.9.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.9.1"; - sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx"; + version = "1.9.2"; + sha256 = "19yn6nx6r627f5zbyc7ckgr96d6b45sgwx95n2gp2imqwqvpj8wc"; minimumOTPVersion = "20"; } diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 0889b7fefe68..7db3830447f7 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -4,7 +4,8 @@ callPackage ./default.nix { version = "2.0.5"; isStable = true; sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; - extraMeta = { - platforms = lib.filter (p: p != "aarch64-linux") lib.meta.platforms; + extraMeta = { # this isn't precise but it at least stops the useless Hydra build + platforms = with lib; filter (p: p != "aarch64-linux") + (platforms.linux ++ platforms.darwin); }; } diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 7db8feb98e71..5b7761164472 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -62,12 +62,12 @@ stdenv.mkDerivation rec { interpreter = "${self}/bin/lua"; }; - meta = with stdenv.lib; extraMeta // { + meta = with stdenv.lib; { description = "High-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ]; - }; + } // extraMeta; } diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 686cfee19a6d..3de211915122 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,21 +2,23 @@ stdenv.mkDerivation { pname = "metamath"; - version = "0.172"; + version = "0.178"; buildInputs = [ autoreconfHook ]; - # This points to my own repository because there is no official repository - # for metamath; there's a download location but it gets updated in place with - # no permanent link. See discussion at - # https://groups.google.com/forum/#!topic/metamath/N4WEWQQVUfY src = fetchFromGitHub { - owner = "Taneb"; - repo = "metamath"; - rev = "43141cd17638f8efb409dc5d46e7de6a6c39ec42"; - sha256 = "07c7df0zl0wsb0pvdgkwikpr8kz7fi3mshxzk61vkamyp68djjb5"; + owner = "metamath"; + repo = "metamath-exe"; + rev = "4f59d60aeb03f92aea3cc7ecf5a2c0fcf08900a5"; + sha256 = "0nrl4nzp6rm2sn365xyjf3g5l5fl58kca7rq08lqyz5gla0wgfcf"; }; + # the files necessary to build the DATA target are not in this distribution + # luckily, they're not really needed so we don't build it. + makeFlags = [ "DATA=" ]; + + installTargets = "install-exec"; + meta = with stdenv.lib; { description = "Interpreter for the metamath proof language"; longDescription = '' diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 32aa355d3aa2..09c324716bda 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -100,7 +100,7 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals isPy35 [ # Backports support for LD_LIBRARY_PATH from 3.6 ./3.5/ld_library_path.patch - ] ++ optionals isPy37 [ + ] ++ optionals (isPy37 || isPy38) [ # Fix darwin build https://bugs.python.org/issue34027 (fetchpatch { url = https://bugs.python.org/file47666/darwin-libutil.patch; @@ -114,7 +114,7 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch - else if isPy37 then + else if isPy37 || isPy38 then ./3.7/python-3.x-distutils-C++.patch else fetchpatch { diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 86616cc8890d..43a3125d8a08 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -28,6 +28,7 @@ with pkgs; isPy35 = pythonVersion == "3.5"; isPy36 = pythonVersion == "3.6"; isPy37 = pythonVersion == "3.7"; + isPy38 = pythonVersion == "3.8"; isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; @@ -104,9 +105,9 @@ in { major = "3"; minor = "8"; patch = "0"; - suffix = "rc1"; + suffix = ""; }; - sha256 = "08d8j3dsv6yz5zxkqvsa71scxjjzdwarfk6hsjfhaw2xrxndyi5f"; + sha256 = "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk"; inherit (darwin) CF configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 30ac6d2bd5b4..846bba9e7e7e 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { pname = "renpy"; - version = "7.3.2"; + version = "7.3.3"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "1i7s9s8invsm5bavw2jlk965pb5h5vgwyk1nhw0z1d22spmj4a4m"; + sha256 = "0wwsm0vg6zd07xmkqrqprymahdl4ifg7bc1lpbrh0qlfs1pvjlss"; }; patches = [ diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 0aace12569a5..bae7b56cb8ee 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "accounts-qt"; - version = "1.15"; + version = "1.16"; src = fetchFromGitLab { - sha256 = "0cnra7g2mcgzh8ykrj1dpb4khkx676pzdr4ia1bvsp0cli48691w"; + sha256 = "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz"; rev = "VERSION_${version}"; repo = "libaccounts-qt"; owner = "accounts-sso"; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index fa9a45f1ed3c..05a1c95c81f0 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -298,10 +298,10 @@ in rec { en = buildOfficialDict { language = "en"; - version = "2018.04.16-0"; + version = "2019.10.06-0"; fullName = "English"; filename = "aspell6"; - sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; + sha256 = "1zai9wrqwgb9z9vfgb22qhrvxvg73jg0ix44j1khm2f6m96lncr4"; }; eo = buildOfficialDict { @@ -919,12 +919,12 @@ in rec { src1 = fetchurl { url = http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt; - sha256 = "1psqm094zl4prk2f8h18jv0d471hxykzd1zdnrlx7gzrzy6pz5r3"; + sha256 = "1nf4py2mg0mlv9s5a7had2wn29z2v6bcca0fs6rbpdn4nqc4s7dm"; }; src2 = fetchurl { url = http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt; - sha256 = "17ss1sdr3k70zbyx2z9xf74345slrp41gbkpih8axrmg4x92fgm1"; + sha256 = "0f88il1ds6qazy1ghxviqcwsywrbf6pzl2lmzf4f3qvhdfb6f1y0"; }; langInputs = [ en ]; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index d5a98b0ce92e..b9207e517069 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "assimp"; - version = "4.1.0"; + version = "5.0.0"; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - sha256 = "00g61g3ixmfszzjncpvm8x7gp2livaj4lmhbycjmrw4x3gfqlc4r"; + sha256 = "17y5q5hbygmb0cgf96gd3v8sal5g69cp8hmh1cs3yz7v00kjysmz"; }; buildInputs = [ cmake boost zlib ]; diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/default.nix new file mode 100644 index 000000000000..7802be9c4f00 --- /dev/null +++ b/pkgs/development/libraries/cereal/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + pname = "cereal"; + version = "1.2.2"; + + nativeBuildInputs = [ cmake ]; + + src = fetchFromGitHub { + owner = "USCiLab"; + repo = "cereal"; + rev = "v${version}"; + sha256 = "1ckr8r03ggg5pyzg8yw40d5ssq40h5najvyqlnxc85fxxp8rnrx4"; + }; + + cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ]; + + meta = with stdenv.lib; { + description = "A header-only C++11 serialization library"; + homepage = https://uscilab.github.io/cereal/; + platforms = platforms.all; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 093abe085f0a..84b4b1bab77f 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,24 +1,36 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libuv, sqlite-replication }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libco-canonical +, libuv, raft-canonical, sqlite-replication }: with stdenv.lib; stdenv.mkDerivation rec { pname = "dqlite"; - version = "0.2.6"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "CanonicalLtd"; + owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "13l7na5858v2ah1vim6lafmzajgkymfi5rd6bk14cm4vcnxc40wb"; + sha256 = "0670c1c84lcf5vl3h6mlff00fz2fnm766bzlk526sjjzysx3zjya"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + buildInputs = [ libco-canonical.dev libuv raft-canonical.dev + sqlite-replication ]; - buildInputs = [ libuv sqlite-replication ]; + preConfigure= '' + substituteInPlace configure --replace /usr/bin/ " " + ''; + + doCheck = true; + + outputs = [ "dev" "out" ]; meta = { - description = "Expose a SQLite database over the network and replicate it across a cluster of peers"; + description = '' + Expose a SQLite database over the network and replicate it across a + cluster of peers + ''; homepage = https://github.com/CanonicalLtd/dqlite/; license = licenses.asl20; maintainers = with maintainers; [ joko ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 8aa61949e401..edb3c27ebf54 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-system-bubblewrap=${bubblewrap}/bin/bwrap" "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy" - "--dbus_config_dir=${placeholder "out"}/share/dbus-1/system.d" + "--with-dbus-config-dir=${placeholder "out"}/share/dbus-1/system.d" "--localstatedir=/var" "--enable-installed-tests" ]; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 7dd075e440e5..be7132dc845b 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,65 +1,62 @@ -{ stdenv, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, nlohmann_json, fetchurl }: +{ stdenv, clang-tools, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: let - googleapis_rev = "a8ee1416f4c588f2ab92da72e7c1f588c784d3e6"; - googleapis = fetchurl { - name = "${googleapis_rev}.tar.gz"; - url = "https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz"; - sha256 = "1kxi27r034p7jfldhvgpbn6rqqqddycnja47m6jyjxj4rcmrp2kb"; + googleapis = fetchFromGitHub { + owner = "googleapis"; + repo = "googleapis"; + rev = "9c9f778aedde02f9826d2ae5d0f9c96409ba0f25"; + sha256 = "1gd3nwv8qf503wy6km0ad6akdvss9w5b1k3jqizy5gah1fkirkpi"; + }; + googleapis-cpp-cmakefiles = stdenv.mkDerivation rec { + pname = "googleapis-cpp-cmakefiles"; + version = "0.1.5"; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "cpp-cmakefiles"; + rev = "v${version}"; + sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ]; + + postPatch = '' + sed -e 's,https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz,file://${googleapis},' \ + -i CMakeLists.txt + ''; + }; + _nlohmann_json = fetchurl { + url = "https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp"; + sha256 = "0pw3jpi572irbp2dqclmyhgic6k9rxav5mpp9ygbp9xj48gnvnk3"; }; in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "0.11.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "1w942gzyv01ym1cv2a417x92zxra9s2v3xz5crcv84j919f616f8"; + sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; }; - buildInputs = [ curl grpc protobuf nlohmann_json crc32c c-ares c-ares.cmake-config ]; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; + buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ]; + nativeBuildInputs = [ clang-tools cmake pkgconfig doxygen ]; outputs = [ "out" "dev" ]; postPatch = '' - NLOHMANN_SHA256=$(sha256sum ${nlohmann_json}/include/nlohmann/json.hpp | cut -f1 -d' ') - sed -e 's,https://github.com/nlohmann/json/releases/download/.*,file://${nlohmann_json}/include/nlohmann/json.hpp"),' \ - -e "s,JSON_SHA256 .*,JSON_SHA256 ''${NLOHMANN_SHA256}," \ - -i cmake/DownloadNlohmannJson.cmake - - sed -e 's,https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz,file://${googleapis},' \ - -i cmake/external/googleapis.cmake - - # Fixup the library path. It would build a path like /build/external//nix/store/…-foo/lib/foo.so for each library instead of /build/external/lib64/foo.so - sed -e 's,''${CMAKE_INSTALL_LIBDIR},lib64,g' \ - -e 's,;lib64,lib,g' \ - -i cmake/ExternalProjectHelper.cmake - ''; - - preFixup = '' - mv --no-clobber $out/lib64/cmake/* $out/lib/cmake - mv --no-clobber $out/lib64/pkgconfig/* $out/lib/pkgconfig - rmdir $out/lib64/cmake $out/lib64/pkgconfig - find $out/lib64 - - for file in $out/lib/pkgconfig/*; do - sed -e 's,\''${prefix}//,/,g' -i $file - done + sed -e 's,https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp,file://${_nlohmann_json},' \ + -i cmake/DownloadNlohmannJson.cmake ''; cmakeFlags = [ - "-DGOOGLE_CLOUD_CPP_BIGTABLE_ENABLE_INSTALL=no" - "-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package" - "-DGOOGLE_CLOUD_CPP_GOOGLEAPIS_PROVIDER=external" "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DGOOGLE_CLOUD_CPP_INSTALL_RPATH=$(out)/lib" ]; meta = with stdenv.lib; { license = with licenses; [ asl20 ]; homepage = https://github.com/googleapis/google-cloud-cpp; description = "C++ Idiomatic Clients for Google Cloud Platform services"; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ andir flokli ]; }; } diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch index 0f9cc9aaf964..340eb47a6301 100644 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ b/pkgs/development/libraries/libbsd/darwin.patch @@ -1,30 +1,26 @@ diff --git a/configure.ac b/configure.ac -index 55fcfe6..1e26c93 100644 +index 6e9496d..60b6e4c 100644 --- a/configure.ac +++ b/configure.ac -@@ -51,15 +51,19 @@ AS_CASE([$host_os], - AC_SEARCH_LIBS([clock_gettime], [rt], [CLOCK_GETTIME_LIBS="-lrt"]) - AC_SUBST([CLOCK_GETTIME_LIBS]) - LIBS="$saved_LIBS" -+ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) - ], - [*-musl*], [ - # Upstream refuses to define this, we will do it ourselves then. - AC_DEFINE([__MUSL__], [1], [Define to 1 if we are building for musl]) -+ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) - ], --) -+ [ -+ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) -+ ]) +@@ -44,6 +44,8 @@ AC_SUBST([TESTU01_LIBS]) + AM_CONDITIONAL([HAVE_LIBTESTU01], + [test "x$ac_cv_lib_testu01_unif01_CreateExternGenBits" = "xyes"]) + ++AX_CHECK_VSCRIPT ++ + is_windows=no + AS_CASE([$host_os], + [*-gnu*], [ +@@ -68,7 +70,7 @@ AS_CASE([$host_os], + AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"]) # Checks for header files. --AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h nlist.h]) +-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h grp.h]) ++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h grp.h nlist.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE -@@ -143,7 +147,8 @@ AC_LINK_IFELSE( +@@ -169,7 +171,8 @@ AC_LINK_IFELSE( AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ getauxval getentropy getexecname getline \ @@ -60,19 +56,168 @@ index f987fee..a1e17ed 100644 #if !defined(__GLIBC__) || \ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) +diff --git a/m4/ax_check_vscript.m4 b/m4/ax_check_vscript.m4 +new file mode 100644 +index 0000000..9851f32 +--- /dev/null ++++ b/m4/ax_check_vscript.m4 +@@ -0,0 +1,142 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_check_vscript.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CHECK_VSCRIPT ++# ++# DESCRIPTION ++# ++# Check whether the linker supports version scripts. Version scripts are ++# used when building shared libraries to bind symbols to version nodes ++# (helping to detect incompatibilities) or to limit the visibility of ++# non-public symbols. ++# ++# Output: ++# ++# If version scripts are supported, VSCRIPT_LDFLAGS will contain the ++# appropriate flag to pass to the linker. On GNU systems this would ++# typically be "-Wl,--version-script", and on Solaris it would typically ++# be "-Wl,-M". ++# ++# Two Automake conditionals are also set: ++# ++# HAVE_VSCRIPT is true if the linker supports version scripts with ++# entries that use simple wildcards, like "local: *". ++# ++# HAVE_VSCRIPT_COMPLEX is true if the linker supports version scripts with ++# pattern matching wildcards, like "global: Java_*". ++# ++# On systems that do not support symbol versioning, such as Mac OS X, both ++# conditionals will be false. They will also be false if the user passes ++# "--disable-symvers" on the configure command line. ++# ++# Example: ++# ++# configure.ac: ++# ++# AX_CHECK_VSCRIPT ++# ++# Makefile.am: ++# ++# if HAVE_VSCRIPT ++# libfoo_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libfoo.map ++# endif ++# ++# if HAVE_VSCRIPT_COMPLEX ++# libbar_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libbar.map ++# endif ++# ++# LICENSE ++# ++# Copyright (c) 2014 Kevin Cernekee ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 2 ++ ++# _AX_CHECK_VSCRIPT(flag, global-sym, action-if-link-succeeds, [junk-file=no]) ++AC_DEFUN([_AX_CHECK_VSCRIPT], [ ++ AC_LANG_PUSH([C]) ++ ax_check_vscript_save_flags="$LDFLAGS" ++ echo "V1 { global: $2; local: *; };" > conftest.map ++ AS_IF([test x$4 = xyes], [ ++ echo "{" >> conftest.map ++ ]) ++ LDFLAGS="$LDFLAGS -Wl,$1,conftest.map" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[int show, hide;]], [])], [$3]) ++ LDFLAGS="$ax_check_vscript_save_flags" ++ rm -f conftest.map ++ AC_LANG_POP([C]) ++]) dnl _AX_CHECK_VSCRIPT ++ ++AC_DEFUN([AX_CHECK_VSCRIPT], [ ++ ++ AC_ARG_ENABLE([symvers], ++ AS_HELP_STRING([--disable-symvers], ++ [disable library symbol versioning [default=auto]]), ++ [want_symvers=$enableval], ++ [want_symvers=yes] ++ ) ++ ++ AS_IF([test x$want_symvers = xyes], [ ++ ++ dnl First test --version-script and -M with a simple wildcard. ++ ++ AC_CACHE_CHECK([linker version script flag], ax_cv_check_vscript_flag, [ ++ ax_cv_check_vscript_flag=unsupported ++ _AX_CHECK_VSCRIPT([--version-script], [show], [ ++ ax_cv_check_vscript_flag=--version-script ++ ]) ++ AS_IF([test x$ax_cv_check_vscript_flag = xunsupported], [ ++ _AX_CHECK_VSCRIPT([-M], [show], [ax_cv_check_vscript_flag=-M]) ++ ]) ++ ++ dnl The linker may interpret -M (no argument) as "produce a load map." ++ dnl If "-M conftest.map" doesn't fail when conftest.map contains ++ dnl obvious syntax errors, assume this is the case. ++ ++ AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [ ++ _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [show], ++ [ax_cv_check_vscript_flag=unsupported], [yes]) ++ ]) ++ ]) ++ ++ dnl If the simple wildcard worked, retest with a complex wildcard. ++ ++ AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [ ++ ax_check_vscript_flag=$ax_cv_check_vscript_flag ++ AC_CACHE_CHECK([if version scripts can use complex wildcards], ++ ax_cv_check_vscript_complex_wildcards, [ ++ ax_cv_check_vscript_complex_wildcards=no ++ _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [sh*], [ ++ ax_cv_check_vscript_complex_wildcards=yes]) ++ ]) ++ ax_check_vscript_complex_wildcards="$ax_cv_check_vscript_complex_wildcards" ++ ], [ ++ ax_check_vscript_flag= ++ ax_check_vscript_complex_wildcards=no ++ ]) ++ ], [ ++ AC_MSG_CHECKING([linker version script flag]) ++ AC_MSG_RESULT([disabled]) ++ ++ ax_check_vscript_flag= ++ ax_check_vscript_complex_wildcards=no ++ ]) ++ ++ AS_IF([test x$ax_check_vscript_flag != x], [ ++ VSCRIPT_LDFLAGS="-Wl,$ax_check_vscript_flag" ++ AC_SUBST([VSCRIPT_LDFLAGS]) ++ ]) ++ ++ AM_CONDITIONAL([HAVE_VSCRIPT], ++ [test x$ax_check_vscript_flag != x]) ++ AM_CONDITIONAL([HAVE_VSCRIPT_COMPLEX], ++ [test x$ax_check_vscript_complex_wildcards = xyes]) ++ ++]) dnl AX_CHECK_VSCRIPT diff --git a/src/Makefile.am b/src/Makefile.am -index f3cc0fa..3aaecd4 100644 +index 8384b92..e2c8e15 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -56,8 +56,10 @@ libbsd_la_DEPENDENCIES = \ - libbsd_la_LIBADD = \ - $(CLOCK_GETTIME_LIBS) +@@ -65,8 +65,11 @@ libbsd_la_LIBADD = \ + $(ARC4RANDOM_ATFORK_LIBS) \ + $(nil) libbsd_la_LDFLAGS = \ - -Wl,--version-script=$(srcdir)/libbsd.map \ -version-number $(LIBBSD_ABI) -+if BUILD_LINK_VERSION_SCRIPT -+libbsd_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libbsd.map ++if HAVE_VSCRIPT ++libbsd_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libbsd.map +endif ++ libbsd_la_SOURCES = \ arc4random.c \ arc4random.h \ @@ -175,23 +320,28 @@ index b3c8d5e..602f54e 100644 #include diff --git a/src/local-link.h b/src/local-link.h -index d518dcf..84694a2 100644 +index 0d4351a..fc520af 100644 --- a/src/local-link.h +++ b/src/local-link.h -@@ -27,7 +27,11 @@ +@@ -27,6 +27,11 @@ #ifndef LIBBSD_LOCAL_LINK_H #define LIBBSD_LOCAL_LINK_H +#ifdef __MACH__ +#define libbsd_link_warning(symbol, msg) ++#define libbsd_symver_default(alias, symbol, version) ++#define libbsd_symver_variant(alias, symbol, version) +#else #define libbsd_link_warning(symbol, msg) \ static const char libbsd_emit_link_warning_##symbol[] \ - __attribute__((used,section(".gnu.warning." #symbol))) = msg; + __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg; +@@ -45,3 +50,4 @@ + #endif + #endif +#endif diff --git a/src/nlist.c b/src/nlist.c -index 0932f59..4502048 100644 +index 228c220..46c2d77 100644 --- a/src/nlist.c +++ b/src/nlist.c @@ -41,6 +41,7 @@ @@ -202,7 +352,7 @@ index 0932f59..4502048 100644 #include "local-elf.h" #define SIZE_T_MAX 0xffffffffU -@@ -265,3 +266,4 @@ nlist(const char *name, struct nlist *list) +@@ -280,3 +281,4 @@ nlist(const char *name, struct nlist *list) (void)close(fd); return (n); } @@ -227,12 +377,12 @@ index f9f6195..2bc5fb4 100644 static void handler(int); diff --git a/src/setproctitle.c b/src/setproctitle.c -index 038ac7d..e9ee09c 100644 +index ff32aa3..51ed833 100644 --- a/src/setproctitle.c +++ b/src/setproctitle.c -@@ -32,6 +32,10 @@ - #include +@@ -33,6 +33,10 @@ #include + #include "local-link.h" +#ifdef __MACH__ +extern char **environ; @@ -241,30 +391,16 @@ index 038ac7d..e9ee09c 100644 static struct { /* Original value. */ const char *arg0; -@@ -280,16 +284,22 @@ setproctitle_impl(const char *fmt, ...) - *++nul = '\0'; - } - } -+#ifndef __MACH__ - __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); -+#endif - - /* The original function introduced in 0.2 was a stub, it only got implemented +@@ -287,7 +291,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); * in 0.5, make the implementation available in the old version as an alias * for code linking against that version, and change the default to use the * new version, so that new code depends on the implemented version. */ -#ifdef HAVE_TYPEOF +#ifdef __MACH__ -+void setproctitle_stub(const char *fmt, ...); -+#elif HAVE_TYPEOF - extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl"))); - #else - void setproctitle_stub(const char *fmt, ...) - __attribute__((alias("setproctitle_impl"))); - #endif -+#ifndef __MACH__ - __asm__(".symver setproctitle_stub,setproctitle@LIBBSD_0.2"); -+#endif ++#elif defined(HAVE_TYPEOF) + extern __typeof__(setproctitle_impl) + setproctitle_stub + __attribute__((__alias__("setproctitle_impl"))); diff --git a/src/strlcat.c b/src/strlcat.c index 14c53a1..5961c17 100644 --- a/src/strlcat.c @@ -316,46 +452,3 @@ index e6afde5..da680c9 100644 *p = '\0'; } +#endif -diff --git a/src/unvis.c b/src/unvis.c -index 94e3e7a..fba4c66 100644 ---- a/src/unvis.c -+++ b/src/unvis.c -@@ -565,11 +565,15 @@ strnunvis_openbsd(char *dst, const char *src, size_t dlen) - { - return strnunvisx(dst, dlen, src, 0); - } -+#ifndef __MACH__ - __asm__(".symver strnunvis_openbsd,strnunvis@@LIBBSD_0.2"); -+#endif - - int - strnunvis_netbsd(char *dst, size_t dlen, const char *src) - { - return strnunvisx(dst, dlen, src, 0); - } -+#ifndef __MACH__ - __asm__(".symver strnunvis_netbsd,strnunvis@LIBBSD_0.9.1"); -+#endif -diff --git a/src/vis.c b/src/vis.c -index c2cd2d8..2d84330 100644 ---- a/src/vis.c -+++ b/src/vis.c -@@ -723,14 +723,18 @@ strnvis_openbsd(char *mbdst, const char *mbsrc, size_t dlen, int flags) - { - return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); - } -+#ifndef __MACH__ - __asm__(".symver strnvis_openbsd,strnvis@@LIBBSD_0.2"); -+#endif - - int - strnvis_netbsd(char *mbdst, size_t dlen, const char *mbsrc, int flags) - { - return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); - } -+#ifndef __MACH__ - __asm__(".symver strnvis_netbsd,strnvis@LIBBSD_0.9.1"); -+#endif - - int - stravis(char **mbdstp, const char *mbsrc, int flags) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 60c3505f9a10..e251295a4c79 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch - # Suitable for all but limited to musl to avoid rebuild - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch; + patches = [ ./darwin.patch ]; meta = with stdenv.lib; { description = "Common functions found on BSD systems"; diff --git a/pkgs/development/libraries/libbsd/musl.patch b/pkgs/development/libraries/libbsd/musl.patch deleted file mode 100644 index fc07cfb6e855..000000000000 --- a/pkgs/development/libraries/libbsd/musl.patch +++ /dev/null @@ -1,14 +0,0 @@ -Source: maxice8 -Upstream: no -Reason: fixes compilation - ---- a/src/flopen.c -+++ b/src/flopen.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix new file mode 100644 index 000000000000..09c27ae7c9cf --- /dev/null +++ b/pkgs/development/libraries/libco-canonical/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + pname = "libco-canonical"; + version = "19.1"; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "libco"; + rev = "v${version}"; + sha256 = "03a0fq8f8gc4hjzcf0zsjib4mzag47rxrrg9b5r6bx53vj5rhj78"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + outputs = [ "dev" "out" ]; + + meta = { + description = "A cooperative multithreading library written in C89"; + homepage = "https://github.com/canonical/libco"; + license = licenses.isc; + maintainers = with maintainers; [ wucke13 ]; + }; +} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 4bfa6cd0b8e4..21e82c7becd6 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, lib, cmake, cacert }: +{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch, buildShared ? true }: let - generic = { version, sha256 }: stdenv.mkDerivation rec { + generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec { pname = "libressl"; inherit version; @@ -15,13 +15,14 @@ let cmakeFlags = [ "-DENABLE_NC=ON" - "-DBUILD_SHARED_LIBS=ON" # Ensure that the output libraries do not require an executable stack. # Without this define, assembly files in libcrypto do not include a # .note.GNU-stack section, and if that section is missing from any object, # the linker will make the stack executable. "-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK" - ]; + # libressl will append this to the regular prefix for libdir + "-DCMAKE_INSTALL_LIBDIR=lib" + ] ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON"; # The autoconf build is broken as of 2.9.1, resulting in the following error: # libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'. @@ -31,6 +32,8 @@ let rm configure ''; + inherit patches; + # Since 2.9.x the default location can't be configured from the build using # DEFAULT_CA_FILE anymore, instead we have to patch the default value. postPatch = lib.optionalString (lib.versionAtLeast version "2.9.2") '' @@ -69,10 +72,16 @@ in { libressl_2_9 = generic { version = "2.9.2"; sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4"; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://github.com/libressl-portable/portable/pull/529/commits/a747aacc23607c993cc481378782b2c7dd5bc53b.patch"; + sha256 = "0wbrcscdkjpk4mhh7f3saghi4smia4lhf7fl6la3ahhgx1krn5zm"; + }) + ]; }; libressl_3_0 = generic { - version = "3.0.0"; - sha256 = "0xiwri6xcnl3wb5nbc4aw8pv32s3hp13r9v465yr8wykaw211n81"; + version = "3.0.1"; + sha256 = "1js3fddxwzafiyspif0bwmvpp1fz98mkv10q5xaagqzvjw8xnsk4"; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 1fdddf930cfd..724c0d7c7641 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = '' rm example/Makefile src/Makefile - qmakeFlags="$qmakeFlags INSTALLDIR=$out" + qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out") ''; postInstall = '' diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 8013d6865855..ec4e1b5e837e 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr }: +{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }: stdenv.mkDerivation rec { pname = "openxr-loader"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ libX11 libXxf86vm libXrandr ]; + buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; diff --git a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch b/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch new file mode 100644 index 000000000000..5c2af7a2adc2 --- /dev/null +++ b/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch @@ -0,0 +1,20 @@ +diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc +--- a/poppler/JPEG2000Stream.cc ++++ b/poppler/JPEG2000Stream.cc +@@ -201,7 +201,7 @@ void JPXStream::init() + if (getDict()) smaskInData = getDict()->lookup("SMaskInData"); + + int bufSize = BUFFER_INITIAL_SIZE; +- if (oLen.isInt()) bufSize = oLen.getInt(); ++ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); + + if (cspace.isArray() && cspace.arrayGetLength() > 0) { + +@@ -365,7 +365,7 @@ void JPXStream::init() + } + + int bufSize = BUFFER_INITIAL_SIZE; +- if (oLen.isInt()) bufSize = oLen.getInt(); ++ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); + + if (cspace.isArray() && cspace.arrayGetLength() > 0) { diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 633c3d69618b..cb9cf16531c5 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -8,7 +8,7 @@ }: let - version = "0.61.0"; + version = "0.61.1"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0zrbb1b77k6bm2qdnra08jnbyllv6vj29790igmp6fzs59xf3kak"; + sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; }; outputs = [ "out" "dev" ]; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; }) + ./0.61-CVE-2019-9959.patch ]; buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 28408cb91f88..523e372996bc 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "CVE-2019-9959.patch"; + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/68ef84e5968a4249c2162b839ca6d7975048a557.patch"; + sha256 = "17a3qs74fnnrhjys23f4aw5y7yfsk5d507jcj4hh1bndqv6dpwg1"; + }) + ]; + buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 19b11a60e7b6..4894bee96092 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, openssl_1_0_2, cmake, pkgconfig, qt, darwin }: +{ stdenv, fetchurl, openssl, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { pname = "qca"; - version = "2.1.3"; + version = "2.2.1"; src = fetchurl { - url = "http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz"; - sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; + url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ openssl_1_0_2 qt ] + buildInputs = [ openssl qt ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix new file mode 100644 index 000000000000..515fbc602d90 --- /dev/null +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libuv }: + +stdenv.mkDerivation rec { + pname = "raft-canonical"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "raft"; + rev = "v${version}"; + sha256 = "083il7b5kw3pc7m5p9xjpb9dlvfarc51sni92mkgm9ckc32x9vpp"; + }; + + nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + buildInputs = [ libuv ]; + + preConfigure = '' + substituteInPlace configure --replace /usr/bin/ " " + ''; + + doCheck = false; + # Due to + #io_uv_recv/success/first [ ERROR ] + #Error: test/lib/dir.c:97: No such file or directory + #Error: child killed by signal 6 (Aborted) + + outputs = [ "dev" "out" ]; + + meta = with stdenv.lib; { + description = '' + Fully asynchronous C implementation of the Raft consensus protocol + ''; + longDescription = '' + The library has modular design: its core part implements only the core + Raft algorithm logic, in a fully platform independent way. On top of + that, a pluggable interface defines the I/O implementation for networking + (send/receive RPC messages) and disk persistence (store log entries and + snapshots). + ''; + homepage = "https://github.com/canonical/raft"; + license = licenses.asl20; + maintainers = [ maintainers.wucke13 ]; + }; +} diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 2dcac58bf6ca..5700b2118b97 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -3,7 +3,7 @@ For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. */ -stdenvNoCC.mkDerivation (rec { +stdenvNoCC.mkDerivation rec { name = "mkl-${version}"; version = "${date}.${rel}"; date = "2019.3"; @@ -35,11 +35,25 @@ stdenvNoCC.mkDerivation (rec { done '' else '' rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm + rpmextract rpm/intel-mkl-core-${date}-${rel}-${date}-${rel}.x86_64.rpm rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm rpmextract rpm/intel-openmp-19.0.3-${rel}-19.0.3-${rel}.x86_64.rpm ''; - installPhase = if stdenvNoCC.isDarwin then '' + installPhase = '' + for f in $(find . -name 'mkl*.pc') ; do + bn=$(basename $f) + substituteInPlace $f \ + --replace "prefix=/mkl" "prefix=$out" \ + --replace "lib/intel64_lin" "lib" + done + + for f in $(find opt/intel -name 'mkl*iomp.pc') ; do + substituteInPlace $f \ + --replace "../compiler/lib" "lib" + done + '' + + (if stdenvNoCC.isDarwin then '' mkdir -p $out/lib cp -r compilers_and_libraries_${version}/mac/mkl/include $out/ @@ -48,6 +62,9 @@ stdenvNoCC.mkDerivation (rec { cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/ + + mkdir -p $out/lib/pkgconfig + cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig '' else '' mkdir -p $out/lib @@ -56,7 +73,10 @@ stdenvNoCC.mkDerivation (rec { cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ cp license.txt $out/lib/ - ''; + + mkdir -p $out/lib/pkgconfig + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig + ''); # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool @@ -87,10 +107,4 @@ stdenvNoCC.mkDerivation (rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bhipple ]; }; - } // stdenvNoCC.lib.optionalAttrs stdenvNoCC.isLinux { - # Since on Linux binaries are unmodified, we can make them - # fixed-output derivations. - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "101krzh2mjbfx8kvxim2zphdvgg7iijhbf9xdz3ad3ncgybxbdvw"; - }) +} diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index ad8fc6fc8d4b..7a547eedb21d 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales python3 # for data-generators systemd # used for checks to install systemd user service + dbus # used for checks and pkgconfig to install dbus service/s ]; buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer dbus + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer ]; mesonFlags = [ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index 729f5937117e..a5fddd417fa1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''_3bmd''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 15b907e341e9..3ed0c3eca784 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''alexandria''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index 5921b5f49b12..61a07c61ca07 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''anaphora''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 988b247482b6..efa5dc6e7698 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''array-utils''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 1d1ef41f2d16..65df45d95a50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''asdf-system-connections''; version = ''20170124-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index d8a12f6edbe3..4cba3e86e068 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''babel''; version = ''20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index d7cebabb0adf..a660882f36b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''blackbird''; version = ''20160531-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index 530a3b76d301..c5305587a029 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''bordeaux-threads''; version = ''v0.8.6''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index 71a7a1894a25..5d7f3f2dd10b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''buildnode-xhtml''; version = ''buildnode-20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 26d907c2524c..0a2e56a9c9b8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''buildnode''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index d159ce49581e..6cf810707343 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''caveman''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index c4e3b9b57340..a7d22ac129b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cffi-grovel''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index db85c50a5c1e..3d2463806073 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cffi-toolchain''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 08115ea3a3ab..b83b14611978 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cffi''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c9700a9d0091..c30c68e53c8d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''chipz''; version = ''20190202-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 365ae1d6ef65..41520bf41fb2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''chunga''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index ea812b38c954..2e387d29833f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''circular-streams''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 9ffc4c0d39ef..531d429df244 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-aa''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index 5dab19a55319..5f93167a1141 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-annot''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index 8459e32fd045..a413743eb8d5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-anonfun''; version = ''20111203-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 1e61d4e48e75..9b053c920e32 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-ansi-text''; version = ''20150804-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index e366dc551d60..d84233c43424 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-async-repl''; version = ''cl-async-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index d18c95153ff5..c13b8b70647d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-async-ssl''; version = ''cl-async-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index 876a24055c21..363227534a8b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-async''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index 8aa43a81f190..a4a9a9261fd6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-base64''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix index aed744e04338..36641b73b750 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-cli''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 9b69bf886c0e..0d0337a65cec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-colors''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index 62f895b20279..a3aacd0aa8bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-cookie''; version = ''20150804-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 82b63ca088dd..1f20b17672d7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,9 +1,9 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-csv''; version = ''20180831-git''; - parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; + parasites = [ "cl-csv/test" ]; description = ''Facilities for reading and writing CSV format files''; @@ -34,4 +34,4 @@ args @ { fetchurl, ... }: (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate lisp-unit2 named-readtables) VERSION 20180831-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES - (cl-csv/speed-test cl-csv/test)) */ + (cl-csv/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index f495d7b4c82a..9c2580210085 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-dbi''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index d6fb845aa386..1510495a4cbc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-emb''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index f92d9c464cf4..d032b4768dd6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-fad''; version = ''20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 399abebe6e70..6a40d0fa8c92 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-fuse-meta-fs''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index b0e6159e6262..de71e2e299ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-fuse''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix new file mode 100644 index 000000000000..72eafacb1902 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-hooks''; + version = ''architecture.hooks-20181210-git''; + + parasites = [ "cl-hooks/test" ]; + + description = ''This system provides the hooks extension point +mechanism (as known, e.g., from GNU Emacs).''; + + deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz''; + sha256 = ''04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns''; + }; + + packageName = "cl-hooks"; + + asdFilesToKeep = ["cl-hooks.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-hooks DESCRIPTION This system provides the hooks extension point +mechanism (as known, e.g., from GNU Emacs). + SHA256 04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns URL + http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz + MD5 698bdb1309cae19fb8f0e1e425ba4cd9 NAME cl-hooks FILENAME cl-hooks DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) + (NAME let-plus FILENAME let-plus) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria anaphora closer-mop fiveam let-plus trivial-garbage) VERSION + architecture.hooks-20181210-git SIBLINGS NIL PARASITES (cl-hooks/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 365360ba896b..61a35f2b58c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-html-parse''; version = ''20161031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index 7f20a171734a..dde2cc31dd05 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-html5-parser''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index feefecf75bbb..b0be8c775a37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-interpol''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix index 66fb98ee0dec..713aff0ea405 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-jpeg''; version = ''20170630-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index 9faf2b1b3888..d8bc535f3559 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-json''; version = ''20141217-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index 0c276740f90a..dfabda0428f0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index 1a13df679283..f37e653bc564 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-l10n''; version = ''20161204-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index cbbc8ccb0b21..36d15673427c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-libuv''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index 7b5b7fb3e1ab..b1916c27bfdd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-markup''; version = ''20131003-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index c8460177a244..1590f2536e34 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-mysql''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index c096c4d2728b..cfca59e3b503 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-paths-ttf''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index 0f0a22c97e0e..e8034b11c237 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-paths''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix index d54c37c2de1c..babdf04e3ec2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-pdf''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 952a4394ae79..efd8197bbfb9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,13 +1,13 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-postgres''; version = ''postmodern-20190521-git''; - parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; + parasites = [ "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; + deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz''; @@ -25,9 +25,8 @@ args @ { fetchurl, ... }: MD5 102567f386757cd52aca500c0c348d90 NAME cl-postgres FILENAME cl-postgres DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) - (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) - DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) - VERSION postmodern-20190521-git SIBLINGS (postmodern s-sql simple-date) - PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ + DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION + postmodern-20190521-git SIBLINGS (postmodern s-sql simple-date) PARASITES + (cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index c10a1500563b..4c97f03870fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-ppcre-template''; version = ''cl-unification-20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 20433b51f877..27887f12497e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-ppcre-unicode''; version = ''cl-ppcre-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index cfea494fc4bd..8bb8fb2478d8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-ppcre''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix new file mode 100644 index 000000000000..46805421fa7c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix @@ -0,0 +1,27 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-prevalence''; + version = ''20190521-git''; + + description = ''Common Lisp Prevalence Package''; + + deps = [ args."s-sysdeps" args."s-xml" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-prevalence/2019-05-21/cl-prevalence-20190521-git.tgz''; + sha256 = ''16j7ccpjdidz1p6mgib06viy966ckxzgkd6xcvg96xmr4hkksljf''; + }; + + packageName = "cl-prevalence"; + + asdFilesToKeep = ["cl-prevalence.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-prevalence DESCRIPTION Common Lisp Prevalence Package SHA256 + 16j7ccpjdidz1p6mgib06viy966ckxzgkd6xcvg96xmr4hkksljf URL + http://beta.quicklisp.org/archive/cl-prevalence/2019-05-21/cl-prevalence-20190521-git.tgz + MD5 6c81a4fe41bd63eef9ff8f4cc41aa6b9 NAME cl-prevalence FILENAME + cl-prevalence DEPS + ((NAME s-sysdeps FILENAME s-sysdeps) (NAME s-xml FILENAME s-xml)) + DEPENDENCIES (s-sysdeps s-xml) VERSION 20190521-git SIBLINGS + (cl-prevalence-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 1e13378b38c4..496a0bd4e567 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-project''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 81f1455714d9..046f910a8660 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-protobufs''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index c16486754db3..916af5b29727 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-reexport''; version = ''20150709-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 16cc2309e645..0d58e11b4d26 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-smtp''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index b639681fd306..2aff988dfd24 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-store''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index 4639a66da78f..add200b09a1d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-syntax-annot''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index cea65514d4b1..c19a47df6c23 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-syntax-anonfun''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index fa08d3b114ce..cded8dc2d06d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-syntax-markup''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index 2715cfdf8dac..353c8210885e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-syntax''; version = ''20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 81b9153fff03..56d9b3632688 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-test-more''; version = ''prove-20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 38237f6f3b7b..358666877a6d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-typesetting''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 77e2ba0036ce..7849acb57c0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-unicode''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index bb8a05b0d6d1..dbdd53a93469 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-unification''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 4ccd82f2ccc7..ba8be7927f04 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-utilities''; version = ''1.2.4''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index dbdd6d6b617c..f44bd0f22e0c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-vectors''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 19af99826fce..3be45384d418 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-who''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 5294613b9789..f344dbfa2fe8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl_plus_ssl''; version = ''cl+ssl-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 4b0a4cd176d8..6cfd7842409c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clack-handler-hunchentoot''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 4dcda09baeac..da7f15e03c17 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clack-socket''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index d8c8acf83aa6..1792d79f1d89 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clack-test''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 8f2a19519ac1..6162f8ffe10c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clack-v1-compat''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index ab615e5dc83f..1813844e85fd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clack''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index abbefea70b48..ca03207fabd8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''closer-mop''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index 3448f70f5adb..c1b36b6b653c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''closure-common''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index 7df1e251ece9..7d9d8730f293 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''closure-html''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index 8f6760b96247..9f4abb8e4756 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clsql-postgresql-socket''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index e90cda0f6d93..add3a15d27c7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clsql-postgresql''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index 254a22fbafa5..653adb3d12b3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clsql-sqlite3''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index c664c23dd1c5..8243a3375853 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clsql-uffi''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index e37eecabbca9..74b8442c0c90 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clsql''; version = ''20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 458cb51e6adf..2f07706a9129 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clss''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix index ba45b3530573..303d43a964ee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clx-truetype''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 0fe6e115f3f2..6b99f99b7ab8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''clx''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix index 0a4a40b06841..7375b8dd7094 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''collectors''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index 25eaf1fa6fa9..1d81acba2dc6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''command-line-arguments''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index c1c209093d0a..38ea5aa106ce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''css-lite''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index a0a6d2d7c2ec..98c565648dcb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''css-selectors-simple-tree''; version = ''css-selectors-20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index 1aff3a5826cb..fcdb69f3c351 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''css-selectors-stp''; version = ''css-selectors-20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index 268eea723ddf..aa523d6f838b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''css-selectors''; version = ''20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 9bef7fb990c5..ebae32962f10 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cxml-stp''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 667cf93d44f9..68a019fa027d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cxml''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 9d0f2549f50b..173a31e9f31d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''dbd-mysql''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 9f3046eb51ff..6668cd4f762b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''dbd-postgres''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 7bc556eaff20..9b6fde0ea94b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''dbd-sqlite3''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 2e4006dbf3f4..26c5306c06a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''dbi''; version = ''cl-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 5a84a62ee835..4d5bc0a22175 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''dexador''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 2896ec154ecd..3dbacdf0f81a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''do-urlencode''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index a4196b2d394f..7c25ed9a0377 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''documentation-utils''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index a3d063ec9bd9..aa97f8f7cbe3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''drakma''; version = ''v2.0.5''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix index e94ed40f9e1c..d68fd839bd16 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''esrap-peg''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 3ab6e03ab659..a024ad3907a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''esrap''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index adecbd142d37..4fd752342530 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''external-program''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index 8d43fa3362cc..82c8603d4a45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''fast-http''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index ea006556876e..89bed83acd54 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''fast-io''; version = ''20171023-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 8b5fe1f7de6c..39f2af5430fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''fiasco''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index 8ebd9f603816..be9648a0da4a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''fiveam''; version = ''v1.4.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 4d5524d9d18d..d9b25bebddc3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''flexi-streams''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index a5fe52ec0277..90ce8b83dde6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''form-fiddle''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index 893cec1c72ad..d901df215a68 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''fset''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 775e30e711a9..3754829ac37b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''http-body''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 6fc92c088822..1f2700608e37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''hu_dot_dwim_dot_asdf''; version = ''20190521-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index 98a77dad63cd..51f4a2d06980 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''hu_dot_dwim_dot_stefil''; version = ''20170403-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 11d0831c96fc..e822fb487150 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,16 +1,16 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''hunchentoot''; version = ''v1.2.38''; - parasites = [ "hunchentoot-dev" "hunchentoot-test" ]; + parasites = [ "hunchentoot-test" ]; description = ''Hunchentoot is a HTTP server based on USOCKET and BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a simple framework for user-defined handlers and can be extended through subclassing.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; @@ -36,18 +36,18 @@ args @ { fetchurl, ... }: (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp) - (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams) - (NAME md5 FILENAME md5) (NAME rfc2388 FILENAME rfc2388) - (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) + (NAME cl-who FILENAME cl-who) (NAME drakma FILENAME drakma) + (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5) + (NAME rfc2388 FILENAME rfc2388) + (NAME split-sequence FILENAME split-sequence) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME trivial-features FILENAME trivial-features) (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket) (NAME xpath FILENAME xpath)) + (NAME usocket FILENAME usocket)) DEPENDENCIES (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad - cl-ppcre cl-who cxml-stp drakma flexi-streams md5 rfc2388 split-sequence - swank trivial-backtrace trivial-features trivial-garbage - trivial-gray-streams usocket xpath) - VERSION v1.2.38 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ + cl-ppcre cl-who drakma flexi-streams md5 rfc2388 split-sequence + trivial-backtrace trivial-features trivial-garbage trivial-gray-streams + usocket) + VERSION v1.2.38 SIBLINGS NIL PARASITES (hunchentoot-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index 9dfeb3f12062..1b948bcf325e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''idna''; version = ''20120107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 675521dcde94..4211dfbc9194 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''ieee-floats''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index bd0e896e1434..c4ae44cd6761 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''iolib''; version = ''v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index d5e072e5f6a8..195b52c08c45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''iolib_dot_asdf''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index 445da3b1b179..aa650edde020 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''iolib_dot_base''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index 415e7a598202..c0ec72d48695 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''iolib_dot_common-lisp''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 58fd95012e82..4ba0cfa1ce2e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''iolib_dot_conf''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index 009e0e278660..7a1a12243fe2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''iolib_dot_grovel''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 727be89bf446..2c56b5964f97 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''ironclad''; version = ''v0.46''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index 9a91033bb8be..f276ec72736d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''iterate''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 790638f5954c..702eb2d05b55 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''jonathan''; version = ''20190202-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index 88ededf0e73b..e44004a9cf7e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''kmrcl''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index c94277bb2114..e4b89c382dc3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lack-component''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 3fc76c73576a..0d50e58ff55d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lack-middleware-backtrace''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 221ac216cf83..cadf617bbdf0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lack-util''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 7740e73c0e5b..08095979989b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lack''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index 91e28f402b23..1f6a0709b0f4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''let-plus''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 8d52d518e113..9dd6baad1bdc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lev''; version = ''20150505-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix index 6ff0fdb4c829..10977c16f838 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lfarm-client''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix index 4be971bef065..4a5fe87982ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lfarm-common''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix index 44c8cc01c95f..354d6c315076 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lfarm-server''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix index 3d917ff2817f..348c71fe9663 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lfarm-ssl''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index 84f0ca863ec1..1edb65596a6c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lift''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 802b9eb2b7a9..7f88beb974b0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lisp-namespace''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index c623d368a043..8d21f88cbf82 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lisp-unit2''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 4695c3dfe0e7..5ffa27fcca53 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''local-time''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix index a4011b78d4f4..1a6f217a2f96 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lparallel''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index 5dbd186e62e7..f64e9ee6a330 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''lquery''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index c6445010f544..8187c99f94a4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''map-set''; version = ''20190307-hg''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 531cc1adc1af..4f6842606b45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''marshal''; version = ''cl-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index b34fdd83ca38..953dd0a58a4a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''md5''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index cf2c3a1c777b..d72e0839d1e8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''metabang-bind''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 13d0b971d44b..16609db5c22c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''misc-extensions''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index f1fe0e3c2791..a8cfc070bf99 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''mt19937''; version = ''1.1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 16b1f22ceebb..068d0eba69dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''myway''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index c5f1379f421f..82d06b1c93b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''named-readtables''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index dcc49aa79937..4e7c84566a0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''net_dot_didierverna_dot_asdf-flv''; version = ''asdf-flv-version-2.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index 0a3dba6b8243..ea6adac9e9f8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''nibbles''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index b5b6ace2ae94..07b86f58fe7c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''optima''; version = ''20150709-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index 2bf306507858..bf6216dcaddc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''parenscript''; version = ''Parenscript-2.7.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index 72bef6f60bf2..e636df0805e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''parse-number''; version = ''v1.7''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index 0c34654b1ae3..fe9ccae2886a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''pcall-queue''; version = ''pcall-0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index c041d1778fac..99e9517e50e4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''pcall''; version = ''0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 53af356f05ac..8757c704c8f4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''plump''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index 3afcbf98d505..8ffcbc784ff7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''proc-parse''; version = ''20160318-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index 92ac9e33d499..065c81e11a68 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''prove''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index b4957d68e883..ffa2e595c26a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''ptester''; version = ''20160929-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index 84b252f93a51..4f6946783939 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''puri''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index dbeb5f1d08e0..3666dda9bf87 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''query-fs''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index fed624578912..f6022cb2a1f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''quri''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index e6c1477298d4..25d535176a6a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''rfc2388''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index 14b327a97364..d5be4be7daf4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''rt''; version = ''20101006-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix new file mode 100644 index 000000000000..1c28ec6e2afd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''s-sysdeps''; + version = ''20130128-git''; + + description = ''An abstraction layer over platform dependent functionality''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/s-sysdeps/2013-01-28/s-sysdeps-20130128-git.tgz''; + sha256 = ''048q0mzypnm284bvv7036d4z7bv7rdcqks5l372s74kq279l2y00''; + }; + + packageName = "s-sysdeps"; + + asdFilesToKeep = ["s-sysdeps.asd"]; + overrides = x: x; +} +/* (SYSTEM s-sysdeps DESCRIPTION + An abstraction layer over platform dependent functionality SHA256 + 048q0mzypnm284bvv7036d4z7bv7rdcqks5l372s74kq279l2y00 URL + http://beta.quicklisp.org/archive/s-sysdeps/2013-01-28/s-sysdeps-20130128-git.tgz + MD5 2fe61fadafd62ef9597e17b4783889ef NAME s-sysdeps FILENAME s-sysdeps DEPS + NIL DEPENDENCIES NIL VERSION 20130128-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix new file mode 100644 index 000000000000..ec12dde52231 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix @@ -0,0 +1,27 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''s-xml''; + version = ''20150608-git''; + + parasites = [ "s-xml.examples" "s-xml.test" ]; + + description = ''Simple Common Lisp XML Parser''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz''; + sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq''; + }; + + packageName = "s-xml"; + + asdFilesToKeep = ["s-xml.asd"]; + overrides = x: x; +} +/* (SYSTEM s-xml DESCRIPTION Simple Common Lisp XML Parser SHA256 + 0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq URL + http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz + MD5 9c31c80f0661777c493fab683f776716 NAME s-xml FILENAME s-xml DEPS NIL + DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL PARASITES + (s-xml.examples s-xml.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 26c616ec3922..9056cfbdcca8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''salza2''; version = ''2.0.9''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 7b5f33e7bc22..9f125cfd52a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''simple-date''; version = ''postmodern-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index a6fc781c3698..63adab55741b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''smart-buffer''; version = ''20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index be9f59986428..a22076facd39 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''split-sequence''; version = ''v2.0.0''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index cd018a4b9975..57dec7c93cac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''sqlite''; version = ''cl-20130615-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 0386a674916b..1cd4e4c44027 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''static-vectors''; version = ''v1.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index 7c769e614c14..df63a5c9836a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''stefil''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 2b38115aabdd..17a56c09b7e8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''string-case''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index fa0a2ab7944d..e89eb1971d60 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''stumpwm''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index ec14ffffcba1..50b815425dc6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''swank''; version = ''slime-v2.24''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index 89003686df38..f0df3b84f153 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''swap-bytes''; version = ''v1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix index 9ec472fa08a1..4bae3cc1ceed 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''symbol-munger''; version = ''20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index d10b68b2d2ed..683f87357f56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-backtrace''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 8db7c603ec88..82d0e4513ab1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-features''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index 4d26aa435193..c629bb3548d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-garbage''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 7826a9379924..2aee236ac0ca 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-gray-streams''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 002c75e10212..33eedbaa8184 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-indent''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 960778dc17c1..f02d9e0dc2c7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-mimes''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 6bfaac06f2dd..8cc04c2c64ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-types''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index b4282ec33ce1..00a484f11bfd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''trivial-utf-8''; version = ''20111001-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index f5e8677f508f..1986f7c88f7a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''uffi''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index ae9c1c6d5ac7..18f1b74edbd3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''uiop''; version = ''3.3.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6a877e5a9646..6c4564967320 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''unit-test''; version = ''20120520-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index fccce79eb84d..c3928cf0e4cc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''usocket''; version = ''0.8.2''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 2fb1cdacfac2..6a4751f799ea 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''vom''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 7825678c77c5..59a41a7cf9ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''woo''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 93bcb2072a7b..f717441068b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''wookie''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index db03e57a663b..9854567fd5bf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''xembed''; version = ''clx-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix index 71cd9cfbde6b..4bfc0678f0f1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''xkeyboard''; version = ''clx-20120811-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index a9a1cfc7ec02..c02e6e248186 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,13 +1,13 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''xmls''; version = ''3.0.2''; - parasites = [ "xmls/octets" "xmls/test" "xmls/unit-test" ]; + parasites = [ "xmls/test" "xmls/unit-test" ]; description = ''System lacks description''; - deps = [ args."cl-ppcre" args."fiveam" args."flexi-streams" ]; + deps = [ args."fiveam" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz''; @@ -23,7 +23,5 @@ args @ { fetchurl, ... }: 1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5 2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) (NAME fiveam FILENAME fiveam) - (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre fiveam flexi-streams) VERSION 3.0.2 SIBLINGS NIL - PARASITES (xmls/octets xmls/test xmls/unit-test)) */ + ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION 3.0.2 + SIBLINGS NIL PARASITES (xmls/test xmls/unit-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index e2a5494c5b4b..3e14a5ba9f06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''xpath''; version = ''plexippus-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index 92f661f85310..b9ab71744c3a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''xsubseq''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index cf8f3a8ac0fd..c7031f4aa3fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''yacc''; version = ''cl-20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index ca74dd0e5007..e14a540a1783 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''yason''; version = ''v0.7.6''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 3aa695caed6f..74e5d7e97e95 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''zpb-ttf''; version = ''1.0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index a4dee0bce573..ce73d3baec46 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -1,3 +1,4 @@ +cl-prevalence 3bmd alexandria array-utils @@ -26,6 +27,7 @@ cl-dbi cl-emb cl-fuse cl-fuse-meta-fs +cl-hooks cl-html-parse cl-html5-parser cl-jpeg diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index d430f72353a1..db725d415c51 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,9 +6,6 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; - - "xpath_slash_test" = quicklisp-to-nix-packages."xpath"; @@ -255,7 +252,6 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -949,6 +945,22 @@ let quicklisp-to-nix-packages = rec { })); + "s-xml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."s-xml" or (x: {})) + (import ./quicklisp-to-nix-output/s-xml.nix { + inherit fetchurl; + })); + + + "s-sysdeps" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."s-sysdeps" or (x: {})) + (import ./quicklisp-to-nix-output/s-sysdeps.nix { + inherit fetchurl; + })); + + "yason" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."yason" or (x: {})) @@ -972,9 +984,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."xmls" or (x: {})) (import ./quicklisp-to-nix-output/xmls.nix { inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "fiveam" = quicklisp-to-nix-packages."fiveam"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; })); @@ -1643,19 +1653,16 @@ let quicklisp-to-nix-packages = rec { "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-who" = quicklisp-to-nix-packages."cl-who"; - "cxml-stp" = quicklisp-to-nix-packages."cxml-stp"; "drakma" = quicklisp-to-nix-packages."drakma"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "md5" = quicklisp-to-nix-packages."md5"; "rfc2388" = quicklisp-to-nix-packages."rfc2388"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "swank" = quicklisp-to-nix-packages."swank"; "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "usocket" = quicklisp-to-nix-packages."usocket"; - "xpath" = quicklisp-to-nix-packages."xpath"; })); @@ -2558,6 +2565,20 @@ let quicklisp-to-nix-packages = rec { })); + "cl-hooks" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-hooks" or (x: {})) + (import ./quicklisp-to-nix-output/cl-hooks.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + "cl-fuse-meta-fs" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-fuse-meta-fs" or (x: {})) @@ -2991,6 +3012,16 @@ let quicklisp-to-nix-packages = rec { })); + "cl-prevalence" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-prevalence" or (x: {})) + (import ./quicklisp-to-nix-output/cl-prevalence.nix { + inherit fetchurl; + "s-sysdeps" = quicklisp-to-nix-packages."s-sysdeps"; + "s-xml" = quicklisp-to-nix-packages."s-xml"; + })); + + }; in quicklisp-to-nix-packages diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 5adc23979393..13ec209142b9 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -810,6 +810,25 @@ luacheck = buildLuarocksPackage { }; }; }; +luacov = buildLuarocksPackage { + pname = "luacov"; + version = "0.13.0-1"; + + src = fetchurl { + url = mirror://luarocks/luacov-0.13.0-1.src.rock; + sha256 = "16am0adzr4y64n94f64d4yrz65in8rwa8mmjz1p0k8afm5p5759i"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://keplerproject.github.io/luacov/"; + description = "Coverage analysis tool for Lua scripts"; + license = { + fullName = "MIT"; + }; + }; +}; luadbi = buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index defeb3e1682e..521df45b1c4c 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -1,7 +1,7 @@ [ "@angular/cli" , "@antora/cli" -, "@antora/site-generator-default" +, "@antora/site-generator-default" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" @@ -32,7 +32,6 @@ , "dnschain" , "dockerfile-language-server-nodejs" , "elasticdump" -, "elm-live" , "elm-oracle" , "emoj" , "emojione" diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index d8089bb533f0..f0a98249d6da 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ lib, fetchurl, buildDunePackage +, bigarray-compat, eqaf, stdlib-shims +, alcotest +}: -if !stdenv.lib.versionAtLeast ocaml.version "4.3" -then throw "digestif is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-digestif-${version}"; - version = "0.5"; +buildDunePackage rec { + pname = "digestif"; + version = "0.8.0"; src = fetchurl { - url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz"; - sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd"; + url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz"; + sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = lib.optional doCheck alcotest; + propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; - inherit (topkg) buildPhase installPhase; + doCheck = true; meta = { description = "Simple hash algorithms in OCaml"; homepage = "https://github.com/mirage/digestif"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix new file mode 100644 index 000000000000..966fe30197d0 --- /dev/null +++ b/pkgs/development/ocaml-modules/eqaf/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + minimumOCamlVersion = "4.03"; + pname = "eqaf"; + version = "0.5"; + + src = fetchurl { + url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz"; + sha256 = "1wkkmw8q2ml7ifpg0g06y0sclq0zvjf6dpsi36dnci7f230q3vsq"; + }; + + meta = { + description = "Constant time equal function to avoid timing attacks in OCaml"; + homepage = "https://github.com/mirage/eqaf"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix index d6ff17211994..e5c7937b27a4 100644 --- a/pkgs/development/ocaml-modules/lru/default.nix +++ b/pkgs/development/ocaml-modules/lru/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, psq }: +{ lib, fetchurl, buildDunePackage, psq }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-lru-${version}"; - version = "0.2.0"; +buildDunePackage rec { + pname = "lru"; + version = "0.3.0"; src = fetchurl { - url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz"; - sha256 = "0bd7js9rrma1fjjjjc3fgr9l5fjbhgihx2nsaf96g2b35iiaimd0"; + url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-v${version}.tbz"; + sha256 = "1ab9rd7cq15ml8x0wjl44wy99h5z7x4g9vkkz4i2d7n84ghy7vw4"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; - propagatedBuildInputs = [ psq ]; - inherit (topkg) buildPhase installPhase; - meta = { homepage = "https://github.com/pqwy/lru"; description = "Scalable LRU caches for OCaml"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.isc; - inherit (ocaml.meta) platforms; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.isc; }; } diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix index 08b9c10d9821..ff9c52c50a76 100644 --- a/pkgs/development/ocaml-modules/psq/default.nix +++ b/pkgs/development/ocaml-modules/psq/default.nix @@ -1,27 +1,21 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ lib, buildDunePackage, fetchurl, seq }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "psq is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-psq-${version}"; - version = "0.1.0"; +buildDunePackage rec { + minimumOCamlVersion = "4.03"; + pname = "psq"; + version = "0.2.0"; src = fetchurl { - url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz"; - sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp"; + url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-v${version}.tbz"; + sha256 = "1j4lqkq17rskhgcrpgr4n1m1a2b1x35mlxj6f9g05rhpmgvgvknk"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; - - inherit (topkg) buildPhase installPhase; + propagatedBuildInputs = [ seq ]; meta = { description = "Functional Priority Search Queues for OCaml"; homepage = "https://github.com/pqwy/psq"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.isc; - inherit (ocaml.meta) platforms; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.isc; }; } diff --git a/pkgs/development/perl-modules/Device-OUI-1.04-hash.patch b/pkgs/development/perl-modules/Device-OUI-1.04-hash.patch new file mode 100644 index 000000000000..6133ab674756 --- /dev/null +++ b/pkgs/development/perl-modules/Device-OUI-1.04-hash.patch @@ -0,0 +1,11 @@ +--- Device-OUI-1.04/lib/Device/OUI.pm.orig 2009-03-07 02:23:17.000000000 +0000 ++++ Device-OUI-1.04/lib/Device/OUI.pm 2016-08-09 08:19:00.642799675 +0100 +@@ -54,7 +54,7 @@ + for my $x ( keys %hash ) { + if ( not defined $hash{ $x } ) { $hash{ $x } = '' } + } +- return $handle->{ $oui } = join( "\0", %hash ); ++ return $handle->{ $oui } = join( "\0", map {$_,$hash{$_}} sort keys %hash ); + } elsif ( my $x = $handle->{ $oui } ) { + return { split( "\0", $x ) }; + } diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix new file mode 100644 index 000000000000..9e64d2f65ffe --- /dev/null +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +# propagatedBuildInputs +, aiohttp +# buildInputs +, pytest +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "aresponses"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "d1d6ef52b9a97142d106688cf9b112602ef3dc66f6368de8f91f47241d8cfc9c"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + buildInputs = [ + pytest + pytest-asyncio + ]; + + # tests only distributed via git repository, not pypi + doCheck = false; + + meta = with lib; { + description = "Asyncio testing server"; + homepage = "https://github.com/circleup/aresponses"; + license = licenses.mit; + maintainers = [ maintainers.makefu ]; + }; +} diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index bf7c35fa6989..68dc9339ce4c 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autograd"; - version = "1.2"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "0zd4lhz9dpll4i63jjijbzkzbgmg8h88il7lr7kmcylvadnzm2x0"; + sha256 = "1i1ylf03b7220n8znk63zg6sgdd3py9wlh1pvqvy03g1fxsi8pd1"; }; propagatedBuildInputs = [ numpy future ]; diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 019d5bdc1e03..fcdd36fcc23a 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.42.0"; + version = "0.43.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn"; + sha256 = "0yqxk2zr1ibm2vycyq4vy9hy0xhznma5x3kjl6qxhmb4kyyyljkh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 003f996d29a2..c8245a15c7f0 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "babelfish"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; }; + propagatedBuildInputs = [ setuptools ]; + meta = with stdenv.lib; { homepage = https://pypi.python.org/pypi/babelfish; description = "A module to work with countries and languages"; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 9e4f4072bf6a..8d992f71f33a 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.2.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "04bsnyhldcvscdj0dg3hm5k27vmhfi9k6bwz963sd3q2h7g9k6kg"; + sha256 = "1nn8z7ggjj04v97jm33dxh2cv2azy4xi1hwkj9qwbbc68vasc3cp"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 234bb46f97bc..dae3e032a39a 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "5.1.1"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "2eadddde670f5c5f6cf88638a0ac4e5d5fe181292a31063275fa56c7bf22426b"; + sha256 = "067bgkgx7i3kw31vaviwysbb1lk91cjw9q90vklsr7nsygjxi0fa"; }; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 1d2d34541fa6..697ea742adae 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,17 +1,14 @@ -{ buildPythonPackage -, lib -, fetchFromGitHub -}: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - version = "1.1.8"; + version = "1.3.0"; pname = "elementpath"; src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "0krczvf8r6pb3hb8qaxl9h2b4qwg180xk66gyxjf002im7ri75aj"; + sha256 = "0ahqqqpcf3fd6xcdhiwwscincyj6h5xyjaacnqxwph1y1b8mnzyw"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index de313dc1c7d6..7436626fc744 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "1j665fpkyfib17z0hn3bg2j96pbkgd36yfif6jyia4yn6g76hlfg"; + sha256 = "0bdgphw43m2nrgcp83j1pnxknnzahm2zmdr55hyz3jjkva7m6dpk"; }; checkInputs = [ pytest Rtree ]; diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index 4e14b14c2aa1..a04bf6250e9e 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, google_api_python_client, simplejson, oauth2client +, google_api_python_client, simplejson, oauth2client, setuptools }: buildPythonPackage rec { @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg"; }; - propagatedBuildInputs = [ google_api_python_client simplejson oauth2client ]; + propagatedBuildInputs = [ + google_api_python_client simplejson oauth2client setuptools + ]; meta = with stdenv.lib; { description = "Search your google contacts from the command-line or mutt"; diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 8d8e2c506894..fdc6f4e59cc5 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "1skqq36k1dm7mngfg9c93pb1rdvmbapc0cv8zj00hnm63r67hmrj"; + sha256 = "1x18yqxa6a884j0ip92kgl5s8c77z6f4pvnq6q4lzisyffkyq6c7"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index eb10edeaca9b..8110a646bc4b 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "2.4"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "135rwh7izzmj4lwkrfb9xw4ik0gcwjz34ygnmx3vyvki2xbbp2xp"; + sha256 = "08ppzz4my7dbs5bsdv3r1yn8bx8ijqmk5hjfdblrzrxhj184v4bs"; }; doCheck = false; # something about yajl diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 8fb6259c5749..caef384d2796 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.5.9"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "54a5eab895d89f342b52ba2bffe70930ef9f8d96e398cccf530d21fa0516a873"; + sha256 = "0p7ab7jx3wgg7xdj2q8yk99cz3xv2a5p1r8q9kfylnvqn34cr1g2"; }; meta = { diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index db48bb06bc0f..a09463a76d35 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "1.0.7"; + version = "1.2.0"; pname = "pyannotate"; src = fetchPypi { inherit pname version; - sha256 = "54e6035a8601248992e17734034e6555842c6ea9863f90c15d14fe76a184be07"; + sha256 = "16bm0mf7wxvy0lgmcs1p8n1ji8pnvj1jvj8zk3am70dkp825iv84"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix new file mode 100644 index 000000000000..73de6ba08394 --- /dev/null +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +# propagatedBuildInputs +, aiohttp +, async-timeout +# buildInputs +, pytestrunner +# checkInputs +, pytest +, pytest-asyncio +, aresponses +}: +buildPythonPackage rec { + pname = "pyhaversion"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d4smpzlaw0sqfgkgvhxsn8h7bmwj8h9gj98sdzvkzhp5vhd96b2"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + buildInputs = [ + pytestrunner + ]; + + checkInputs = [ + pytest + pytest-asyncio + aresponses + ]; + + meta = with lib; { + description = "A python module to the newest version number of Home Assistant"; + homepage = https://github.com/ludeeus/pyhaversion; + maintainers = [ maintainers.makefu ]; + }; +} diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 7b1b4f7c36f3..f55d2285d03d 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchPypi, python, buildPythonPackage , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }: +with stdenv.lib; + buildPythonPackage rec { version = "3.5.2"; pname = "tables"; @@ -15,12 +17,12 @@ buildPythonPackage rec { # The setup script complains about missing run-paths, but they are # actually set. - setupPyBuildFlags = - [ "--hdf5=${hdf5}" - "--lzo=${lzo}" - "--bzip2=${bzip2.dev}" - "--blosc=${c-blosc}" - ]; + setupPyBuildFlags = [ + "--hdf5=${getDev hdf5}" + "--lzo=${getDev lzo}" + "--bzip2=${getDev bzip2}" + "--blosc=${getDev c-blosc}" + ]; # Run the test suite. # It requires the build path to be in the python search path. diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index c021bde60cd8..bd5f9eb40b88 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "1.0.13"; + version = "1.0.15"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "182439gqhlxhr9rdi9ak33z4ffy1w9syhykkckkl6mq050c80qdr"; + sha256 = "1s8ggvy2s7513cxcal3r37rn1bhpkxhq3hs5m9pgvmrysxjdz8lb"; }; propagatedBuildInputs = [ elementpath ]; @@ -25,6 +25,7 @@ buildPythonPackage rec { --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #" pytest . \ --ignore=xmlschema/tests/test_factory.py \ + --ignore=xmlschema/tests/test_memory.py \ --ignore=xmlschema/tests/test_validators.py \ --ignore=xmlschema/tests/test_schemas.py \ -k 'not element_tree_import_script' diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index da9ec8dc2d97..993a59baf9f0 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.1"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "1rhrqrlq4n3vgqd1fv1dcc5ga5dzy9qbd40p8rsqqhh5klxg48gy"; + sha256 = "1wgx83lpf8rq95784afj5y9jfcrs1mf6k3pjfyp4a9zigz1zhnkb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix deleted file mode 100644 index 334d09622530..000000000000 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, makeWrapper, which, coreutils -# Always assume all markers valid (don't redownload dependencies). -# Also, don't clean up environment variables. -, enableNixHacks ? false -}: - -stdenv.mkDerivation rec { - - version = "0.4.5"; - - meta = with stdenv.lib; { - homepage = https://github.com/bazelbuild/bazel/; - description = "Build tool that builds code quickly and reliably"; - license = licenses.asl20; - maintainers = with maintainers; [ cstrahan philandstuff ]; - platforms = platforms.linux; - broken = true; # 2018-08-07 - }; - - pname = "bazel"; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb"; - }; - - preUnpack = '' - mkdir bazel - cd bazel - ''; - sourceRoot = "."; - - patches = lib.optional enableNixHacks ./nix-hacks-0.4.patch; - - postPatch = '' - for f in $(grep -l -r '/bin/bash'); do - substituteInPlace "$f" --replace '/bin/bash' '${bash}/bin/bash' - done - for f in $(grep -l -r '/usr/bin/env'); do - substituteInPlace "$f" --replace '/usr/bin/env' '${coreutils}/bin/env' - done - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's,/usr/bin/xcrun clang,clang,g' \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - src/tools/xcode/xcrunwrapper/xcrunwrapper.sh - sed -i 's,/usr/bin/xcrun "''${TOOLNAME}","''${TOOLNAME}",g' \ - src/tools/xcode/xcrunwrapper/xcrunwrapper.sh - sed -i 's/"xcrun", "clang"/"clang"/g' tools/osx/xcode_configure.bzl - ''; - - buildInputs = [ - jdk - zip - unzip - makeWrapper - which - ]; - - # These must be propagated since the dependency is hidden in a compressed - # archive. - - propagatedBuildInputs = [ - bash - ]; - - buildPhase = '' - export TMPDIR=/tmp/.bazel-$UID - ./compile.sh - ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone - cp bazel-bin/scripts/bazel-complete.bash output/ - ''; - - # Build the CPP and Java examples to verify that Bazel works. - - doCheck = true; - checkPhase = '' - export TEST_TMPDIR=$(pwd) - ./output/bazel test --test_output=errors \ - examples/cpp:hello-success_test \ - examples/java-native/src/test/java/com/example/myproject:hello - ''; - - # Bazel expects gcc and java to be in the path. - - installPhase = '' - mkdir -p $out/bin - mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin" - mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions - mv output/bazel-complete.bash $out/share/bash-completion/completions/ - cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ - ''; - - dontStrip = true; - dontPatchELF = true; -} diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch deleted file mode 100644 index 563fe635e6b0..000000000000 --- a/pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -index eafa09fb5..d2d5e40e8 100644 ---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction { - markerData.put(key, value); - } - } -- boolean result = false; -- if (markerRuleKey.equals(ruleKey)) { -- result = handler.verifyMarkerData(rule, markerData, env); -- if (env.valuesMissing()) { -- return null; -- } -- } - -- if (result) { -- return new Fingerprint().addString(content).digestAndReset(); -- } else { -- // So that we are in a consistent state if something happens while fetching the repository -- markerPath.delete(); -- return null; -- } -+ return new Fingerprint().addString(content).digestAndReset(); - - } catch (IOException e) { - throw new RepositoryFunctionException(e, Transience.TRANSIENT); -diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java -index a7ebc8f7a..40f2049fa 100644 ---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java -+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java -@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory { - ProcessBuilder builder = new ProcessBuilder(); - builder.command(params.getArgv()); - if (params.getEnv() != null) { -- builder.environment().clear(); - builder.environment().putAll(params.getEnv()); - } - -diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java -index 0268d1b2b..637364657 100644 ---- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java -+++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java -@@ -77,7 +77,6 @@ class Worker { - new ProcessBuilder(command) - .directory(workDir.getPathFile()) - .redirectError(Redirect.appendTo(logFile.getPathFile())); -- processBuilder.environment().clear(); - processBuilder.environment().putAll(workerKey.getEnv()); - - this.process = processBuilder.start(); diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 9c5543cff580..bb2f000f606a 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0vrj9wlw5kf6w7nzhf58dyik0n7rnc9aivjpsz85m299j4wyz37d"; + sha256 = "0v27i8pd9ss53ipi1cs40426mnyppdjgcdjk8nn05bi6rm7a4r7y"; }; patchPhase = '' diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index b3d380b0a0ad..3df5794e3870 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -4,19 +4,19 @@ let libphutil = fetchFromGitHub { owner = "phacility"; repo = "libphutil"; - rev = "3215e4e291ed4468faeed4542d47a571b5bc559a"; - sha256 = "0bbinaxny0j4iniz2grf0s9cysbl3x24yc32f3jra9mwsgh2v2zj"; + rev = "39ed96cd818aae761ec92613a9ba0800824d0ab0"; + sha256 = "1w55avn056kwa4gr25h09b7xhvyp397myrfzlmd1ggx7vj87vw1q"; }; arcanist = fetchFromGitHub { owner = "phacility"; repo = "arcanist"; - rev = "2650e8627a20e1bfe334a4a2b787f44ef5d6ebc5"; - sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4"; + rev = "3cdfe1fff806d2b54a2df631cf90193e518f42b7"; + sha256 = "1dngq8p4y4hln87hhgdm6hv68ld626j57lifw0821rvpnnmspw6j"; }; in stdenv.mkDerivation { pname = "arcanist"; - version = "20180916"; + version = "20190905"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock new file mode 100644 index 000000000000..c66b9e0179ff --- /dev/null +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -0,0 +1,727 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "aho-corasick" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "approx" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "arrayref" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "atty" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "backtrace" +version = "0.3.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "backtrace-sys" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "blake2b_simd" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "byteorder" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "c2-chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cargo-make" +version = "0.22.2" +dependencies = [ + "ci_info 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "envmnt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fern 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "run_script 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rust_info 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cc" +version = "1.0.45" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cgmath" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ci_info" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "envmnt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "clap" +version = "2.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "colored" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "crossbeam-utils" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dirs-sys" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "envmnt" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "failure" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "failure_derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "fern" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "getrandom" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "indexmap" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libc" +version = "0.2.62" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "memchr" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "proc-macro2" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "quote" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_chacha" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "redox_users" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "rgb" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "run_script" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rust-argon2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rust_info" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "rustc-demangle" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "serde" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "serde_derive" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "shell2batch" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "syn" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "synstructure" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread_local" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "toml" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicode-width" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "unicode-xid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "users" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "vec_map" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "wasi" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winconsole" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rgb 0.8.14 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[metadata] +"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" +"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" +"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" +"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" +"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5" +"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" +"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" +"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" +"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +"checksum cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64a4b57c8f4e3a2e9ac07e0f6abc9c24b6fc9e1b54c3478cfb598f3d0023e51c" +"checksum ci_info 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93b085342b4579e6bd92189bb6b832b2fff5564382e2472be42748b630e8063d" +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +"checksum colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cdb90b60f2927f8d76139c72dbde7e10c3a2bc47c8594c9c7a66529f2687c03" +"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" +"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +"checksum envmnt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7760c979bc8a1f3319ee72ee71df5eaaf02ada9daaa80ae257011cab0f3a25ef" +"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +"checksum fern 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "29d26fa0f4d433d1956746e66ec10d6bf4d6c8b93cd39965cceea7f7cc78c7dd" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +"checksum indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a61202fbe46c4a951e9404a720a0180bcf3212c750d735cb5c4ba4dc551299f3" +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" +"checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0" +"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" +"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" +"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" +"checksum rgb 0.8.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2089e4031214d129e201f8c3c8c2fe97cd7322478a0d1cdf78e7029b0042efdb" +"checksum run_script 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "61b3a5ed82e15afc3e238178e2d22113af69ac88bd64a04499f025478853937f" +"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" +"checksum rust_info 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e4e04a5022c08c95c2285b0beb4cdd24c9b20bc018a263d6fdb0372f7a597db" +"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" +"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" +"checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" +"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" +"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" +"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" +"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +"checksum winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef84b96d10db72dd980056666d7f1e7663ce93d82fa33b63e71c966f4cf5032" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 5b73752659bb..1dd2f41d6329 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.22.1"; + version = "0.22.2"; src = let @@ -10,22 +10,18 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1wsams41zl56mkb8671n5fqkkchs68jd9nvfzry8axxiv7n175gc"; - }; - cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/850e9830f4ab4bc65da6eb5cd8b0911970a7739f/cargo-make-Cargo.lock"; - sha256 = "0knmzplxmh8vksmpg56l2p1a10hpqbr9hmbk3hv0aj63125rhhqy"; + sha256 = "17q6lcrn9xwgy20vvv7m3wxnf85k334751iksk89h9l1s2d36bcl"; }; in runCommand "cargo-make-src" {} '' cp -R ${source} $out chmod +w $out - cp ${cargo-lock} $out/Cargo.lock + cp ${./Cargo.lock} $out/Cargo.lock ''; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "18j0nflf997z4nwdxifxp1ji1rbwqbg6zm2256j21am4ak45krsy"; + cargoSha256 = "1mfsjxvyybq9d5702habxq5abcp9h11qx0ci2rqs2rgkbcnksk98"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index a06723fc28c8..65d3006a3b86 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.22"; + version = "2.1.27"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "1n808h4jqxkvpjwmj8jgi4y5is5zvr8vn42mwb3yi13mix32cysa"; + sha256 = "1ajj515ck5n0mzig77xnq1qgb2s4gf6ahgd5mab91406jvij9qf3"; }; - cargoSha256 = "0njaa9vk2i9g1c6sq20b7ls97nl532rfv3is7d8dwz51nrwk6jxs"; + cargoSha256 = "0ki5j5gh59c92a0w43kzljpiamv2jvyk4m2w8qldfyl5kaa40dxb"; buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = rustPlatform.rustcSrc; postInstall = '' - wrapProgram $out/bin/racer --set-default RUST_SRC_PATH $rustcSrc + wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} ''; checkPhase = '' @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { --skip util::test_get_rust_src_path_not_rust_source_tree \ --skip extern --skip completes_pub_fn --skip find_crate_doc \ --skip follows_use_local_package --skip follows_use_for_reexport \ - --skip follows_rand_crate --skip get_completion_in_example_dir + --skip follows_rand_crate --skip get_completion_in_example_dir \ + --skip test_resolve_global_path_in_modules ''; doInstallCheck = true; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index ec0eb08bf238..cce6dd7522cb 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "1c0qz9s09ikgy23yssd57v7b5s005y128sldmq0xd9i1fryp129z"; + sha256 = "13i15banbb1k3h6h2pylbdrcpz7pg17x7dkkq36sian6gqq3c2dx"; }; - cargoSha256 = "0rjm01pnb2w39c0jrscmhhsx9gsi3sl9cxd838m77h9pzwsp1h40"; + cargoSha256 = "1lsv1d99dn6mngaqhd3lw90cr3zg4gq08wi0adxkkhaikc9jjdwh"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 8e617e5e6583..a4e5edd77a4d 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,8 +5,8 @@ let in buildNodejs { inherit enableNpm; - version = "12.10.0"; - sha256 = "1k9hxqs23c3sxpr843ix8nidlca8wn30x0sq998j47wjc1ybh595"; + version = "12.12.0"; + sha256 = "1hcc9arbc6vpzjvf3sd6alm2rc18x3ay2p0i36wz2r4pp9d8gynr"; patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; } diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix new file mode 100644 index 000000000000..d8ff0dd8d9ee --- /dev/null +++ b/pkgs/games/openxray/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile +, openal, cryptopp, libtheora, SDL2, lzo, libjpeg, libogg, tbb +, pcre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "OpenXRay"; + version = "510"; + + src = fetchFromGitHub { + owner = "OpenXRay"; + repo = "xray-16"; + rev = version; + sha256 = "0q142l6xvgnd6ycncqld69izxclynqrs73aq89pfy1r1nzhd60ay"; + fetchSubmodules = true; + }; + + hardeningDisable = [ "format" ]; + cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + buildInputs = [ + glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo + libjpeg libogg tbb pcre + ]; + nativeBuildInputs = [ cmake makeWrapper ]; + + preConfigure = '' + substituteInPlace src/xrCore/xrCore.cpp \ + --replace /usr/share $out/share + ''; + + postInstall = '' + mv $out/var/empty/* $out + install -Dm755 $out/games/xr_3da $out/bin/xr_3da + install -Dm644 $src/License.txt $out/share/licenses/openxray/License.txt + rm -r $out/var $out/games + + # needed because of SDL_LoadObject library loading code + wrapProgram $out/bin/xr_3da \ + --prefix LD_LIBRARY_PATH : $out/lib + ''; + + meta = with stdenv.lib; { + description = "X-Ray Engine 1.6 expansion. Original version was used in S.T.A.L.K.E.R.: Call of Pripyat"; + homepage = src.meta.homepage; + license = licenses.unfree // { + url = https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt; + }; + maintainers = [ maintainers.gnidorah ]; + platforms = ["x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index cb8223daa2b0..8c4ce46f6f5e 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, nasm -, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU_combined, SDL2, zlib +, alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU_combined, SDL2, zlib }: stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p"; + sha256 = "6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727"; }; nativeBuildInputs = [ nasm ]; buildInputs = [ - alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU_combined SDL2 zlib + alsaLib curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU_combined SDL2 zlib ]; + dontDisableStatic = true; + enableParallelBuilding = true; configurePlatforms = [ "host" ]; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 5c9db63a63d9..29586f3fb55b 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -30,7 +30,15 @@ let plugins = { version = "2.30.4"; src = fetchurl { - url = "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"; + # To find new versions, visit + # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for + # some printer like for instance "WF-7210" to get to the most recent + # version. + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" + ]; sha256 = "16iq5gmfcgkvcx5hixggxgb8lwin5gjdhnq0zabgpfqg11n2w21q"; }; @@ -57,7 +65,10 @@ let plugins = { nativeBuildInputs = [ autoPatchelfHook rpm ]; src = fetchurl { - url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"; + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" + ]; sha256 = "1cz4z3wz216s77z185m665jcgdslil5gn4dsi118nv1fm17z3jik"; }; installPhase = '' @@ -84,7 +95,10 @@ let plugins = { nativeBuildInputs= [ autoPatchelfHook ]; buildInputs = [ gcc.cc.lib ]; src = fetchurl { - url = "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"; + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" + ]; sha256 = "12rivh00n9mhagy5yjl1m0bv7ypbig6brqkxm0a12xy0mjq7yv8y"; }; installPhase = '' @@ -111,7 +125,10 @@ let plugins = { nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc.cc.lib libtool ]; src = fetchurl { - url = "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"; + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" + ]; sha256 = "1ran75zsxcdci00jakngkz6p9lj4q483hjapmf80p68rzhpmdr5y"; }; installPhase = '' @@ -145,7 +162,10 @@ let plugins = { nativeBuildInputs = [ autoPatchelfHook ]; src = fetchurl { - url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"; + urls = [ + "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" + ]; sha256 = "1l0y4dy88y91jdq66pxrxqmiwsxwy0rd7x4bh0cw08r4iyhjqprz"; }; installPhase = '' @@ -179,7 +199,10 @@ let iscan-data = stdenv.mkDerivation rec { version = "1.39.1-2"; src = fetchurl { - url = "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz"; + urls = [ + "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz" + "https://web.archive.org/web/http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz" + ]; sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4"; }; @@ -195,7 +218,10 @@ stdenv.mkDerivation rec { version = "2.30.4-2"; src = fetchurl { - url = "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz"; + urls = [ + "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz" + "https://web.archive.org/web/http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz" + ]; sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr"; }; @@ -211,7 +237,10 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch?h=b6e4c805d53b49da79a0f64ef16bb82d6d800fcf"; + urls = [ + "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch?h=b6e4c805d53b49da79a0f64ef16bb82d6d800fcf" + "https://web.archive.org/web/https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch?h=b6e4c805d53b49da79a0f64ef16bb82d6d800fcf" + ]; sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd"; }) ./firmware_location.patch diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 0fa637e040e2..448bac92ae80 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -10,7 +10,12 @@ in inherit version; src = fetchurl { - url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"; + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" + ]; + sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig"; }; diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch index fb546b6a25b7..b9f198b14b74 100644 --- a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch +++ b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure_new -index 699bcb5..89a1832 100755 +index 12b4662..6ec641c 100755 --- a/configure +++ b/configure_new -@@ -11585,55 +11585,8 @@ else +@@ -12162,55 +12162,8 @@ else $as_echo "no" >&6; } fi @@ -44,7 +44,7 @@ index 699bcb5..89a1832 100755 - if test -d "${cups_default_prefix}/share/ppd" ; then - CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" - elif test "xyes" = "x$have_cups_config" ; then -- CUPS_PPD_DIR="${cups_default_prefix}/`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model" +- CUPS_PPD_DIR="${cups_default_prefix}`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model" - else - CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" - fi @@ -58,5 +58,5 @@ index 699bcb5..89a1832 100755 +CUPS_FILTER_DIR="${prefix}/lib/cups/filter" +CUPS_PPD_DIR="${prefix}/share/cups/model" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 - $as_echo_n "checking for ANSI C header files... " >&6; } + # Check whether --enable-lsb was given. + if test "${enable_lsb+set}" = set; then : diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 3d6fb8f081ab..d90ef2c91f64 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -2,11 +2,19 @@ stdenv.mkDerivation { pname = "epson-escpr"; - version = "1.6.16"; + version = "1.7.3"; src = fetchurl { - url = "https://download3.ebz.epson.net/dsc/f/03/00/06/41/54/29588ed107f800e5bc3f91706661567efb369c1c/epson-inkjet-printer-escpr-1.6.16-1lsb3.2.tar.gz"; - sha256 = "0v9mcih3dg3ws18hdcgm014k97hv6imga39hy2a84gnc6badp6n6"; + # To find new versions, visit + # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for + # some printer like for instance "WF-7110" to get to the most recent + # version. + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" + "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" + ]; + sha256 = "0r3jkdfk33irha9gpyvhha056ans59p7dq9i153i292ifjsd8458"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 96399b9cd975..4edc08a3571b 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -5,10 +5,15 @@ stdenv.mkDerivation rec { version = "1.1.1"; src = fetchurl { - # To find new versions, visit http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX - # and search for some printer like for instance "WF-7210" to get to the most recent version. - # NOTE: keep in mind that many parts of the URL change and not just version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/${pname}-${version}-1lsb3.2.src.rpm"; + # To find new versions, visit + # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for + # some printer like for instance "WF-7210" to get to the most recent + # version. + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" + ]; sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q"; }; diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix index 15a7ba3cd3c4..0cc5537180bd 100644 --- a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix +++ b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix @@ -13,7 +13,11 @@ in stdenv.mkDerivation rec { version = "1.0.1"; src = fetchurl { - url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm"; + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm" + ]; sha256 = "19nb2h0y9rvv6rg7j262f8sqap9kjvz8kmisxnjg1w0v19zb9zf2"; }; sourceRoot = srcdirs.filter; diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index 9da1a8269ab1..fc854c007962 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -9,7 +9,11 @@ in inherit version; src = fetchurl { - url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm"; + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm" + ]; sha256 = "1ixnhn2dk83nh9v8sdivzgc2bm9z2phvsbx8bc6ainbjq6vn7lns"; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index f69b0794ce3a..c27ac344e055 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchFromGitHub, pam, systemd }: -stdenv.mkDerivation { - version = "11-dev"; +stdenv.mkDerivation rec { + version = "v13"; pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; - repo = "physlock"; - rev = "31cc383afc661d44b6adb13a7a5470169753608f"; - sha256 = "0j6v8li3vw9y7vwh9q9mk1n1cnwlcy3bgr1jgw5gcv2am2yi4vx3"; + repo = pname; + rev = version; + sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s"; }; buildInputs = [ pam systemd ]; preConfigure = '' substituteInPlace Makefile \ - --replace /usr/local $out \ --replace "-m 4755 -o root -g root" "" ''; - makeFlags = "SESSION=systemd"; + makeFlags = [ "PREFIX=$(out)" "SESSION=systemd" ]; meta = with stdenv.lib; { description = "A secure suspend/hibernate-friendly alternative to `vlock -an`"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 6f1c8af390c8..ffe576c31d81 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -4,7 +4,7 @@ }: let - buildUBoot = { version ? "2019.04" + buildUBoot = { version ? "2019.10" , filesToInstall , installDir ? "$out" , defconfig @@ -20,7 +20,7 @@ let src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn"; + sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; }; patches = [ @@ -82,7 +82,7 @@ let homepage = http://www.denx.de/wiki/U-Boot/; description = "Boot loader for embedded systems"; license = licenses.gpl2; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg samueldr ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]); diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a6b8c6dadc14..1ecdba507bfb 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -270,12 +270,12 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2019-10-09"; + version = "2019-10-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "7da99cf5eb5cbf9f7eb6c6b8450764afbb9c20f1"; - sha256 = "1qj4xr9vy2s3hr5hqjfdq46x5lszqsp4z1dggfk6gpzwln4k5ql0"; + rev = "803f8a2388fcf90881c13ff17da4eec01184401d"; + sha256 = "1gxj2jdii6icgdmkhhsxshi02xbsad0697cixklf3wsqlxrj3px5"; }; }; @@ -479,12 +479,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-09-08"; + version = "2019-10-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "9a8da3f5548e1f894fdd3b9600e17007f7ad9b26"; - sha256 = "14vk80bg0cgs14n3kfpg6rkgxvvrnyz4s4wms0iqi9hq622i0znz"; + rev = "b462798fa91b7335b7bc2dbdfdd4192380424b10"; + sha256 = "0131y8mdbrg7mxn0b5gwpmbhyr1869v98ywsglrs0c8cnlwx5iwv"; }; }; @@ -989,12 +989,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2019-06-12"; + version = "2019-10-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "c12d2e683fb749f9c0d4a099d894baa3d9d5f330"; - sha256 = "1w8awylby9qasy0z6x4l5k9gw5sqqmsmpcvckj9ax1sp34psdzhx"; + rev = "dcbeba8ce075e3b6afc0422bbb339ef953582347"; + sha256 = "1y07a42a976z5cvkkjg6sir0vi7xdmk97bzyc2qvpx16gvqby6a2"; }; }; @@ -1179,12 +1179,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-10-04"; + version = "2019-10-13"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "8b7ee2a596aa33dec51246a4670eb20e337caaa2"; - sha256 = "19magq7d0yi2jklm9zn7da2xk1lm21hlcscl1x3i0ma6all5y06s"; + rev = "3318e1f29fde78bd75b2863d6cae6e1035f814de"; + sha256 = "0nbmg9m6ydma7hx8kb2dgswv1ksy68iqcpsgj81782g0ksimdf8b"; }; }; @@ -1508,6 +1508,17 @@ let }; }; + lexima-vim = buildVimPluginFrom2Nix { + pname = "lexima-vim"; + version = "2019-07-22"; + src = fetchFromGitHub { + owner = "cohama"; + repo = "lexima.vim"; + rev = "aa32e972b69230625989daa09ee5fd74a2d877ef"; + sha256 = "15cc09vb0yrasz76qkcqxhj95y1m6yrsx3wsn6khx39kp1bas0jd"; + }; + }; + lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; version = "2019-05-23"; @@ -1763,12 +1774,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-10-09"; + version = "2019-10-14"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "eefad2c87845b141a269e0ed64c23eeb64319506"; - sha256 = "0b74ga7wvd3fs2hrdjjal3ihacl81fyld01jn8chm255px1kajkv"; + rev = "0e03a4497ef01fd17b34232830285cb506701abd"; + sha256 = "1l9s9zhmdhf0s5ps2f9y2b5fgl8kvkfs69v97rgrd51h9m4mk0jb"; }; }; @@ -1796,12 +1807,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-09-14"; + version = "2019-10-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "3838f45930e8d6c05807c925350585c48bd21a4b"; - sha256 = "1m6skrdjr6d1waxarxch2hn7416q9r13yan1bd7qx2w5gika606a"; + rev = "037b7a76f28d51c126de43fb88f01b592193c835"; + sha256 = "0n0i4iax3argmmzcwm22yrs9av71nqydza15c9ynlwkdd5gi2xvp"; }; }; @@ -1873,12 +1884,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-10-11"; + version = "2019-10-14"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "926ff0ec038d2be0bf4ff3412d3c7144b5f82498"; - sha256 = "12znr5q2p41yq4av27a49ciisdlv3ajh9qrfgbkvc581l2pbq0yz"; + rev = "42455176896560bf8cf7fc8457232131231b358f"; + sha256 = "08nmzgr536yqv1rnlf6m5xj176wfamcd4zjp4pc4r9b955r874c0"; }; }; @@ -1950,12 +1961,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-05-21"; + version = "2019-10-13"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "8fcb1af27772174df5446d49de29052cac47e46f"; - sha256 = "0ya3xgbnpps6s67rxfwpcfv39micl1d2wblzb7xvs1pmsymwbj0r"; + rev = "81caad80107abb9c2f5159e02e2cd95876370bec"; + sha256 = "01x1jx7wxpjkv09l9wx1ygsjqrdvfy47pxqgjzmnx4x126ji9gw2"; }; }; @@ -2258,12 +2269,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-10-08"; + version = "2019-10-13"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "7959279612914eeaa584f5ce719fc71cd967e384"; - sha256 = "0glmnj3ra4m9hi0qrvdi8g2h29vzjw9biwq1l2sjx4hmv6smnri5"; + rev = "8293adcd9c5645379133bea4d77de30b1476528c"; + sha256 = "1cc1wq2lbsl7jxh3mal0yhj3z2fn1q60ip4666kshx5yryikhs3p"; }; }; @@ -3579,12 +3590,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-10-11"; + version = "2019-10-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "51940d350f87611d6128e641766dcab73003a6fa"; - sha256 = "0ajzb64z12c51c7k8zbj34i2mali289q0gyj2qpmi4ganfq4zdg8"; + rev = "17c53d38f17b0978323868ac12573f33a6fb8100"; + sha256 = "1fal9w1xkwbsidj9rskxkl7406n92rwghas6vw5nx3v95pn8lb7k"; }; }; @@ -4084,6 +4095,17 @@ let }; }; + vim-manpager = buildVimPluginFrom2Nix { + pname = "vim-manpager"; + version = "2017-05-08"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "vim-manpager"; + rev = "25bdd9448651a7669659b1b8d8d7a82acdfbf8af"; + sha256 = "0d7rg4lvyxr4v34bimxpdkynmvs606fqvv0qpi7g139ng9hv6wqm"; + }; + }; + vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; version = "2019-07-09"; @@ -4361,12 +4383,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-10-04"; + version = "2019-10-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "849b76be90a2c5a13fd9943b2b76d77a9b6ebc0f"; - sha256 = "16s6fcb9cx6lib0vh30whbrqs9j6j2wjc0cykd80vjdhi4rv1r55"; + rev = "fcfd5b7e1f2ac9f90e933037cd2ef1d0ef2ff992"; + sha256 = "1j4jwy84pypick27gisw3z1gqa54zamlfhl2dpy4ixgqxgvrdf6k"; }; }; @@ -5032,12 +5054,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-09-26"; + version = "2019-10-12"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "56104bd06a30c08bf0c0dd69a98d5cb516a3025c"; - sha256 = "1fjn4cdw99y78c8gway1pg9sbqgyr0jbbr6snh8awlnmgwa3yrg7"; + rev = "23d3a3910469a6f81de5b4bdb485d092c2eb7e78"; + sha256 = "017fkswbb8knw4z33hn2vjyjzaay6hjzm676pji3ravm5bh2nv3c"; }; }; @@ -5151,6 +5173,17 @@ let }; }; + vimfiler-vim = buildVimPluginFrom2Nix { + pname = "vimfiler-vim"; + version = "2019-07-30"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "vimfiler.vim"; + rev = "26d3fec10cb8921d510064411784301794229a93"; + sha256 = "0iv1smk0999sfm3iqdlpb2il74l01lxfahwg87g7h3gq9frky2wd"; + }; + }; + vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; version = "2018-07-04"; @@ -5197,12 +5230,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-10-10"; + version = "2019-10-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7fc7a1b37514716bf9ae685024fa5009085f8d17"; - sha256 = "1z6js7przlncfdriyds89am3hk4yc0bmj6qg7cn89kfgh85zg6vs"; + rev = "335dbe97ce6f3aae311396f9567d2457270589b1"; + sha256 = "1q8jjxab87lfa1sp6sxh7540i01nbbh9inh66zv5fshgga95vv0j"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 37c9e3edca98..f6ac20d3b82c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -47,6 +47,7 @@ christoomey/vim-tmux-navigator cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim +cohama/lexima.vim ctjhoa/spacevim ctrlpvim/ctrlp.vim dag/vim2hs @@ -175,6 +176,7 @@ konfekt/fastfold kristijanhusak/vim-hybrid-material kshenoy/vim-signature lambdalisue/vim-gista +lambdalisue/vim-manpager lambdalisue/vim-pager latex-box-team/latex-box leafgarland/typescript-vim @@ -366,6 +368,7 @@ Shougo/neosnippet.vim Shougo/neoyank.vim Shougo/tabpagebuffer.vim Shougo/unite.vim +Shougo/vimfiler.vim Shougo/vimproc.vim Shougo/vimshell.vim shumphrey/fugitive-gitlab.vim diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 38e2fa9bd344..591a9a8792fc 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -2,14 +2,14 @@ , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let - version = "5.1.5"; + version = "5.1.6"; name = "autofs-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz"; - sha256 = "1nn0z60f49zchpv8yw67fk8hmbjszpnczs0bj2ql2vgxwbcxmbr3"; + sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 014ebe80cdcc..449f8e3d40ba 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,7 +4,7 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.10.0"; + version = "0.11.0"; name = "bcc-${version}"; srcs = [ @@ -12,7 +12,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "0qbqygj7ia494fbira9ajavvnxlpffx1jlzbb1vsf1wa8h3y4xn1"; + sha256 = "1v2gzdd4k58f3yxmq4z97a7xh5vyd84flzzfr9k2cm29i93cwcam"; name = "bcc"; }) @@ -21,8 +21,8 @@ python.pkgs.buildPythonApplication rec { (fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; - rev = "0e37e0d03ac99987401e4496d3d76d44237b9963"; - sha256 = "0wjf9dhvqkwiwnygzikamrgmpxgq77h2pxx6mi4pnbw0lxlppivr"; + rev = "a30df5c09fb3941fc42c4570ed2545e7057bf82a"; + sha256 = "088vb9sfs1zazlqi6abb3ia1xgpmwiz5pmz6y3a6gbh0zdrgh6px"; name = "libbpf"; }) ]; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 7f5cd206f32c..02a46e5a7764 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "17qf1c3h99iyxkc0xzix4jnxwqvxbg9ki23zm7l04qw73lj01g1m"; + sha256 = "19lblnhx3p0qk8s3qgxrx9wl0d6dgz5dfp4gw6a6cvhhyn78cldm"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 13614493f610..9a74b0bb4a86 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "17.11.2"; + version = "19.08"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2"; + sha256 = "0xgrkip2aji1c7jy5gk38zzwlp5ap1s6dmbcag5dnyy3bmwvmp9y"; }; nativeBuildInputs = [ pkgconfig ]; @@ -59,6 +59,6 @@ EOF homepage = http://dpdk.org/; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ domenkozar orivej ]; + maintainers = with maintainers; [ domenkozar magenbluten orivej ]; }; } diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 223a9b7bf794..a8776f688cad 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.22"; + version = "0.24"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "0dk4j1b8sy4j6w91cq5ga99f3hln9fgh79ayi9kvn8xgzksmhjdp"; + sha256 = "1dspi6ds58dy7g1q3chapxydfiyz8bjjlryq66jvwgpynzp0c1h1"; }; patches = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index f298073d11a4..75144799d014 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,7 +2,6 @@ { stdenv , fetchurl -, fetchpatch , substituteAll , gtk-doc , pkgconfig @@ -154,11 +153,6 @@ stdenv.mkDerivation rec { # needs a different set of modules than po/make-images inherit installedTestsPython; }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/41a25be6f4b371c367904284e9251cd461ad5cfe.patch"; - sha256 = "0vv3x2pq5bpmg9c8ax5dsqcblw45n7jmzgw6p8h4asyjy57mzhaq"; - }) ]; postPatch = '' diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 59d41412f55e..6d0eba0b0dbc 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -5,32 +5,24 @@ , pkgconfig , ell , coreutils +, docutils , readline , python3Packages }: stdenv.mkDerivation rec { pname = "iwd"; - version = "0.20"; + version = "0.22"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "03ca47d4hn28vkf5fr6ck1gz5py4lm1pw3nw9s1ckw7cqxw961sf"; + sha256 = "0mjc08ayq2k7sinqanrlm97dn88dxkqkyk2vqqcx1nqjvwvbpbsp"; }; - patches = [ - # Undo creating ReadWritePaths as instalation target. - (fetchpatch { - name = "revert-create-dirs-on-install.patch"; - url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=5a96c11664eb553bc28a2142af382b190254edbb"; - sha256 = "08gkz3ia1l5xsh3pbx4abimgf7m88wygfpfyg77yi6dwavjqm6cx"; - revert = true; - }) - ]; - nativeBuildInputs = [ autoreconfHook + docutils pkgconfig python3Packages.wrapPython ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 734509dfd564..5336ab4d9776 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -33,7 +33,6 @@ let DYNAMIC_DEBUG = yes; TIMER_STATS = whenOlder "4.11" yes; DEBUG_NX_TEST = whenOlder "4.11" no; - CPU_NOTIFIER_ERROR_INJECT = whenOlder "4.4" (option no); DEBUG_STACK_USAGE = no; DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) no; RCU_TORTURE_TEST = no; @@ -194,8 +193,6 @@ let }; video = { - # Enable KMS for devices whose X.org driver supports it - DRM_I915_KMS = whenOlder "4.3" yes; # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; VGA_SWITCHEROO = yes; # Hybrid graphics support @@ -264,7 +261,6 @@ let EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; EXT2_FS_SECURITY = yes; - EXT2_FS_XIP = whenOlder "4.0" yes; # Ext2 execute in place support EXT3_FS_POSIX_ACL = yes; EXT3_FS_SECURITY = yes; @@ -366,10 +362,6 @@ let MICROCODE = yes; MICROCODE_INTEL = yes; MICROCODE_AMD = yes; - - MICROCODE_EARLY = whenOlder "4.4" yes; - MICROCODE_INTEL_EARLY = whenOlder "4.4" yes; - MICROCODE_AMD_EARLY = whenOlder "4.4" yes; } // optionalAttrs (versionAtLeast version "4.10") { # Write Back Throttling # https://lwn.net/Articles/682582/ @@ -714,7 +706,7 @@ let PREEMPT = no; PREEMPT_VOLUNTARY = yes; - + X86_AMD_PLATFORM_DEVICE = yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 578cbf318b87..f4b9e5b8da63 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.2.2019.10.01"; + version = "5.2.2019.10.12"; modDirVersion = "5.2.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "45920b5139a752bb4f22871b8b916beacc4f9fb9"; - sha256 = "1hi98jckzd8d7whivmgl1ywdfdixhq7la37jagwnwbf8lsqsp25i"; + rev = "de906c3e2eddad291d46bd0e7c81c68eaadcd08a"; + sha256 = "1ahabp8pd9slf4lchkbyfkagg9vhic0cw3kwvwryzaxxxjmf2hkk"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 731d44d69a38..23201f1c1b38 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4-rc2"; + version = "5.4-rc3"; extraMeta.branch = "5.4"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0dnn771wydwc4sngy9a3szvflbw9g97ann4iix4k4bq4gr18jw2c"; + sha256 = "1hp9b71ip8a9mlgnwhr8x7mhy5qkgz57hd5xqskfx3axbsh2j3f5"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 9944250bf307..d5b451177325 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation { "--enable-udev_rules" "--enable-udev_sync" "--enable-pkgconfig" - "--enable-applib" "--enable-cmdlib" ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd" ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -34,17 +33,15 @@ stdenv.mkDerivation { preConfigure = '' - substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/bin/udevadm ${systemd}/bin/udevadm - sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + '' + stdenv.lib.optionalString (systemd != null) '' + substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ + --replace /usr/bin/udevadm ${systemd}/bin/udevadm ''; - # gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory - enableParallelBuilding = false; + enableParallelBuilding = true; - #patches = [ ./purity.patch ]; patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; @@ -75,7 +72,7 @@ stdenv.mkDerivation { '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ --replace $out/sbin/blkid ${utillinux}/sbin/blkid - + '' + stdenv.lib.optionalString (systemd != null) '' # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system diff --git a/pkgs/os-specific/linux/lvm2/purity.patch b/pkgs/os-specific/linux/lvm2/purity.patch deleted file mode 100644 index d6990dd9caa5..000000000000 --- a/pkgs/os-specific/linux/lvm2/purity.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ru LVM2.2.02.95-orig/udev/10-dm.rules.in LVM2.2.02.95/udev/10-dm.rules.in ---- LVM2.2.02.95-orig/udev/10-dm.rules.in 2011-08-11 19:55:29.000000000 +0200 -+++ LVM2.2.02.95/udev/10-dm.rules.in 2012-03-19 20:12:35.000000000 +0100 -@@ -19,9 +19,8 @@ - SUBSYSTEM!="block", GOTO="dm_end" - KERNEL!="dm-[0-9]*", GOTO="dm_end" - --# Set proper sbin path, /sbin has higher priority than /usr/sbin. --ENV{DM_SBIN_PATH}="/sbin" --TEST!="$env{DM_SBIN_PATH}/dmsetup", ENV{DM_SBIN_PATH}="/usr/sbin" -+# Set proper sbin path. Exit if dmsetup is not present. -+ENV{DM_SBIN_PATH}="(sbindir)" - TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end" - - # Device created, major and minor number assigned - "add" event generated. -diff -ru LVM2.2.02.95-orig/udev/Makefile.in LVM2.2.02.95/udev/Makefile.in ---- LVM2.2.02.95-orig/udev/Makefile.in 2012-02-24 10:53:12.000000000 +0100 -+++ LVM2.2.02.95/udev/Makefile.in 2012-03-19 20:16:09.000000000 +0100 -@@ -12,6 +12,7 @@ - # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - srcdir = @srcdir@ -+sbindir = @sbindir@ - top_srcdir = @top_srcdir@ - top_builddir = @top_builddir@ - -@@ -26,7 +27,7 @@ - ifeq ("@UDEV_HAS_BUILTIN_BLKID@", "yes") - BLKID_RULE=IMPORT{builtin}=\"blkid\" - else -- BLKID_RULE=IMPORT{program}=\"\$$env{DM_SBIN_PATH}\/blkid -o udev -p \$$tempnode\" -+ BLKID_RULE=IMPORT{program}=\"\/sbin\/blkid -o udev -p \$$tempnode\" - endif - - CLEAN_TARGETS = 10-dm.rules 13-dm-disk.rules -@@ -36,7 +37,7 @@ - vpath %.rules $(srcdir) - - %.rules: %.rules.in -- $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" $< >$@ -+ $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" -e "s|(sbindir)|$(sbindir)|" $< >$@ - - %_install: %.rules - $(INSTALL_DATA) -D $< $(udevdir)/$( +Date: Sat, 12 Oct 2019 21:47:47 +0200 +Subject: [PATCH 1/2] Fix path marshalling when saveing config + +--- + config/config.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/config.go b/config/config.go +index 69a10c5..b5c61fe 100644 +--- a/config/config.go ++++ b/config/config.go +@@ -26,7 +26,7 @@ func (p *Path) UnmarshalText(text []byte) error { + return nil + } + +-func (p *Path) MarshalText() (text []byte, err error) { ++func (p Path) MarshalText() (text []byte, err error) { + return []byte(p.path), nil + } + +-- +2.19.2 + diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix new file mode 100644 index 000000000000..6bbcdac2c171 --- /dev/null +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: + +buildGoModule rec { + pname = "zsh-history"; + version = "2019-10-07"; + + src = fetchFromGitHub { + owner = "b4b4r07"; + repo = "history"; + rev = "a08ad2dcffc852903ae54b0c5704b8a085009ef7"; + sha256 = "0r3p04my40dagsq1dssnk583qrlcps9f7ajp43z7mq73q3hrya5s"; + }; + + patches = [ + ./0001-Fix-path-marshalling-when-saveing-config.patch + ]; + + nativeBuildInputs = [ installShellFiles ]; + + modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; + goPackagePath = "github.com/b4b4r07/history"; + + postInstall = '' + install -d $out/share + cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share" + installShellCompletion --zsh --name _history $out/share/zsh/completions/_history + ''; + + meta = with lib; { + description = "A CLI to provide enhanced history for your ZSH shell"; + license = licenses.mit; + homepage = https://github.com/b4b4r07/history; + platforms = platforms.unix; + maintainers = with maintainers; [ kampka ]; + }; +} diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 6e89421d390b..cdf58bc0215d 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "07bq6axgq33djp87kkx7c5cv8n80gclvj247n9j514zqly6abdxy"; + sha256 = "0j9wn61jd107fq9ww79399s7adql0vf897s0xavlvv6chq8a6ajj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 3c50a7948d90..fd8ee9e04a3a 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq -, squashfsTools, iproute, iptables, ebtables, libcap, dqlite -, sqlite-replication +, squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite +, raft-canonical, sqlite-replication , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash @@ -9,21 +9,20 @@ buildGoPackage rec { pname = "lxd"; - version = "3.13"; + version = "3.18"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1kasnzd8hw9biyx8avbjmpfax1pdbp9g543g8hs6xpksmk93hl82"; + sha256 = "1p8g2gbwgn3kln5rxddpc2fxk8bvf026wjiqip2b0vvpi7h3955h"; }; preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd - rm dist/src/github.com/lxc/lxd - cp -r dist/src/* ../../.. - rm -r dist + rm _dist/src/github.com/lxc/lxd + cp -r _dist/src/* ../../.. popd ''; @@ -45,13 +44,14 @@ buildGoPackage rec { ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ lxc acl libcap dqlite sqlite-replication ]; + buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev + raft-canonical.dev sqlite-replication ]; meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = https://linuxcontainers.org/lxd/; license = licenses.asl20; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz wucke13 ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 1cf7a19014e4..c1673c8308e9 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,7 +2,8 @@ , gnutar , par2cmdline , utillinux -, rsync, makeWrapper }: +, rsync +, backblaze-b2, makeWrapper }: python2Packages.buildPythonApplication rec { pname = "duplicity"; @@ -40,10 +41,10 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = [ backblaze-b2 ] ++ (with python2Packages; [ boto cffi cryptography ecdsa enum idna pygobject3 fasteners ipaddress lockfile paramiko pyasn1 pycrypto six - ]; + ]); checkInputs = [ gnupg # Add 'gpg' to PATH. gnutar # Add 'tar' to PATH. diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix index eb714b64a973..42df651e1a8f 100644 --- a/pkgs/tools/backup/pyznap/default.nix +++ b/pkgs/tools/backup/pyznap/default.nix @@ -1,17 +1,22 @@ { lib , buildPythonApplication , fetchPypi +, setuptools }: buildPythonApplication rec { pname = "pyznap"; - version = "1.2.1"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0pnngr4zdxkf6b570ikzvkrm3a8fr47w6crjaw7ln094qkniywvj"; + sha256 = "00xpw6rmkq5cfjfw23mv0917wfzvb5zxj420p6yh0rnl3swh7gi8"; }; + propagatedBuildInputs = [ + setuptools + ]; + # tests aren't included in the PyPI packages doCheck = false; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index b71f032bd7ae..7ef213bae232 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "s3ql"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "release-${version}"; - sha256 = "01ky0jc1s3w9dry5siz9b69jf2maiargz99axgxvyihap0d7qs52"; + sha256 = "1rb1y1hl6qgwpkfc85ivkk0l0f5dh8skpfaipnvndn73mlya96mk"; }; checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index d53fbb3960b8..144ed0a38459 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2019-10-01"; + version = "2019-10-12"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "7f69c4161c31b8f43723a9ccad1a9a358f4e2e70"; - sha256 = "0v4b8h99cd434v349y8vmhj2igf0ryky7svd20ar1fr7da580kvj"; + rev = "6e696ea08703eecd0d1c7b8c520b6f62f06f4f26"; + sha256 = "0m3valm68vc73b4kydlga17fglxa9bldrjaszlladzl5bd0zb967"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 4a1215397be6..85cd06099200 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils +{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils, makeWrapper , fuse3, glib , which, python3Packages +, openssh }: stdenv.mkDerivation rec { @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0gvk8snivpi2sjidjnd9ypc66ny7lr0z9v4swl56rwjv539dkbx2"; }; - nativeBuildInputs = [ meson pkgconfig ninja docutils ]; + nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ]; buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs + wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin" ''; #doCheck = true; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index c2bcc2adfc05..0dc339e51c6b 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -50,18 +50,19 @@ let }; nativeBuildInputs = [ autoreconfHook ]; }; + ucdVersion = "12.0.0"; ucdSrcs = { NamesList = fetchurl { - url = "https://www.unicode.org/Public/UNIDATA/NamesList.txt"; + url = "https://www.unicode.org/Public/${ucdVersion}/ucd/NamesList.txt"; sha256 = "c17c7726f562bd9ef869096807f0297e1edef9a58fdae1fbae487378fa43586f"; }; Blocks = fetchurl { - url = "https://www.unicode.org/Public/UNIDATA/Blocks.txt"; + url = "https://www.unicode.org/Public/${ucdVersion}/ucd/Blocks.txt"; sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10"; }; }; ucd = stdenv.mkDerivation { - name = "ucd-12.0.0"; + name = "ucd-${ucdVersion}"; dontUnpack = true; installPhase = '' mkdir $out diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index a1e9f21c52cc..532d1155fbe0 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask pygments + setuptools xstatic xstatic-bootbox xstatic-bootstrap diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 0f32d1e63b1e..19fa7e547aef 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "4.4.1"; + version = "5.0.2"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0s3v8frflqqifyzq84xi6322wg8c9f5wcaic9zlpdf6wylqsiali"; + sha256 = "1vgq6dp22996y7llcij122idky92jgczliwm191yfc8b200xbx0p"; }; dontConfigure = true; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r geekbench.plar geekbench4 geekbench_x86_64 $out/bin + cp -r geekbench.plar geekbench5 geekbench_x86_64 $out/bin - for f in geekbench4 geekbench_x86_64 ; do + for f in geekbench5 geekbench_x86_64 ; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" done diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index c9489e37e25c..8f3d245280c9 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0rwmigdnw2zgixzmif3wzw1adlyyk71jzvjfccqmgz840jkpvmcy"; + sha256 = "12bj5xifnpj5yni563b6b33lzmkgm7j1wk0c9859zw59b33ifd1l"; }; - cargoSha256 = "1j9ngbabg6vchgpiaqsbcvsm86syx2nbckzf9a4b29m69jv4pp1y"; + cargoSha256 = "1ias944wg55njjnap7w02b87bvb502vzkpjvsb704q5i9sr8hjry"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index b518a159e913..5b45c0b712bf 100644 --- a/pkgs/tools/misc/mtm/default.nix +++ b/pkgs/tools/misc/mtm/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { pname = "mtm"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "deadpixi"; repo = pname; rev = version; - sha256 = "0k9xachd9wnyhj8sh4yninckgwm3a7zdxnn490x65ikn4vqb7w8x"; + sha256 = "0b2arkmbmabxmrqxlpvvvhll2qx0xgj7r4r6p0ymnm9p70idris4"; }; buildInputs = [ ncurses ]; + preBuild = '' + substituteInPlace Makefile --replace "strip -s mtm" "" + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 370d19247113..1a4e4d5b3a26 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "0.96.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "openstreetmap"; - repo = "osm2pgsql"; + repo = pname; rev = version; - sha256 = "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl"; + sha256 = "1g9qc1z5gzdjd37n586vcmq1qli0lkhbnsrnky0mf22szzv8iwfx"; }; nativeBuildInputs = [ cmake ]; @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenStreetMap data to PostgreSQL converter"; - homepage = https://github.com/openstreetmap/osm2pgsql; + homepage = "https://github.com/openstreetmap/osm2pgsql"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = with maintainers; [ jglukasik ]; }; } diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index d852818b3155..d946ed91c726 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "routino"; - version = "3.2"; + version = "3.3.2"; src = fetchurl { url = "https://routino.org/download/${pname}-${version}.tgz"; - sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; + sha256 = "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 883c2edd80a3..a395e8decfe6 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "screenFetch"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "KittyKatt"; repo = "screenFetch"; rev = "v${version}"; - sha256 = "00ibv72cb7cqfpljyzgvajhbp0clqsqliz18nyv83bfy3gkf2qs8"; + sha256 = "11mqld9pppbappqbaj49mw2v5kysx06sy1xbs81i0hhgh35hlziv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 8335c04c3d2f..7270be0abfa7 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.21.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "07f502xrh8pkh02xkb79g64qcwxdlipypwn6x35zq8hdrw07xhw3"; + sha256 = "029yrjlb0gl6338h1d299522cv3vfx5y08fs4kp61pmsw6x0c818"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix deleted file mode 100644 index 14c152236d6b..000000000000 --- a/pkgs/tools/misc/testdisk/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid, ntfs3g }: - -stdenv.mkDerivation { - name = "testdisk-7.1"; - - src = fetchurl { - url = https://www.cgsecurity.org/testdisk-7.0.tar.bz2; - sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; - }; - - buildInputs = [ ncurses libjpeg zlib openssl libuuid ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs ntfs3g ]; - - enableParallelBuilding = true; - - meta = { - homepage = https://www.cgsecurity.org/wiki/TestDisk; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.eelco ]; - longDescription = '' - TestDisk is a program for data recovery, primarily designed to - help recover lost partitions and/or make non-booting disks - bootable again. - ''; - }; -} diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix deleted file mode 100644 index f35a90273530..000000000000 --- a/pkgs/tools/networking/envoy/default.nix +++ /dev/null @@ -1,303 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, bazel, c-ares, backward-cpp -, libevent, gtest, gperftools, http-parser, lightstep-tracer-cpp -, nghttp2, protobuf, tclap, rapidjson, spdlog, boringssl, buildEnv -}: - -let - protobuf_bzl = - fetchFromGitHub { - owner = "htuch"; - repo = "protobuf"; - rev = "d490587268931da78c942a6372ef57bb53db80da"; - sha256 = "100494s66xclw88bdnpb6d386vgw0gwz90sni37q7fqmi9w99z6v"; - }; - - # Based on ci/prebuilt/BUILD - # - # The paths have been fixed up, and the static archives have been replaced - # with dynamic libraries where presently possible. - # - # At the moment, this doesn't _need_ to be a map that we dynamically create a - # BUILD file from (we could instead just include the contents directly); - # however, this sets us up to be ready if we (or upstream) decide to split - # things into multiple bazel repos, instead of one. - ccTargets = { - ares = { - pkg = c-ares; - srcs = ''["lib/libcares.so"]''; - hdrs = ''glob(["include/ares*.h"])''; - includes = ''["include"]''; - }; - - backward = { - pkg = backward-cpp; - hdrs = ''["include/backward.hpp"]''; - includes = ''["include"]''; - }; - - crypto = { - pkg = boringssl; - srcs = ''["lib/libcrypto.a"]''; - hdrs = ''glob(["include/openssl/**/*.h"])''; - includes = ''["include"]''; - }; - - event = { - pkg = libevent; - srcs = ''["lib/libevent.so"]''; - hdrs = ''glob(["include/event2/**/*.h"])''; - includes = ''["include"]''; - }; - - event_pthreads = { - pkg = libevent; - srcs = ''["lib/libevent_pthreads.so"]''; - deps = ''[":event"]''; - }; - - googletest = { - pkg = gtest; - srcs = ''[ "lib/libgmock.so", "lib/libgtest.so" ]''; - hdrs = ''glob(["include/gmock/**/*.h", "include/gtest/**/*.h"])''; - includes = ''["include"]''; - }; - - http_parser = { - pkg = http-parser; - srcs = ''["lib/libhttp_parser.so"]''; - hdrs = ''glob(["include/http_parser.h"])''; - includes = ''["include"]''; - }; - - lightstep = { - pkg = lightstep-tracer-cpp; - srcs = ''["lib/liblightstep_core_cxx11.a"]''; - hdrs = ''glob([ "include/lightstep/**/*.h", "include/mapbox_variant/**/*.hpp" ]) + [ "include/collector.pb.h", "include/lightstep_carrier.pb.h" ]''; - includes = ''["include"]''; - deps = ''[":protobuf"]''; - }; - - nghttp2 = { - pkg = nghttp2; - srcs = ''["lib/libnghttp2.so"]''; - hdrs = ''glob(["include/nghttp2/**/*.h"])''; - includes = ''["include"]''; - }; - - protobuf = { - pkg = protobuf; - srcs = ''glob(["lib/libproto*.so"])''; - hdrs = ''glob(["include/google/protobuf/**/*.h"])''; - includes = ''["include"]''; - }; - - rapidjson = { - pkg = rapidjson; - hdrs = ''glob(["include/rapidjson/**/*.h"])''; - includes = ''["include"]''; - }; - - spdlog = { - pkg = spdlog; - name = "spdlog"; - hdrs = ''glob([ "include/spdlog/**/*.cc", "include/spdlog/**/*.h" ])''; - includes = ''["include"]''; - }; - - ssl = { - pkg = boringssl; - srcs = ''["lib/libssl.a"]''; - deps = ''[":crypto"]''; - }; - - tclap = { - pkg = tclap; - hdrs = ''glob(["include/tclap/**/*.h"])''; - includes = ''["include"]''; - }; - - tcmalloc_and_profiler = { - pkg = gperftools; - srcs = ''["lib/libtcmalloc_and_profiler.so"]''; - hdrs = ''glob(["include/gperftools/**/*.h"])''; - strip_include_prefix = ''"include"''; - }; - }; - - # Generate the BUILD file. - buildFile = - let field = name: attrs: - if attrs ? ${name} then " ${name} = ${attrs.${name}},\n" else ""; - in - '' - licenses(["notice"]) # Apache 2 - - package(default_visibility = ["//visibility:public"]) - - '' + - lib.concatStringsSep "\n\n" ( - lib.mapAttrsToList (name: value: - "cc_library(\n" - + " name = \"${name}\",\n" - + field "srcs" value - + field "hdrs" value - + field "deps" value - + field "includes" value - + field "strip_include_prefix" value - + ")" - ) ccTargets - ) + '' - - filegroup( - name = "protoc", - srcs = ["bin/protoc"], - ) - ''; - - workspaceFile = - '' - workspace(name = "nix") - - load("//bazel:repositories.bzl", "envoy_dependencies") - load("//bazel:cc_configure.bzl", "cc_configure") - - new_local_repository( - name = "nix_envoy_deps", - path = "${repoEnv}", - build_file = "nix_envoy_deps.BUILD" - ) - - envoy_dependencies( - path = "@nix_envoy_deps//", - skip_protobuf_bzl = True, - ) - - new_local_repository( - name = "protobuf_bzl", - path = "${protobuf_bzl}", - # We only want protobuf.bzl, so don't support building out of this repo. - build_file_content = "", - ) - - cc_configure() - ''; - - # The tree we'll use for our new_local_repository in our generated WORKSPACE. - repoEnv = buildEnv { - name = "repo-env"; - paths = lib.concatMap (p: - lib.unique [(lib.getBin p) (lib.getLib p) (lib.getDev p)] - ) allDeps; - }; - - rpath = stdenv.lib.makeLibraryPath (allDeps ++ [ stdenv.cc.cc ]); - - allDeps = [ - c-ares - backward-cpp - libevent - gtest - gperftools - http-parser - lightstep-tracer-cpp - nghttp2 - protobuf - tclap - rapidjson - spdlog - boringssl - ]; - - # Envoy checks at runtime that the git sha is valid, - # so we really can't avoid putting some sort of sha here. - rev = "3afc7712a04907ffd25ed497626639febfe65735"; - -in - -stdenv.mkDerivation rec { - pname = "envoy"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "lyft"; - repo = "envoy"; - rev = "v${version}"; - sha256 = "0j1c9lyvncyhiq3kyhx91ckcjd2h68x56js7xb6ni6bzxinv6zb6"; - }; - - nativeBuildInputs = [ - pkgconfig bazel - ]; - - buildInputs = allDeps; - - patches = [ ./nixos.patch ]; - - hardeningDisable = [ "all" ]; - dontPatchELF = true; - dontStrip = true; - - # set up our workspace, - # and prevent an error where bazel/get_workspace_status tries to determine the - # version by invoking git. - postUnpack = '' - cat <<'EOF' > $sourceRoot/WORKSPACE - ${workspaceFile} - EOF - - cat <<'EOF' > $sourceRoot/nix_envoy_deps.BUILD - ${buildFile} - EOF - - cat <<'EOF' > $sourceRoot/bazel/get_workspace_status - #!${stdenv.shell} - echo "BUILD_SCM_REVISION ${rev}" - echo "BUILD_SCM_STATUS Modified" - EOF - ''; - - buildPhase = '' - runHook preBuild - - mkdir .home - export HOME=$PWD/.home - - BAZEL_OPTIONS="--package_path %workspace%:$PWD" - BAZEL_BUILD_OPTIONS="\ - --strategy=Genrule=standalone \ - --spawn_strategy=standalone \ - --verbose_failures \ - $BAZEL_OPTIONS \ - --action_env=HOME \ - --action_env=PYTHONUSERBASE \ - --show_task_finish" - - bazel \ - --batch \ - build \ - -s --verbose_failures \ - --experimental_ui \ - $BAZEL_BUILD_OPTIONS \ - -c opt \ - //source/exe:envoy-static - - exe=bazel-bin/source/exe/envoy-static - chmod +w $exe - patchelf --set-rpath ${rpath} $exe - - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out/bin - mv $exe $out/bin/envoy - ''; - - meta = with lib; { - description = "L7 proxy and communication bus designed for large modern service oriented architectures"; - homepage = "https://lyft.github.io/envoy/"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; - }; -} diff --git a/pkgs/tools/networking/envoy/nixos.patch b/pkgs/tools/networking/envoy/nixos.patch deleted file mode 100644 index 04b63a2dde92..000000000000 --- a/pkgs/tools/networking/envoy/nixos.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/bazel/cc_configure.bzl b/bazel/cc_configure.bzl -index 8a7a69c4f..75526520c 100644 ---- a/bazel/cc_configure.bzl -+++ b/bazel/cc_configure.bzl -@@ -292,6 +292,8 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin): - "-fstack-protector", - # All warnings are enabled. Maybe enable -Werror as well? - "-Wall", -+ -+ "-Wno-error=strict-aliasing" - # Enable a few more warnings that aren't part of -Wall. - ] + (["-Wthread-safety", "-Wself-assign"] if darwin else [ - "-B" + str(repository_ctx.path(cc).dirname), -@@ -365,10 +367,6 @@ def _opt_content(darwin): - # Profile first and / or use FDO if you need better performance than this. - "-O2", - -- # Security hardening on by default. -- # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. -- "-D_FORTIFY_SOURCE=1", -- - # Disable assertions - "-DNDEBUG", - -diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl -index f17671035..7938047bd 100644 ---- a/bazel/envoy_build_system.bzl -+++ b/bazel/envoy_build_system.bzl -@@ -131,11 +131,9 @@ def envoy_cc_binary(name, - # --build-id and avoid doing the following. - '-Wl,--build-id=md5', - '-Wl,--hash-style=gnu', -- "-static-libstdc++", -- "-static-libgcc", - ], - testonly = testonly, -- linkstatic = 1, -+ linkstatic = 0, - visibility = visibility, - malloc = tcmalloc_external_dep(repository), - # See above comment on MD5 hash, this is another "force MD5 stamps" to make sure our diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index a2db62c884e3..bb772c1b101f 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, autoreconfHook -, gmp, python, iptables, ldns, unbound, openssl, pcsclite +, gmp, python, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv , systemd, pam , curl @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam iptables ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) - ++ optionals enableNetworkManager [ networkmanager ]; + ++ optionals enableNetworkManager [ networkmanager glib ]; patches = [ ./ext_auth-path.patch diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix new file mode 100644 index 000000000000..8a43fb3cf11b --- /dev/null +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-deps"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "m-cat"; + repo = pname; + rev = "ab93f5655900e49fb0360ccaf72b2b61b6b428ef"; + sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2"; + }; + + cargoSha256 = "1a9svdw1cgk6s7gqpsq3r25wxa2gr2xddqkc1cjk7hf6sk327cpv"; + + meta = with lib; { + description = "Cargo subcommand for building dependency graphs of Rust projects"; + homepage = https://github.com/m-cat/cargo-deps; + license = licenses.mit; + maintainers = with maintainers; [ arcnmx ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 9e5a3f4d6978..d77398610fb0 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -4,16 +4,24 @@ with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "0gwipwikhxsk0p8wvdl90xm7chfi2jywb1namzznyymifl1vsbgh"; + sha256 = "1w17g6jvs715rjc93nnnqnfdphijq4ymj9jjkr3ccc286ywvn3ih"; }; - propagatedBuildInputs = [ debian license-expression requests ]; + propagatedBuildInputs = [ + binaryornot + boolean-py + debian + jinja2 + license-expression + requests + setuptools + ]; checkInputs = [ pytest ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 9714943b30d5..c3e464da5169 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.27"; + name = "sudo-1.8.28"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1h1f7v9pv0rzp14cxzv8kaa8mdd717fbqv83l7c5dvvi8jwnisvv"; + sha256 = "188k3w67aflbmi4b5z23pxrvzfcfndi22b84w86gzjh8b9sglaci"; }; prePatch = '' diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/pkgs/tools/system/testdisk/default.nix similarity index 52% rename from pkgs/tools/system/testdisk-photorec/default.nix rename to pkgs/tools/system/testdisk/default.nix index 06f6751213b2..9cec99145b9c 100644 --- a/pkgs/tools/system/testdisk-photorec/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -1,35 +1,52 @@ -{ stdenv +{ mkDerivation +, stdenv , fetchurl , ncurses , libuuid +, pkgconfig , libjpeg , zlib -, ntfs3g -, e2fsprogs +, libewf +, enableNtfs ? !stdenv.isDarwin, ntfs3g ? null +, enableExtFs ? !stdenv.isDarwin, e2fsprogs ? null +, enableQt ? false, qtbase ? null, qttools ? null, qwt ? null }: -stdenv.mkDerivation rec { - pname = "testdisk-photorec"; - version = "7.0"; +assert enableNtfs -> ntfs3g != null; +assert enableExtFs -> e2fsprogs != null; +assert enableQt -> qtbase != null; +assert enableQt -> qttools != null; +assert enableQt -> qwt != null; + +(if enableQt then mkDerivation else stdenv.mkDerivation) rec { + pname = "testdisk"; + version = "7.1"; src = fetchurl { url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2"; - sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; + sha256 = "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql"; }; + + enableParallelBuilding = true; + buildInputs = [ ncurses libuuid - # optional: libjpeg zlib - ntfs3g - e2fsprogs - #libewf # makes it fail to build - #qt4 # for qphotorec, which does not build in 7.0 - ]; + libewf + ] + ++ stdenv.lib.optional enableNtfs ntfs3g + ++ stdenv.lib.optional enableExtFs e2fsprogs + ++ stdenv.lib.optional enableQt [ qtbase qttools qwt ]; + + nativeBuildInputs = [ pkgconfig ]; + + NIX_CFLAGS_COMPILE="-Wno-unused"; + meta = with stdenv.lib; { homepage = https://www.cgsecurity.org/wiki/Main_Page; downloadPage = https://www.cgsecurity.org/wiki/TestDisk_Download; - description = "Data recovery utilities"; + description = "Testdisk / Photorec - Data recovery utilities"; longDescription = '' TestDisk is a powerful free data recovery software. It was primarily designed to help recover lost partitions and/or make non-booting disks @@ -44,8 +61,8 @@ stdenv.mkDerivation rec { it will still work even if your media's file system has been severely damaged or reformatted. ''; - license = licenses.gpl2; - maintainers = with maintainers; [ fgaz ]; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ fgaz eelco ]; }; } - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b81f1a79c717..d4617a635f14 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -369,6 +369,7 @@ mapAliases ({ terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 tesseract_4 = tesseract4; # added 2018-12-19 + testdisk-photorec = throw "This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6709fa0c8993..25434fdf1fcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -153,6 +153,8 @@ in castxml = callPackage ../development/tools/castxml { }; + cereal = callPackage ../development/libraries/cereal { }; + clj-kondo = callPackage ../development/tools/clj-kondo { }; cmark = callPackage ../development/libraries/cmark { }; @@ -2968,10 +2970,6 @@ in entr = callPackage ../tools/misc/entr { }; - envoy = callPackage ../tools/networking/envoy { - bazel = bazel_0_4; - }; - eot_utilities = callPackage ../tools/misc/eot-utilities { }; eplot = callPackage ../tools/graphics/eplot { }; @@ -5911,7 +5909,7 @@ in reptyr = callPackage ../os-specific/linux/reptyr {}; - rescuetime = callPackage ../applications/misc/rescuetime { }; + rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; reuse = callPackage ../tools/package-management/reuse { }; @@ -6491,8 +6489,6 @@ in termplay = callPackage ../tools/misc/termplay { }; - testdisk-photorec = callPackage ../tools/system/testdisk-photorec { }; - tewisay = callPackage ../tools/misc/tewisay { }; texmacs = if stdenv.isDarwin @@ -6921,7 +6917,9 @@ in xe = callPackage ../tools/system/xe { }; - testdisk = callPackage ../tools/misc/testdisk { }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; + + testdisk-qt = testdisk.override { enableQt = true; }; textql = callPackage ../development/tools/textql { }; @@ -7295,6 +7293,8 @@ in zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; + zsh-history = callPackage ../shells/zsh/zsh-history { }; + zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; @@ -8431,6 +8431,7 @@ in cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-deps = callPackage ../tools/package-management/cargo-deps { }; cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; @@ -8543,6 +8544,7 @@ in swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { }; + swiPrologWithGui = callPackage ../development/compilers/swi-prolog { withGui = true; }; tbb = callPackage ../development/libraries/tbb { }; @@ -8958,7 +8960,7 @@ in python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; - python38Packages = python38.pkgs; + python38Packages = recurseIntoAttrs python38.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; @@ -9294,9 +9296,6 @@ in bam = callPackage ../development/tools/build-managers/bam {}; - bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; bazel = callPackage ../development/tools/build-managers/bazel { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; @@ -10534,6 +10533,8 @@ in niv = haskellPackages.niv.bin; + ormolu = haskellPackages.ormolu.bin; + capnproto = callPackage ../development/libraries/capnproto { }; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; @@ -11808,6 +11809,8 @@ in libclxclient = callPackage ../development/libraries/libclxclient { }; + libco-canonical = callPackage ../development/libraries/libco-canonical { }; + libconfuse = callPackage ../development/libraries/libconfuse { }; libcangjie = callPackage ../development/libraries/libcangjie { }; @@ -13495,6 +13498,8 @@ in rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + raft-canonical = callPackage ../development/libraries/raft-canonical { }; + range-v3 = callPackage ../development/libraries/range-v3 {}; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; @@ -15181,6 +15186,7 @@ in prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; + prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; @@ -16821,7 +16827,7 @@ in charis-sil = callPackage ../data/fonts/charis-sil { }; - cherry = callPackage ../data/fonts/cherry { }; + cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; @@ -17336,7 +17342,7 @@ in source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; - spleen = callPackage ../data/fonts/spleen { }; + spleen = callPackage ../data/fonts/spleen { inherit (xorg) mkfontdir; }; stilo-themes = callPackage ../data/themes/stilo { }; @@ -20323,7 +20329,7 @@ in psi = callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; @@ -21919,7 +21925,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -22501,6 +22507,10 @@ in openxcom = callPackage ../games/openxcom { }; + openxray = callPackage ../games/openxray { + stdenv = gcc8Stdenv; + }; + orthorobot = callPackage ../games/orthorobot { }; pacvim = callPackage ../games/pacvim { }; @@ -23117,7 +23127,7 @@ in conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; - + delly = callPackage ../applications/science/biology/delly { }; diamond = callPackage ../applications/science/biology/diamond { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index cc42ff161f96..96880b15445f 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -127,7 +127,7 @@ in rec { version = "8.9.1"; }; coq_8_10 = callPackage ../applications/science/logic/coq { - version = "8.10+beta3"; + version = "8.10.0"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 81db86cbb1ee..2a1c505e340e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -239,6 +239,8 @@ let enumerate = callPackage ../development/ocaml-modules/enumerate { }; + eqaf = callPackage ../development/ocaml-modules/eqaf { }; + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eabcff964b9f..bb6c7b31d0ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -743,6 +743,23 @@ let }; }; + AuthenOATH = buildPerlPackage { + pname = "Authen-OATH"; + version = "2.0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OA/OALDERS/Authen-OATH-2.0.1.tar.gz"; + sha256 = "1a813dbdc05c3fbd9dd39dbcfd85e2cfb0ba3d0f652cf6b26ec83ab8146ddc77"; + }; + buildInputs = [ TestNeeds ]; + propagatedBuildInputs = [ DigestHMAC Moo TypeTiny ]; + meta = { + homepage = "https://github.com/oalders/authen-oath"; + description = "OATH One Time Passwords"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + AuthenPassphrase = buildPerlModule { pname = "Authen-Passphrase"; version = "0.008"; @@ -2121,6 +2138,21 @@ let }; }; + CLASS = buildPerlPackage { + pname = "CLASS"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/CLASS-1.00.tar.gz"; + sha256 = "c5185620815701b3fec21314ccd8c5693e6bfd519431527da3370a8164220671"; + }; + meta = { + homepage = "https://metacpan.org/pod/CLASS"; + description = "Alias for __PACKAGE__"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + ClassAccessor = buildPerlPackage { pname = "Class-Accessor"; version = "0.51"; @@ -2973,6 +3005,22 @@ let }; }; + ConvertBase32 = buildPerlPackage { + pname = "Convert-Base32"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IK/IKEGAMI/Convert-Base32-0.06.tar.gz"; + sha256 = "4ba82c167c41f455aa8284738727e4c94a2ebcb1c4ce797f6fda07245a642115"; + }; + buildInputs = [ TestException ]; + meta = { + homepage = "https://metacpan.org/pod/Convert::Base32"; + description = "Encoding and decoding of base32 strings"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + ConvertColor = buildPerlModule { pname = "Convert-Color"; version = "0.11"; @@ -3477,6 +3525,23 @@ let buildInputs = [ CryptOpenSSLGuess ]; }; + CryptPBKDF2 = buildPerlPackage { + pname = "Crypt-PBKDF2"; + version = "0.161520"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Crypt-PBKDF2-0.161520.tar.gz"; + sha256 = "97dfa79a309a086e184a4e61047f8a10ffb3db051025e7d222a25f19130ba417"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ DigestHMAC DigestSHA3 Moo TryTiny TypeTiny namespaceautoclean strictures ]; + meta = { + homepage = "https://metacpan.org/release/Crypt-PBKDF2"; + description = "The PBKDF2 password hash algorithm"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptEd25519 = buildPerlPackage { pname = "Crypt-Ed25519"; version = "1.04"; @@ -3786,6 +3851,22 @@ let }; }; + DataMessagePack = buildPerlPackage { + pname = "Data-MessagePack"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.00.tar.gz"; + sha256 = "c9f0eeaf56ee4dfd509eccba2dd838921aebdf186ba60de166443ffc4b0ba1a2"; + }; + buildInputs = [ FileCopyRecursive TestRequires TestLeakTrace ]; + meta = { + homepage = "https://github.com/msgpack/msgpack-perl"; + description = "MessagePack serializing/deserializing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DataOptList = buildPerlPackage { pname = "Data-OptList"; version = "0.110"; @@ -4544,6 +4625,39 @@ let }; }; + DeviceMAC = buildPerlPackage { + pname = "Device-MAC"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JA/JASONK/Device-MAC-1.00.tar.gz"; + sha256 = "c42182a9a8489a314cbfe6e1c8452f32b3b626aa6c89fee1d8925e6dfb64fad5"; + }; + buildInputs = [ TestMost TestDifferences TestException TestWarn TestDeep ]; + propagatedBuildInputs = [ DeviceOUI Moose ]; + meta = { + description = "Handle hardware MAC Addresses (EUI-48 and EUI-64)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + DeviceOUI = buildPerlPackage { + pname = "Device-OUI"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JA/JASONK/Device-OUI-1.04.tar.gz"; + sha256 = "4b367e61b1fadde77fb6fb729f3cd5acd1d46e71218d96f406bcba38d43b4bef"; + }; + buildInputs = [ TestException ]; + patches = [ ../development/perl-modules/Device-OUI-1.04-hash.patch ]; + propagatedBuildInputs = [ ClassAccessorGrouped SubExporter LWP ]; + meta = { + description = "Resolve an Organizationally Unique Identifier"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DBDMock = buildPerlModule { pname = "DBD-Mock"; version = "1.45"; @@ -4619,6 +4733,23 @@ let }; }; + DBICxTestDatabase = buildPerlPackage { + pname = "DBICx-TestDatabase"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JR/JROCKWAY/DBICx-TestDatabase-0.05.tar.gz"; + sha256 = "8e3bc2530b01216188c3aa65acdbd2f59c4e631f3ae085dfc439abd89f8f0acf"; + }; + buildInputs = [ DBIxClass ]; + propagatedBuildInputs = [ DBDSQLite SQLTranslator ]; + meta = { + homepage = "https://metacpan.org/pod/DBICx::TestDatabase"; + description = "Create a temporary database from a DBIx::Class::Schema"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DBIxClass = buildPerlPackage { pname = "DBIx-Class"; version = "0.082841"; @@ -4666,6 +4797,23 @@ let }; }; + DBIxClassDynamicDefault = buildPerlPackage { + pname = "DBIx-Class-DynamicDefault"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTROUT/DBIx-Class-DynamicDefault-0.04.tar.gz"; + sha256 = "228f51ab224642584b4dc63db6de2667c5bfae2a894a9376b210a104806a5afb"; + }; + buildInputs = [ DBICxTestDatabase ]; + propagatedBuildInputs = [ DBIxClass ]; + meta = { + homepage = "https://metacpan.org/pod/DBIx::Class::DynamicDefault"; + description = "Automatically set and update fields"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DBIxClassHTMLWidget = buildPerlPackage { pname = "DBIx-Class-HTMLWidget"; version = "0.16"; @@ -4692,6 +4840,23 @@ let }; }; + DBIxClassInflateColumnSerializer = buildPerlPackage { + pname = "DBIx-Class-InflateColumn-Serializer"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MRUIZ/DBIx-Class-InflateColumn-Serializer-0.09.tar.gz"; + sha256 = "6262b4871db6a6c45a0cbe7cde8f1b890b22c291add4ecc40caaeeab5a3a6f50"; + }; + buildInputs = [ DBDSQLite TestException ]; + propagatedBuildInputs = [ DBIxClass JSONMaybeXS YAML namespaceclean ]; + meta = { + homepage = "https://metacpan.org/pod/DBIx::Class::InflateColumn::Serializer"; + description = "Inflators to serialize data structures for DBIx::Class"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DBIxClassIntrospectableM2M = buildPerlPackage { pname = "DBIx-Class-IntrospectableM2M"; version = "0.001002"; @@ -5043,6 +5208,21 @@ let }; }; + DigestSHA3 = buildPerlPackage { + pname = "Digest-SHA3"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA3-1.04.tar.gz"; + sha256 = "4a68b67c5034f40fbb1344b304cd66caaa5e320eb523005201cc24f76d470c14"; + }; + meta = { + homepage = "https://metacpan.org/release/Digest-SHA3"; + description = "Perl extension for SHA-3"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DirManifest = buildPerlModule { pname = "Dir-Manifest"; version = "0.2.0"; @@ -9088,6 +9268,23 @@ let }; }; + JSONValidator = buildPerlPackage { + pname = "JSON-Validator"; + version = "3.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.15.tar.gz"; + sha256 = "ce14ed018b9843ef022c4c14e2171545d3da92e533c8f122b8e33f27444b2a6c"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ Mojolicious YAMLLibYAML DataValidateDomain DataValidateIP NetIDNEncode ]; + meta = { + homepage = "https://github.com/mojolicious/json-validator"; + description = "Validate data against a JSON schema"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + JSONWebToken = buildPerlModule { pname = "JSON-WebToken"; version = "0.10"; @@ -11263,6 +11460,39 @@ let }; }; + MojoSQLite = buildPerlModule { + pname = "Mojo-SQLite"; + version = "3.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.002.tar.gz"; + sha256 = "16dn0p14i6r4c8aspvkp7rfry3zy7kr2ffcmncj0pqygk62miinp"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URI URIdb ]; + meta = { + homepage = "https://github.com/Grinnz/Mojo-SQLite"; + description = "A tiny Mojolicious wrapper for SQLite"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + + Mojomysql = buildPerlPackage rec { + pname = "Mojo-mysql"; + version = "1.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.17.tar.gz"; + sha256 = "93cd964760918a43124c3dc65d513372b6d1d00993427894e2f11a1f96662554"; + }; + propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; + meta = { + homepage = "https://github.com/jhthorsen/mojo-mysql"; + description = "Mojolicious and Async MySQL/MariaDB"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoIOLoopForkCall = buildPerlModule { pname = "Mojo-IOLoop-ForkCall"; version = "0.20"; @@ -11277,6 +11507,23 @@ let }; }; + MojoJWT = buildPerlModule { + pname = "Mojo-JWT"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-JWT-0.08.tar.gz"; + sha256 = "c910229e1182266b6666a2d65deea381a04e48d3aa788c42461b3184006934de"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/jberger/Mojo-JWT"; + description = "JSON Web Token the Mojo way"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -15068,6 +15315,21 @@ let }; }; + SessionToken = buildPerlPackage rec { + pname = "Session-Token"; + version = "1.503"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FR/FRACTAL/Session-Token-1.503.tar.gz"; + sha256 = "32c3df96ef455c71870363acd950ddc4fbc848c594f4bc55b21b44cf979f79a1"; + }; + meta = { + homepage = "https://github.com/hoytech/Session-Token"; + description = "Secure, efficient, simple random session token generation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + SetInfinite = buildPerlPackage { pname = "Set-Infinite"; version = "0.65"; @@ -15118,6 +15380,21 @@ let }; }; + SmartComments = buildPerlPackage rec { + pname = "Smart-Comments"; + version = "1.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Smart-Comments-1.06.tar.gz"; + sha256 = "dcf8a312134a7c6b82926a0115d93b692472a662d28cdc3a9bdf28984ada9ee3"; + }; + meta = { + homepage = "https://github.com/neilb/Smart-Comments"; + description = "Comments that do more than just sit there"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + SGMLSpm = buildPerlModule { pname = "SGMLSpm"; version = "1.1"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07779c38f879..1614c92808ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,6 +175,8 @@ in { apprise = callPackage ../development/python-modules/apprise { }; + aresponses = callPackage ../development/python-modules/aresponses { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; asana = callPackage ../development/python-modules/asana { }; @@ -6158,6 +6160,8 @@ in { pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; + pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + parse = callPackage ../development/python-modules/parse { }; parse-type = callPackage ../development/python-modules/parse-type { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index cc773207c374..d17080960329 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -161,6 +161,9 @@ in { enableShared = false; enableStatic = true; }; + libressl = super.libressl.override { + buildShared = false; + }; darwin = super.darwin // { libiconv = super.darwin.libiconv.override {